diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st index 9152b2e0..d7d8a964 100644 --- a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st +++ b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st @@ -21,4 +21,6 @@ resolveWith: aDictionary aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ "try -Squeak6-" aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ - self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] \ No newline at end of file + "specific for Grease-Slime" + aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [ + self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] \ No newline at end of file diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st index 01828a6b..c721c9a6 100644 --- a/repository/Grease-Core.package/GRPlatform.class/instance/version.st +++ b/repository/Grease-Core.package/GRPlatform.class/instance/version.st @@ -2,5 +2,5 @@ version info version "Answer the Grease version" - ^ (GRVersion major: 1 minor: 7 revision: 0) + ^ (GRVersion major: 1 minor: 7 revision: 5) yourself \ No newline at end of file diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st index 3ba20dce..f5f8c691 100644 --- a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st +++ b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st @@ -1,3 +1,3 @@ file-library fileExists: aString - ^ (FileDirectory forFileName: aString) exists \ No newline at end of file + ^ GsFile existsOnServer: aString \ No newline at end of file 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 index 2b7331ab..22443227 100644 --- 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 @@ -4,4 +4,4 @@ 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 + ifFalse: [ aString asFileReference readStreamEncoded: 'utf-8' do: aBlock ] \ 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 index 762e9cca..22cf6c64 100644 --- 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 @@ -2,4 +2,4 @@ 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 + ifFalse: [ aString asFileReference writeStreamEncoded: 'utf-8' do: aBlock ] \ 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 index f9dda145..1852f83e 100644 --- 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 @@ -3,4 +3,4 @@ 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 + ifFalse: [ aString asFileReference readStreamEncoded: 'utf-8' do: aBlock ] \ 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 index c06164c8..0b43135e 100644 --- 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 @@ -2,4 +2,4 @@ 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 + ifFalse: [ aString asFileReference writeStreamEncoded: 'utf-8' do: [ :str | aBlock value: (ZnNewLineWriterStream on: str) ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/SequenceableCollection.extension/instance/sorted.st b/repository/Grease-Pharo90-Core.package/SequenceableCollection.extension/instance/sorted.st deleted file mode 100644 index 0836e77c..00000000 --- a/repository/Grease-Pharo90-Core.package/SequenceableCollection.extension/instance/sorted.st +++ /dev/null @@ -1,3 +0,0 @@ -*Grease-Pharo90-Core -sorted - ^ self sorted: [ :a :b | a <= b ] \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st index b42d4730..3c074d00 100644 --- a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st +++ b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st @@ -6,4 +6,5 @@ testPackages packages do: [ :each | self assert: each name notEmpty. self assert: each license notNil. - self assert: each url notNil ] \ No newline at end of file + self deny: (each dependencies includes: nil). + self assert: each url notNil ]. \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFileExists.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFileExists.st new file mode 100644 index 00000000..5d7796bc --- /dev/null +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFileExists.st @@ -0,0 +1,9 @@ +tests-filestreams +testFileExists + | theFileName | + self + writeToFile: 'test' + withFileNameDo:[ :fileName | + self assert: (GRPlatform current fileExists: fileName). + theFileName := fileName ]. + self deny: (GRPlatform current fileExists: theFileName) \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st new file mode 100644 index 00000000..a85ee772 --- /dev/null +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st @@ -0,0 +1,7 @@ +tests-filestreams +testReadWriteToFileInFolderTextUTF8 + #('Übèrstrîñgé' '£ęλ~') do:[ :text | + self + writeToFile: text + withFileNameDo:[ :fileName | + self assert: text equals: (GRPlatform current contentsOfFile: fileName binary: false) ] ]. \ No newline at end of file diff --git a/repository/Grease-Tests-Slime.package/.filetree b/repository/Grease-Tests-Slime.package/.filetree index 8998102c..57a67973 100644 --- a/repository/Grease-Tests-Slime.package/.filetree +++ b/repository/Grease-Tests-Slime.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/repository/Grease-Tests-Slime.package/GRPackage.extension/class/greaseTestsSlime.st b/repository/Grease-Tests-Slime.package/GRPackage.extension/class/greaseTestsSlime.st index a6fa00fd..0ef4a959 100644 --- a/repository/Grease-Tests-Slime.package/GRPackage.extension/class/greaseTestsSlime.st +++ b/repository/Grease-Tests-Slime.package/GRPackage.extension/class/greaseTestsSlime.st @@ -3,6 +3,6 @@ greaseTestsSlime ^ self new name: 'Grease-Tests-Slime'; description: 'Unit tests for the package Grease-Slime.'; - addDependency: 'Grease-Slime'; + addDependency: 'Grease-Pharo-Slime'; url: #seasideUrl; yourself \ No newline at end of file diff --git a/repository/Grease-Tests-Slime.package/GRPackage.extension/properties.json b/repository/Grease-Tests-Slime.package/GRPackage.extension/properties.json index dd2faaf0..ae522a7e 100644 --- a/repository/Grease-Tests-Slime.package/GRPackage.extension/properties.json +++ b/repository/Grease-Tests-Slime.package/GRPackage.extension/properties.json @@ -1,2 +1,3 @@ { - "name" : "GRPackage" } + "name" : "GRPackage" +} \ No newline at end of file diff --git a/repository/Grease-Tests-Slime.package/GRSlimeTest.class/properties.json b/repository/Grease-Tests-Slime.package/GRSlimeTest.class/properties.json index 803da85e..e01b8a06 100644 --- a/repository/Grease-Tests-Slime.package/GRSlimeTest.class/properties.json +++ b/repository/Grease-Tests-Slime.package/GRSlimeTest.class/properties.json @@ -1,15 +1,14 @@ { - "category" : "Grease-Tests-Slime", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "", + "super" : "TestCase", + "category" : "Grease-Tests-Slime", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], "instvars" : [ "model", - "environment" ], + "environment" + ], "name" : "GRSlimeTest", - "pools" : [ - ], - "super" : "TestCase", - "type" : "normal" } + "type" : "normal" +} \ No newline at end of file diff --git a/repository/Grease-Tests-Slime.package/properties.json b/repository/Grease-Tests-Slime.package/properties.json index f037444a..6f31cf5a 100644 --- a/repository/Grease-Tests-Slime.package/properties.json +++ b/repository/Grease-Tests-Slime.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file