diff --git a/.travis.yml b/.travis.yml index b95d6c83..ca2dc00b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,3 @@ matrix: env: BUILD_NAME=GemStone-3.1.0.6 - smalltalk: GemStone-2.4.8 env: BUILD_NAME=GemStone-2.4.8 - -notifications: - slack: gemtalksystems:4YWbzy6sJN9cE0FhxvUPP8nS - diff --git a/README.md b/README.md index d8812519..1bcdedfa 100644 --- a/README.md +++ b/README.md @@ -20,12 +20,12 @@ The latest Grease version is supported on the following platforms and versions, | Squeak | Pharo | GemStone | | --------------- | ---------------- | -------------------- | -| [![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) | -| [![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) | -| | [![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) | -| | [![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) | -| | [![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) | -| | | [![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) | +| [![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) | +| [![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) | +| | [![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) | +| | [![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) | +| | [![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) | +| | [![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) | 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) diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st index 8e654e74..cbfb9c99 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st @@ -34,15 +34,13 @@ baselineGemStone: spec package: 'Grease-Tests-Core' with: [ spec - requires: #('Grease-GemStone-Core'); - includes: #('Grease-Tests-GemStone-Core') ]; + requires: #('Grease-GemStone-Core') ]; package: 'Grease-GemStone-Core' with: [ spec requires: - #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ]; - package: 'Grease-Tests-GemStone-Core' - with: [ spec requires: #('Grease-Tests-Core') ] ]. + #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ] ]. + spec for: #'gs2.x' do: [ @@ -89,9 +87,20 @@ baselineGemStone: spec spec requires: #('Grease-GemStone-Core'); postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ]. + + spec for: #(#'gs2.x' #'gs3.0.x' #'gs3.1.x') + do:[ + spec + package: 'Grease-Tests-GemStone-Core' + with:[ spec requires: 'Grease-Tests-Core' ]; + package: 'Grease-Tests-Core' + with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ]. + spec for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x') do: [ spec - package: 'Grease-Tests-GemStone-Core' - with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ] \ No newline at end of file + package: 'Grease-Tests-GemStone32-Core' + with:[ spec requires: 'Grease-Tests-Core' ]; + package: 'Grease-Tests-Core' + with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ] \ No newline at end of file diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st index b35e040c..f0155c88 100644 --- a/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st +++ b/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st @@ -1,3 +1,6 @@ file library fileStreamOn: aString do: aBlock binary: aBoolean - self subclassResponsibility \ No newline at end of file + self + greaseDeprecatedApi: 'GRPlatform>>#fileStreamOn:do:binary:' + details: 'Use readFileStreamOn:do:binary:'. + ^ self readFileStreamOn: aString do: aBlock binary: aBoolean \ No newline at end of file diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st new file mode 100644 index 00000000..3ffa885a --- /dev/null +++ b/repository/Grease-Core.package/GRPlatform.class/instance/readFileStreamOn.do.binary..st @@ -0,0 +1,3 @@ +file library +readFileStreamOn: aString do: aBlock binary: aBoolean + self subclassResponsibility \ No newline at end of file diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/thisContext.st b/repository/Grease-Core.package/GRPlatform.class/instance/thisContext.st index d1ef063a..22b5c4dd 100644 --- a/repository/Grease-Core.package/GRPlatform.class/instance/thisContext.st +++ b/repository/Grease-Core.package/GRPlatform.class/instance/thisContext.st @@ -2,7 +2,7 @@ processes thisContext "Answer the current activation of a method execution or block activation. - For dialects with a thisContext variable and implementation can lock like this. + For dialects with a thisContext variable and implementation can look like this. ^ thisContext sender" self subclassResponsibility \ No newline at end of file diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st new file mode 100644 index 00000000..3d67b1a2 --- /dev/null +++ b/repository/Grease-Core.package/GRPlatform.class/instance/writeFileStreamOn.do.binary..st @@ -0,0 +1,3 @@ +file library +writeFileStreamOn: aString do: aBlock binary: aBoolean + self subclassResponsibility \ No newline at end of file diff --git a/repository/Grease-Core.package/monticello.meta/categories.st b/repository/Grease-Core.package/monticello.meta/categories.st index d33d6435..ffa3065c 100644 --- a/repository/Grease-Core.package/monticello.meta/categories.st +++ b/repository/Grease-Core.package/monticello.meta/categories.st @@ -1,5 +1,5 @@ SystemOrganization addCategory: #'Grease-Core'! -SystemOrganization addCategory: #'Grease-Core-Collections'! -SystemOrganization addCategory: #'Grease-Core-Exceptions'! -SystemOrganization addCategory: #'Grease-Core-Text'! -SystemOrganization addCategory: #'Grease-Core-Utilities'! +SystemOrganization addCategory: 'Grease-Core-Collections'! +SystemOrganization addCategory: 'Grease-Core-Exceptions'! +SystemOrganization addCategory: 'Grease-Core-Text'! +SystemOrganization addCategory: 'Grease-Core-Utilities'! diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st deleted file mode 100644 index 31fd6fce..00000000 --- a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st +++ /dev/null @@ -1,10 +0,0 @@ -file-library -fileStreamOn: aString do: aBlock binary: aBoolean - | stream dir file | - [ - file := GsFile openReadOnServer: aString. - [stream := RWBinaryOrTextStream on: file contents. - aBoolean - ifTrue: [ stream binary ] - ifFalse: [ stream ascii ]. - ^ aBlock value: stream ] ensure: [ stream close ]] ensure: [ file close ]. \ No newline at end of file diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/readFileStreamOn.do.binary..st new file mode 100644 index 00000000..cf66b203 --- /dev/null +++ b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/readFileStreamOn.do.binary..st @@ -0,0 +1,13 @@ +file-library +readFileStreamOn: aString do: aBlock binary: aBoolean + | stream dir file | + [ + file := GsFile openReadOnServer: aString. + [ + stream := RWBinaryOrTextStream on: file contents. + aBoolean + ifTrue: [ stream binary ] + ifFalse: [ stream ascii ]. + ^ aBlock value: stream ] + ensure: [ stream close ] ] + ensure: [ file close ] \ No newline at end of file diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/write.toFile.inFolder..st index a5de5279..e0a494a0 100644 --- a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/write.toFile.inFolder..st +++ b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/write.toFile.inFolder..st @@ -1,12 +1,13 @@ file-library write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString - "writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString" - | folder stream fullFilePath | - fullFilePath := ServerFileDirectory default fullNameFor: aFolderString. - folder := ServerFileDirectory on: fullFilePath. - stream := folder forceNewFileNamed: aFileNameString. - stream := aStringOrByteArray isString - ifTrue: [ stream ascii ] - ifFalse: [ stream binary ]. - [ stream nextPutAll: aStringOrByteArray ] - ensure: [ stream close ] \ No newline at end of file + "writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString" + + | folder fullFilePath | + fullFilePath := ServerFileDirectory default fullNameFor: aFolderString. + folder := ServerFileDirectory on: fullFilePath. + (folder fileExists: aFileNameString) + ifTrue: [ folder deleteFileNamed: aFileNameString ]. + ^ self + writeFileStreamOn: (folder / aFileNameString) fullName + do: [ :stream | stream nextPutAll: aStringOrByteArray ] + binary: aStringOrByteArray isString not \ No newline at end of file diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/writeFileStreamOn.do.binary..st new file mode 100644 index 00000000..5011e5cc --- /dev/null +++ b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/writeFileStreamOn.do.binary..st @@ -0,0 +1,9 @@ +file-library +writeFileStreamOn: fileName do: aBlock binary: isBinary + | stream | + stream := BinaryOrTextFile open: fileName mode: 'w+b' onClient: false. + stream := isBinary + ifTrue: [ stream binary ] + ifFalse: [ stream ascii ]. + [ aBlock value: stream ] + ensure: [ stream close ] \ No newline at end of file diff --git a/repository/Grease-GemStone-Core.package/Symbol.extension/properties.json b/repository/Grease-GemStone-Core.package/Symbol.extension/properties.json index 8c6bce81..565e67b0 100644 --- a/repository/Grease-GemStone-Core.package/Symbol.extension/properties.json +++ b/repository/Grease-GemStone-Core.package/Symbol.extension/properties.json @@ -1,3 +1,2 @@ { - "name" : "Symbol" -} \ No newline at end of file + "name" : "Symbol" } diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st new file mode 100644 index 00000000..2b7331ab --- /dev/null +++ b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st @@ -0,0 +1,7 @@ +file library +readFileStreamOn: aString do: aBlock binary: aBoolean + "Line end conversion is no longer done for ascii... TBD!" + + ^ aBoolean + ifTrue: [ aString asFileReference binaryReadStreamDo: aBlock ] + ifFalse: [ aString asFileReference readStreamEncoded: 'ascii' do: aBlock ] \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st index e77ae8c1..77cf8f76 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st +++ b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st @@ -1,15 +1,8 @@ file library write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString "writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString" - | folder stream fullFilePath | - folder := FileSystem disk resolveString: aFolderString. - fullFilePath := (folder / aFileNameString) asFileReference. - stream := aStringOrByteArray isString - ifTrue: [ - (MultiByteFileStream forceNewFileNamed: fullFilePath fullName) - ascii; - wantsLineEndConversion: true; - yourself ] - ifFalse: [ (FileStream forceNewFileNamed: fullFilePath fullName) binary ]. - [ stream nextPutAll: aStringOrByteArray ] - ensure: [ stream close ] \ No newline at end of file + "TODO: wantsLineEndConversion: true; ??" + ^ self + writeFileStreamOn: (aFolderString asFileReference / aFileNameString) ensureDelete pathString + do: [ :stream | stream nextPutAll: aStringOrByteArray ] + binary: aStringOrByteArray isString not \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st new file mode 100644 index 00000000..762e9cca --- /dev/null +++ b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st @@ -0,0 +1,5 @@ +file library +writeFileStreamOn: aString do: aBlock binary: aBoolean + ^ aBoolean + ifTrue: [ aString asFileReference binaryWriteStreamDo: aBlock ] + ifFalse: [ aString asFileReference writeStreamEncoded: 'ascii' do: aBlock ] \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st index 119ba39b..ecfdc9d4 100644 --- a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st @@ -1,3 +1,3 @@ file library contentsOfFile: aString binary: aBoolean - ^ self fileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean \ No newline at end of file + ^ self readFileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st deleted file mode 100644 index 2fd81137..00000000 --- a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st +++ /dev/null @@ -1,13 +0,0 @@ -file library -fileStreamOn: aString do: aBlock binary: aBoolean - ^ aBoolean - ifTrue: [ - FileStream fileNamed: aString do: [ :stream | - stream binary. - aBlock value: stream ] ] - ifFalse: [ - MultiByteFileStream fileNamed: aString do: [ :stream | - stream - ascii; - wantsLineEndConversion: true. - aBlock value: stream ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st new file mode 100644 index 00000000..f9dda145 --- /dev/null +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/readFileStreamOn.do.binary..st @@ -0,0 +1,6 @@ +file library +readFileStreamOn: aString do: aBlock binary: aBoolean + + ^ aBoolean + ifTrue: [ aString asFileReference binaryReadStreamDo: aBlock ] + ifFalse: [ aString asFileReference readStreamEncoded: 'ascii' do: aBlock ] \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st index e77ae8c1..bbde965a 100644 --- a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st @@ -1,15 +1,7 @@ file library write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString "writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString" - | folder stream fullFilePath | - folder := FileSystem disk resolveString: aFolderString. - fullFilePath := (folder / aFileNameString) asFileReference. - stream := aStringOrByteArray isString - ifTrue: [ - (MultiByteFileStream forceNewFileNamed: fullFilePath fullName) - ascii; - wantsLineEndConversion: true; - yourself ] - ifFalse: [ (FileStream forceNewFileNamed: fullFilePath fullName) binary ]. - [ stream nextPutAll: aStringOrByteArray ] - ensure: [ stream close ] \ No newline at end of file + ^ self + writeFileStreamOn: (aFolderString asFileReference / aFileNameString) ensureDelete pathString + do: [ :stream | stream nextPutAll: aStringOrByteArray ] + binary: aStringOrByteArray isString not \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st new file mode 100644 index 00000000..c06164c8 --- /dev/null +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/writeFileStreamOn.do.binary..st @@ -0,0 +1,5 @@ +file library +writeFileStreamOn: aString do: aBlock binary: aBoolean + ^ aBoolean + ifTrue: [ aString asFileReference binaryWriteStreamDo: aBlock ] + ifFalse: [ aString asFileReference writeStreamEncoded: 'ascii' do: [ :str | aBlock value: (ZnNewLineWriterStream on: str) ] ] \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/initialize.st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/initialize.st index 0c86564c..69106234 100644 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/initialize.st +++ b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/initialize.st @@ -1,5 +1,4 @@ class initialization initialize self initializeXmlTable. - self initializeUrlTable. - self select \ No newline at end of file + self initializeUrlTable \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/unload.st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/unload.st deleted file mode 100644 index 4c8dd650..00000000 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/class/unload.st +++ /dev/null @@ -1,3 +0,0 @@ -class initialization -unload - self unselect \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st deleted file mode 100644 index 1aad81ef..00000000 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st +++ /dev/null @@ -1,13 +0,0 @@ -file library -fileStreamOn: aString do: aBlock binary: aBoolean - ^ aBoolean - ifTrue: [ - FileStream oldFileNamed: aString do: [ :stream | - stream binary. - aBlock value: stream ] ] - ifFalse: [ - MultiByteFileStream oldFileNamed: aString do: [ :stream | - stream - ascii; - wantsLineEndConversion: true. - aBlock value: stream ] ] \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st deleted file mode 100644 index 9565ae8b..00000000 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/write.toFile.inFolder..st +++ /dev/null @@ -1,15 +0,0 @@ -file library -write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString - "writes aStringOrByteArray to a file named aFileNameString in the folder aFolderString" - | folder stream fullFilePath | - folder := FileDirectory default directoryNamed: aFolderString. - fullFilePath := folder fullNameFor: aFileNameString. - stream := aStringOrByteArray isString - ifTrue: [ - (MultiByteFileStream forceNewFileNamed: fullFilePath) - ascii; - wantsLineEndConversion: true; - yourself ] - ifFalse: [ (FileStream forceNewFileNamed: fullFilePath) binary ]. - [ stream nextPutAll: aStringOrByteArray ] - ensure: [ stream close ] \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/fileStreamOn.do.binary..st deleted file mode 100644 index 2fd81137..00000000 --- a/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/fileStreamOn.do.binary..st +++ /dev/null @@ -1,13 +0,0 @@ -file library -fileStreamOn: aString do: aBlock binary: aBoolean - ^ aBoolean - ifTrue: [ - FileStream fileNamed: aString do: [ :stream | - stream binary. - aBlock value: stream ] ] - ifFalse: [ - MultiByteFileStream fileNamed: aString do: [ :stream | - stream - ascii; - wantsLineEndConversion: true. - aBlock value: stream ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/readFileStreamOn.do.binary..st similarity index 79% rename from repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st rename to repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/readFileStreamOn.do.binary..st index 2fd81137..9c82d3ff 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/fileStreamOn.do.binary..st +++ b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/readFileStreamOn.do.binary..st @@ -1,5 +1,5 @@ -file library -fileStreamOn: aString do: aBlock binary: aBoolean +as yet unclassified +readFileStreamOn: aString do: aBlock binary: aBoolean ^ aBoolean ifTrue: [ FileStream fileNamed: aString do: [ :stream | diff --git a/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/write.toFile.inFolder..st b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/write.toFile.inFolder..st index 08d697b5..f06fa4d4 100644 --- a/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/write.toFile.inFolder..st +++ b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/write.toFile.inFolder..st @@ -1,15 +1,11 @@ file library -write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString - "writes aStringOrByteArray to a file named aFilenameString in the folder aFolderString" - | folder stream fullFilePath | - folder := FileDirectory default directoryNamed: aFolderString. - fullFilePath := folder fullNameFor: aFileNameString. - stream := aStringOrByteArray isString - ifTrue: [ - (MultiByteFileStream forceNewFileNamed: fullFilePath) - ascii; - wantsLineEndConversion: true; - yourself ] - ifFalse: [ (FileStream forceNewFileNamed: fullFilePath) binary ]. - [ stream nextPutAll: aStringOrByteArray ] - ensure: [ stream close ] \ No newline at end of file +write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString + | folder fullFilePath | + fullFilePath := FileDirectory default fullNameFor: aFolderString. + folder := FileDirectory on: fullFilePath. + (folder fileExists: aFileNameString) + ifTrue: [folder deleteFileNamed: aFileNameString]. + ^ self + writeFileStreamOn: (folder / aFileNameString) fullName + do: [:stream | stream nextPutAll: aStringOrByteArray] + binary: aStringOrByteArray isString not \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/writeFileStreamOn.do.binary..st b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/writeFileStreamOn.do.binary..st new file mode 100644 index 00000000..1207150a --- /dev/null +++ b/repository/Grease-Squeak5-Core.package/GRSqueakPlatform.class/instance/writeFileStreamOn.do.binary..st @@ -0,0 +1,8 @@ +as yet unclassified +writeFileStreamOn: aString do: aBlock binary: aBoolean + | stream | + stream := aBoolean + ifTrue: [ (MultiByteFileStream fileNamed: aString) ascii; wantsLineEndConversion: true; yourself ] + ifFalse: [ (FileStream fileNamed: aString) binary ]. + [ aBlock value: stream ] + ensure: [ stream close ] \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st similarity index 95% rename from repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st rename to repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st index c12a405b..ad114bf2 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderBinary.st @@ -1,4 +1,4 @@ -tests +tests-filestreams testReadWriteToFileInFolderBinary | bytes | bytes := #(80 104 39 110 103 108 117 105 32 109 103 108 119 39 110 97 102 104 32 67 116 104 117 108 104 117 32 82 39 108 121 101 104 32 119 103 97 104 39 110 97 103 108 32 102 104 116 97 103 110) asByteArray. diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderText.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st similarity index 93% rename from repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderText.st rename to repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st index ee0eadd5..2d9fc845 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderText.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st @@ -1,4 +1,4 @@ -tests +tests-filestreams testReadWriteToFileInFolderText | text | text := 'Ph''nglui mglw''nafh Cthulhu R''lyeh wgah''nagl fhtagn'. diff --git a/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st b/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st new file mode 100644 index 00000000..c73ff2de --- /dev/null +++ b/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st @@ -0,0 +1,12 @@ +*grease-tests-gemstone-core +writeToFile: aStringOrByteArray withFileNameDo: aBlock + | fileName directory | + fileName := 'GRGemStonePlatformTest'. + directory := ServerFileDirectory default. + [ + GRPlatform current + write: aStringOrByteArray + toFile: fileName + inFolder: directory fullName. + aBlock value: directory fullName , GRPlatform current pathSeparator , fileName ] + ensure: [ directory deleteFileNamed: fileName ] \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/properties.json b/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/properties.json new file mode 100644 index 00000000..ab3f269a --- /dev/null +++ b/repository/Grease-Tests-GemStone-Core.package/GRPlatformTest.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "GRPlatformTest" } diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/categories.st b/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/categories.st deleted file mode 100644 index 8cff96cd..00000000 --- a/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'Grease-Tests-GemStone-Core'! diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/package b/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/package deleted file mode 100644 index 59950b6e..00000000 --- a/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Grease-Tests-GemStone-Core') \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/.filetree b/repository/Grease-Tests-GemStone32-Core.package/.filetree similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/.filetree rename to repository/Grease-Tests-GemStone32-Core.package/.filetree diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/README.md b/repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/README.md similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/README.md rename to repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/README.md diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/instance/arbitraryCollection.st b/repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/instance/arbitraryCollection.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/instance/arbitraryCollection.st rename to repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/instance/arbitraryCollection.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/instance/collectionClass.st b/repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/instance/collectionClass.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/instance/collectionClass.st rename to repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/instance/collectionClass.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/properties.json similarity index 81% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/properties.json index f72b879e..aac15724 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRDoubleByteStringTest.class/properties.json +++ b/repository/Grease-Tests-GemStone32-Core.package/GRDoubleByteStringTest.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Grease-Tests-GemStone-Core", + "category" : "Grease-Tests-GemStone32-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/README.md b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/README.md similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/README.md rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/README.md diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testCompileIntoClassified.st b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testCompileIntoClassified.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testCompileIntoClassified.st rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testCompileIntoClassified.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testConvertToSmalltalkNewlines.st b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testConvertToSmalltalkNewlines.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testConvertToSmalltalkNewlines.st rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testConvertToSmalltalkNewlines.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testEncoderForUtf8Roundtrip.st b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testEncoderForUtf8Roundtrip.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testEncoderForUtf8Roundtrip.st rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testEncoderForUtf8Roundtrip.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testFullName.st b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testFullName.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/instance/testFullName.st rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/instance/testFullName.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/properties.json similarity index 80% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/properties.json index bcd1f55d..29396189 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRGemStonePlatformTest.class/properties.json +++ b/repository/Grease-Tests-GemStone32-Core.package/GRGemStonePlatformTest.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Grease-Tests-GemStone-Core", + "category" : "Grease-Tests-GemStone32-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/addBlockToCollection.with..st b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/addBlockToCollection.with..st similarity index 68% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/addBlockToCollection.with..st rename to repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/addBlockToCollection.with..st index c715445c..d2b2b2b2 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/addBlockToCollection.with..st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/addBlockToCollection.with..st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core addBlockToCollection: collection with: ea collection add: [ea] \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/expectedFailures.st b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/expectedFailures.st similarity index 85% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/expectedFailures.st rename to repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/expectedFailures.st index f49184f7..95dae186 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/expectedFailures.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/expectedFailures.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core expectedFailures "GemStone does not conform to the ANSI standard in this case" diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st similarity index 89% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st rename to repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st index 4ba45664..21ae2a01 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/instance/testToDoClosuresGemStone.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testToDoClosuresGemStone "workaround for non-ANSI compliance" diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/properties.json similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRNumberTest.extension/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRNumberTest.extension/properties.json diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRPackage.extension/class/greaseTestsGemStoneCore.st b/repository/Grease-Tests-GemStone32-Core.package/GRPackage.extension/class/greaseTestsGemStoneCore.st similarity index 67% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRPackage.extension/class/greaseTestsGemStoneCore.st rename to repository/Grease-Tests-GemStone32-Core.package/GRPackage.extension/class/greaseTestsGemStoneCore.st index 8e8599f8..616e2a89 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRPackage.extension/class/greaseTestsGemStoneCore.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRPackage.extension/class/greaseTestsGemStoneCore.st @@ -1,8 +1,8 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core greaseTestsGemStoneCore ^ self new - name: 'Grease-Tests-GemStone-Core'; + name: 'Grease-Tests-GemStone32-Core'; addDependency: 'Grease-GemStone-Core'; addDependency: 'Grease-Tests-Core'; url: #gemstoneUrl; diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRPackage.extension/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRPackage.extension/properties.json similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRPackage.extension/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRPackage.extension/properties.json diff --git a/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st b/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st new file mode 100644 index 00000000..6976c3c7 --- /dev/null +++ b/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st @@ -0,0 +1,12 @@ +*grease-tests-gemstone32-core +writeToFile: aStringOrByteArray withFileNameDo: aBlock + | fileName directory | + fileName := 'GRGemStonePlatformTest'. + directory := ServerFileDirectory default. + [ + GRPlatform current + write: aStringOrByteArray + toFile: fileName + inFolder: directory fullName. + aBlock value: directory fullName , GRPlatform current pathSeparator , fileName ] + ensure: [ directory deleteFileNamed: fileName ] \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/properties.json new file mode 100644 index 00000000..ab3f269a --- /dev/null +++ b/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "GRPlatformTest" } diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/README.md b/repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/README.md similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/README.md rename to repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/README.md diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/instance/arbitraryCollection.st b/repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/instance/arbitraryCollection.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/instance/arbitraryCollection.st rename to repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/instance/arbitraryCollection.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/instance/collectionClass.st b/repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/instance/collectionClass.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/instance/collectionClass.st rename to repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/instance/collectionClass.st diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/properties.json similarity index 81% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/properties.json index f04548ac..5643404e 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRQuadByteStringTest.class/properties.json +++ b/repository/Grease-Tests-GemStone32-Core.package/GRQuadByteStringTest.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Grease-Tests-GemStone-Core", + "category" : "Grease-Tests-GemStone32-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/multiByteConvert..st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/multiByteConvert..st similarity index 68% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/multiByteConvert..st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/multiByteConvert..st index 7e52fede..f68bfeb2 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/multiByteConvert..st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/multiByteConvert..st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core multiByteConvert: aString ^self collectionClass withAll: aString \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteCapitalized.st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteCapitalized.st similarity index 90% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteCapitalized.st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteCapitalized.st index 2b574007..e2b5c14d 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteCapitalized.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteCapitalized.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testMultiByteCapitalized self assert: (self multiByteConvert: 'capitalized') capitalized = 'Capitalized'. self assert: (self multiByteConvert: 'Capitalized') capitalized = 'Capitalized' . diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteExcerpt.st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteExcerpt.st similarity index 96% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteExcerpt.st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteExcerpt.st index f8354583..be28723e 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteExcerpt.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteExcerpt.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testMultiByteExcerpt self assert: ((self multiByteConvert: 'abcde') excerpt: 'c' radius: 0) = '...c...'. self assert: ((self multiByteConvert: 'abcde') excerpt: 'c' radius: 1) = '...bcd...'. diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteSubStrings.st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteSubStrings.st similarity index 97% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteSubStrings.st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteSubStrings.st index 6baae92e..20972006 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteSubStrings.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteSubStrings.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testMultiByteSubStrings "#subStrings: is defined by ANSI 5.7.10.15: Answer an array containing the substrings in the receiver separated by the elements of separators." diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st similarity index 95% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st index 76a0776f..6b73b88b 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTrimBoth.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testMultiByteTrimBoth self assert: (self multiByteConvert: '') trimBoth = ''. self assert: (self multiByteConvert: ' ') trimBoth = ''. diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTruncate.st b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTruncate.st similarity index 93% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTruncate.st rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTruncate.st index 5cbf7eb4..faadc979 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/instance/testMultiByteTruncate.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/instance/testMultiByteTruncate.st @@ -1,4 +1,4 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core testMultiByteTruncate self assert: ((self multiByteConvert: 'abc') truncate) = (self multiByteConvert: 'abc'). self assert: ((self multiByteConvert: 'abc') truncate: 3) = (self multiByteConvert: 'abc'). diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/properties.json similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRStringTest.extension/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRStringTest.extension/properties.json diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRUtf8CodecTest.extension/instance/expectedFailures.st b/repository/Grease-Tests-GemStone32-Core.package/GRUtf8CodecTest.extension/instance/expectedFailures.st similarity index 65% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRUtf8CodecTest.extension/instance/expectedFailures.st rename to repository/Grease-Tests-GemStone32-Core.package/GRUtf8CodecTest.extension/instance/expectedFailures.st index 4a2a790a..86b72193 100644 --- a/repository/Grease-Tests-GemStone-Core.v32.package/GRUtf8CodecTest.extension/instance/expectedFailures.st +++ b/repository/Grease-Tests-GemStone32-Core.package/GRUtf8CodecTest.extension/instance/expectedFailures.st @@ -1,3 +1,3 @@ -*grease-tests-gemstone-core +*grease-tests-gemstone32-core expectedFailures ^ #() "all tests pass in GemStone 3.2" \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/GRUtf8CodecTest.extension/properties.json b/repository/Grease-Tests-GemStone32-Core.package/GRUtf8CodecTest.extension/properties.json similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/GRUtf8CodecTest.extension/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/GRUtf8CodecTest.extension/properties.json diff --git a/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/categories.st b/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/categories.st new file mode 100644 index 00000000..601b1fa0 --- /dev/null +++ b/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Grease-Tests-GemStone32-Core'! diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/initializers.st b/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/initializers.st similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/monticello.meta/initializers.st rename to repository/Grease-Tests-GemStone32-Core.package/monticello.meta/initializers.st diff --git a/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/package b/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/package new file mode 100644 index 00000000..8584d7db --- /dev/null +++ b/repository/Grease-Tests-GemStone32-Core.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Grease-Tests-GemStone32-Core') \ No newline at end of file diff --git a/repository/Grease-Tests-GemStone-Core.v32.package/properties.json b/repository/Grease-Tests-GemStone32-Core.package/properties.json similarity index 100% rename from repository/Grease-Tests-GemStone-Core.v32.package/properties.json rename to repository/Grease-Tests-GemStone32-Core.package/properties.json diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st new file mode 100644 index 00000000..2085b080 --- /dev/null +++ b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st @@ -0,0 +1,12 @@ +*Grease-Tests-Pharo-Core +writeToFile: aStringOrByteArray withFileNameDo: aBlock + | fileName directory | + fileName := 'GRPharoPlatformTest'. + directory := FileSystem disk workingDirectory. + [ GRPlatform current + write: aStringOrByteArray + toFile: fileName + inFolder: directory fullName. + aBlock value: directory fullName,GRPlatform current pathSeparator,fileName + ] ensure: [ + (directory / fileName) delete ] \ No newline at end of file diff --git a/repository/Grease-Tests-Squeak5-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st b/repository/Grease-Tests-Squeak5-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st new file mode 100644 index 00000000..f048cc47 --- /dev/null +++ b/repository/Grease-Tests-Squeak5-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st @@ -0,0 +1,12 @@ +*grease-tests-squeak5-core +writeToFile: aStringOrByteArray withFileNameDo: aBlock + | fileName directory | + fileName := 'GRSqueakPlatformTest'. + directory := FileDirectory default. + [ GRPlatform current + write: aStringOrByteArray + toFile: fileName + inFolder: directory fullName. + aBlock value: directory fullName,GRPlatform current pathSeparator,fileName + ] ensure: [ + directory deleteFileNamed: fileName ] \ No newline at end of file