Skip to content

Commit d321f40

Browse files
author
Johan Brichau
authored
Merge pull request SeasideSt#106 from SeasideSt/104/Filestreams
104/filestreams
2 parents 7e69439 + 79ec953 commit d321f40

File tree

73 files changed

+196
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+196
-164
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,3 @@ matrix:
4545
env: BUILD_NAME=GemStone-3.1.0.6
4646
- smalltalk: GemStone-2.4.8
4747
env: BUILD_NAME=GemStone-2.4.8
48-
49-
notifications:
50-
slack: gemtalksystems:4YWbzy6sJN9cE0FhxvUPP8nS
51-

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ The latest Grease version is supported on the following platforms and versions,
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.2)](http://travis-ci.org/SeasideSt/Grease) |
24-
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
25-
| | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
26-
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
27-
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |
28-
| | | [![Build status: Gemstone-2.4.8](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-2.4.8&label=2.4.8)](http://travis-ci.org/SeasideSt/Grease) |
23+
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-9.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-9.0&label=9.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.2)](http://travis-ci.org/SeasideSt/Grease) |
24+
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
25+
| | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
26+
| | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
27+
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |
28+
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-2.4.8](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-2.4.8&label=2.4.8)](http://travis-ci.org/SeasideSt/Grease) |
2929

3030
Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/SeasideSt/Grease/badge.svg?branch=test-coveralls)](https://coveralls.io/github/SeasideSt/Grease?branch=test-coveralls)
3131

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ baselineGemStone: spec
3434
package: 'Grease-Tests-Core'
3535
with: [
3636
spec
37-
requires: #('Grease-GemStone-Core');
38-
includes: #('Grease-Tests-GemStone-Core') ];
37+
requires: #('Grease-GemStone-Core') ];
3938
package: 'Grease-GemStone-Core'
4039
with: [
4140
spec
4241
requires:
43-
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
44-
package: 'Grease-Tests-GemStone-Core'
45-
with: [ spec requires: #('Grease-Tests-Core') ] ].
42+
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ] ].
43+
4644
spec
4745
for: #'gs2.x'
4846
do: [
@@ -89,9 +87,20 @@ baselineGemStone: spec
8987
spec
9088
requires: #('Grease-GemStone-Core');
9189
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
90+
91+
spec for: #(#'gs2.x' #'gs3.0.x' #'gs3.1.x')
92+
do:[
93+
spec
94+
package: 'Grease-Tests-GemStone-Core'
95+
with:[ spec requires: 'Grease-Tests-Core' ];
96+
package: 'Grease-Tests-Core'
97+
with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
98+
9299
spec
93100
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
94101
do: [
95102
spec
96-
package: 'Grease-Tests-GemStone-Core'
97-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
103+
package: 'Grease-Tests-GemStone32-Core'
104+
with:[ spec requires: 'Grease-Tests-Core' ];
105+
package: 'Grease-Tests-Core'
106+
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

‎repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
file library
22
fileStreamOn: aString do: aBlock binary: aBoolean
3-
self subclassResponsibility
3+
self
4+
greaseDeprecatedApi: 'GRPlatform>>#fileStreamOn:do:binary:'
5+
details: 'Use readFileStreamOn:do:binary:'.
6+
^ self readFileStreamOn: aString do: aBlock binary: aBoolean

‎repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
file library
2+
readFileStreamOn: aString do: aBlock binary: aBoolean
3+
self subclassResponsibility

‎repository/Grease-Core.package/GRPlatform.class/instance/thisContext.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ processes
22
thisContext
33
"Answer the current activation of a method execution or block activation.
44
5-
For dialects with a thisContext variable and implementation can lock like this.
5+
For dialects with a thisContext variable and implementation can look like this.
66
77
^ thisContext sender"
88
self subclassResponsibility

‎repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
file library
2+
writeFileStreamOn: aString do: aBlock binary: aBoolean
3+
self subclassResponsibility

‎repository/Grease-Core.package/monticello.meta/categories.st‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SystemOrganization addCategory: #'Grease-Core'!
2-
SystemOrganization addCategory: #'Grease-Core-Collections'!
3-
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
4-
SystemOrganization addCategory: #'Grease-Core-Text'!
5-
SystemOrganization addCategory: #'Grease-Core-Utilities'!
2+
SystemOrganization addCategory: 'Grease-Core-Collections'!
3+
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
4+
SystemOrganization addCategory: 'Grease-Core-Text'!
5+
SystemOrganization addCategory: 'Grease-Core-Utilities'!

‎repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/readFileStreamOn.do.binary..st‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
file-library
2+
readFileStreamOn: aString do: aBlock binary: aBoolean
3+
| stream dir file |
4+
[
5+
file := GsFile openReadOnServer: aString.
6+
[
7+
stream := RWBinaryOrTextStream on: file contents.
8+
aBoolean
9+
ifTrue: [ stream binary ]
10+
ifFalse: [ stream ascii ].
11+
^ aBlock value: stream ]
12+
ensure: [ stream close ] ]
13+
ensure: [ file close ]

0 commit comments

Comments
 (0)