From 13977794b6a4b36e3627228ddfdf47d84bf79780 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 15 Aug 2021 11:43:25 +0200 Subject: [PATCH 01/14] Change ascii to utf8 encoding for text files in Pharo 9 --- .../instance/readFileStreamOn.do.binary..st | 2 +- .../instance/writeFileStreamOn.do.binary..st | 2 +- .../instance/testReadWriteToFileInFolderText.st | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) 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-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st index 2d9fc845..247fc165 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st @@ -1,8 +1,7 @@ tests-filestreams testReadWriteToFileInFolderText - | text | - text := 'Ph''nglui mglw''nafh Cthulhu R''lyeh wgah''nagl fhtagn'. - self - writeToFile: text - withFileNameDo:[ :fileName | - self assert: (text = (GRPlatform current contentsOfFile: fileName binary: false)) ] \ No newline at end of file + #('Ph''nglui mglw''nafh Cthulhu R''lyeh wgah''nagl fhtagn' 'Ü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 From 652acb562c2d3f39c2572f38e0a05b7737382dca Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 16 Aug 2021 09:28:29 +0200 Subject: [PATCH 02/14] Change ascii to utf8 encoding for text files in Pharo 7 --- .../instance/readFileStreamOn.do.binary..st | 2 +- .../instance/writeFileStreamOn.do.binary..st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From d305fd5012acec83d6d773234c71ff95d594c8ba Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 16 Aug 2021 09:44:20 +0200 Subject: [PATCH 03/14] Move utf8 test file read/write test to Pharo specific test package and mark it as expected failure for Pharo 7 (and earlier) --- .../instance/testReadWriteToFileInFolderText.st | 11 ++++++----- .../instance/expectedFailures.st | 10 ++++++++++ .../instance/testReadWriteToFileInFolderTextUTF8.st | 7 +++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st create mode 100644 repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testReadWriteToFileInFolderTextUTF8.st diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st index 247fc165..2d9fc845 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteToFileInFolderText.st @@ -1,7 +1,8 @@ tests-filestreams testReadWriteToFileInFolderText - #('Ph''nglui mglw''nafh Cthulhu R''lyeh wgah''nagl fhtagn' 'Ü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 + | text | + text := 'Ph''nglui mglw''nafh Cthulhu R''lyeh wgah''nagl fhtagn'. + self + writeToFile: text + withFileNameDo:[ :fileName | + self assert: (text = (GRPlatform current contentsOfFile: fileName binary: false)) ] \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st new file mode 100644 index 00000000..d0d53741 --- /dev/null +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st @@ -0,0 +1,10 @@ +running +expectedFailures + "UTF8 encoding/decoding for text files only available from Pharo7" + Smalltalk at: #SystemVersion ifPresent: [ :systemVersion | + | versionString | + versionString := systemVersion current version. + (versionString beginsWith: 'Pharo') ifTrue: [ + systemVersion current major <= 7 + ifTrue: [ ^ #(testReadWriteToFileInFolderTextUTF8) ] ] ]. + ^ #() \ 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 From eee09562eff1f6936177a1594f6575e2e16f8c20 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 16 Aug 2021 09:51:18 +0200 Subject: [PATCH 04/14] Fixed wrong version comparison for expected failure in test --- .../GRPharoPlatformTest.class/instance/expectedFailures.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st index d0d53741..74b34dcb 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st @@ -5,6 +5,6 @@ expectedFailures | versionString | versionString := systemVersion current version. (versionString beginsWith: 'Pharo') ifTrue: [ - systemVersion current major <= 7 + systemVersion current major < 7 ifTrue: [ ^ #(testReadWriteToFileInFolderTextUTF8) ] ] ]. ^ #() \ No newline at end of file From 4ab1bebeff2b141a6fe0d10a7cf1716602ca5cbf Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 16 Aug 2021 11:21:40 +0200 Subject: [PATCH 05/14] Seems like the MultiByteFileStream did write utf8 already... (so this works in Pharo6 as well) --- .../instance/expectedFailures.st | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st deleted file mode 100644 index 74b34dcb..00000000 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/expectedFailures.st +++ /dev/null @@ -1,10 +0,0 @@ -running -expectedFailures - "UTF8 encoding/decoding for text files only available from Pharo7" - Smalltalk at: #SystemVersion ifPresent: [ :systemVersion | - | versionString | - versionString := systemVersion current version. - (versionString beginsWith: 'Pharo') ifTrue: [ - systemVersion current major < 7 - ifTrue: [ ^ #(testReadWriteToFileInFolderTextUTF8) ] ] ]. - ^ #() \ No newline at end of file From 99278d4a75dfaf7244f24af1dae8e25da73309df Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 16 Aug 2021 11:56:08 +0200 Subject: [PATCH 06/14] I always keep forgetting the version info... now at 1.7.3 --- .../Grease-Core.package/GRPlatform.class/instance/version.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st index 01828a6b..b8628c03 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: 3) yourself \ No newline at end of file From 55667df2d237ea1dc8bd715b56f4a9785381794b Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 7 Sep 2021 20:24:19 +0200 Subject: [PATCH 07/14] Fix GRPackage dependency declaration --- .../Grease-Tests-Slime.package/.filetree | 5 +++-- .../class/greaseTestsSlime.st | 2 +- .../GRPackage.extension/properties.json | 3 ++- .../GRSlimeTest.class/properties.json | 19 +++++++++---------- .../properties.json | 3 +-- 5 files changed, 16 insertions(+), 16 deletions(-) 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 From 1c55905463adc188bfc8a82bd8d49d30695aa061 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 7 Sep 2021 20:26:49 +0200 Subject: [PATCH 08/14] Added a test for broken package dependencies --- .../GRPackageTest.class/instance/testPackages.st | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 1f93dc510b6d1ddf6e9178e821c3ba80cbc0d2a3 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 7 Sep 2021 20:38:13 +0200 Subject: [PATCH 09/14] Fix package resolution for Slime exception --- .../GRPackage.class/instance/resolveWith..st | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st index 9152b2e0..7a26cfe3 100644 --- a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st +++ b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st @@ -5,20 +5,16 @@ resolveWith: aDictionary aDictionary at: each ifAbsent: [ "if Foo-Pharo-Bar fails try Foo-Pharo20-Bar and Foo-Pharo30-Bar" (each indexOfSubCollection: '-Pharo-' startingAt: 1) ~= 0 ifTrue: [ - "try -Pharo40-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [ - "try -Pharo50-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [ - "try -Pharo60-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [ - "try -Pharo70-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [ - "try -Pharo90-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ - "try -Squeak-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ - "try -Squeak5-" - 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 + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [ + "try -Pharo70-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [ + "try -Pharo90-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ + "try -Squeak-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ + "try -Squeak5-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ + "try -Squeak6-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ + 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 From 026c637e76a834a1251419c6142558bc5ec89fb7 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 7 Sep 2021 20:43:02 +0200 Subject: [PATCH 10/14] Fix package test --- .../GRPackage.class/instance/resolveWith..st | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st index 7a26cfe3..d7d8a964 100644 --- a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st +++ b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st @@ -5,16 +5,22 @@ resolveWith: aDictionary aDictionary at: each ifAbsent: [ "if Foo-Pharo-Bar fails try Foo-Pharo20-Bar and Foo-Pharo30-Bar" (each indexOfSubCollection: '-Pharo-' startingAt: 1) ~= 0 ifTrue: [ - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [ - "try -Pharo70-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [ - "try -Pharo90-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ - "try -Squeak-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ - "try -Squeak5-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ - "try -Squeak6-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ - 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 + "try -Pharo40-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [ + "try -Pharo50-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [ + "try -Pharo60-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [ + "try -Pharo70-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [ + "try -Pharo90-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ + "try -Squeak-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ + "try -Squeak5-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ + "try -Squeak6-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ + "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 From 1dcdab186cbd4926728683efb91e2e421a09edb2 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Fri, 17 Sep 2021 23:32:34 +0200 Subject: [PATCH 11/14] SequenceableCollection>>#sorted unnecessary in Grease-Pharo90-Core Fix #125 --- .../SequenceableCollection.extension/instance/sorted.st | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 repository/Grease-Pharo90-Core.package/SequenceableCollection.extension/instance/sorted.st 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 From 48f401f4eb5b02591d73947617b3d6aff14e8907 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Thu, 23 Sep 2021 20:30:59 +0200 Subject: [PATCH 12/14] fix issue 127 (fileExists: in GemStone reports on existence of directory, not the file) --- .../GRGemStonePlatform.class/instance/fileExists..st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ba95d23ba127dc8ae52503702003df45c2f5b8c2 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Thu, 23 Sep 2021 20:41:55 +0200 Subject: [PATCH 13/14] Added test for fileExists: --- .../GRPlatformTest.class/instance/testFileExists.st | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testFileExists.st 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 From 99b0213ad62645f4f9d750d5b4e31288368777a0 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Thu, 23 Sep 2021 20:43:17 +0200 Subject: [PATCH 14/14] version 1.7.5 --- .../Grease-Core.package/GRPlatform.class/instance/version.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st index b8628c03..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: 3) + ^ (GRVersion major: 1 minor: 7 revision: 5) yourself \ No newline at end of file