From 233b8d3b491d7f7dcb1006e8146fbedaa2f021fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Mon, 26 Aug 2024 21:28:10 +0200 Subject: [PATCH 01/11] Updated changes because 'Pharo version control should not be used to commit changes to this repository' --- .../instance/basicLoadProjectOn..st | 2 +- .../instance/ignorePackageNotificationClass.st | 6 ++++++ .../SmalltalkCIPharo13.class/class/ensureAuthor.st | 3 +++ .../SmalltalkCIPharo13.class/class/getAuthor.st | 6 ++++++ .../instance/testAuthorIsEmptyFromPharo13.st | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st create mode 100644 repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ensureAuthor.st create mode 100644 repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/getAuthor.st create mode 100644 repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/instance/testAuthorIsEmptyFromPharo13.st diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st index 6e8f8fa4..881c1f33 100644 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st @@ -28,5 +28,5 @@ basicLoadProjectOn: aSmalltalkCI self withExceptionHandlerDo: [ aSmalltalkCI performMetacelloLoad: [ [ metacello load: self load ] - on: MetacelloIgnorePackageLoaded + on: self ignorePackageNotificationClass do: [ :e | e resume: self ignoreImage ] ] ] \ No newline at end of file diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st new file mode 100644 index 00000000..1ee48ca8 --- /dev/null +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st @@ -0,0 +1,6 @@ +executing +ignorePackageNotificationClass + + ^ Smalltalk globals + at: #MetacelloIgnorePackageLoaded + ifAbsent: [ Notification ] \ No newline at end of file diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ensureAuthor.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ensureAuthor.st new file mode 100644 index 00000000..3daf69fb --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ensureAuthor.st @@ -0,0 +1,3 @@ +helpers +ensureAuthor + "Do nothing, as Author was removed in Pharo 13" diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/getAuthor.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/getAuthor.st new file mode 100644 index 00000000..20ee494f --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/getAuthor.st @@ -0,0 +1,6 @@ +helpers +getAuthor + "Answer a representing an 'Author' in the image. + Here we answer an empty string since Author support was removed in Pharo 13" + + ^ '' \ No newline at end of file diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/instance/testAuthorIsEmptyFromPharo13.st b/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/instance/testAuthorIsEmptyFromPharo13.st new file mode 100644 index 00000000..0c133c44 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/instance/testAuthorIsEmptyFromPharo13.st @@ -0,0 +1,5 @@ +tests +testAuthorIsEmptyFromPharo13 + + SmalltalkCI platformClass = SmalltalkCIPharo13 + ifTrue: [ self assertEmpty: SmalltalkCI platformClass getAuthor ] From 28005762dec4d3431ab6fd83035c8aed98b3aa48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Mon, 26 Aug 2024 21:31:59 +0200 Subject: [PATCH 02/11] Trigger PR update From 807a97974510d3a6fef105eb6cfa509685215d2d Mon Sep 17 00:00:00 2001 From: Hernan Morales Durand Date: Tue, 27 Aug 2024 11:55:16 +0200 Subject: [PATCH 03/11] Use at: with a nil check instead of at:ifAbsent: because 'it is not portable' --- .../instance/ignorePackageNotificationClass.st | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st index 1ee48ca8..9996685a 100644 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st @@ -1,6 +1,6 @@ executing ignorePackageNotificationClass - ^ Smalltalk globals - at: #MetacelloIgnorePackageLoaded - ifAbsent: [ Notification ] \ No newline at end of file + ^ (Smalltalk globals + at: #MetacelloIgnorePackageLoaded) + ifNil: [ Notification ] \ No newline at end of file From 7625c78079b77db4edb9649034eb187efe7fef94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Tue, 27 Aug 2024 22:02:00 +0200 Subject: [PATCH 04/11] Dispatch ignorePackageNotificationClass through SmalltalkCI platformClass --- .../instance/ignorePackageNotificationClass.st | 4 +--- .../class/ignorePackageNotificationClass.st | 5 +++++ .../class/ignorePackageNotificationClass.st | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st create mode 100644 repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st index 9996685a..90d79407 100644 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st @@ -1,6 +1,4 @@ executing ignorePackageNotificationClass - ^ (Smalltalk globals - at: #MetacelloIgnorePackageLoaded) - ifNil: [ Notification ] \ No newline at end of file + ^ SmalltalkCI platformClass ignorePackageNotificationClass \ No newline at end of file diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st new file mode 100644 index 00000000..a5989806 --- /dev/null +++ b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st @@ -0,0 +1,5 @@ +helpers +ignorePackageNotificationClass + + ^ (Smalltalk globals at: #MetacelloIgnorePackageLoaded) + ifNil: [ Notification ]. \ No newline at end of file diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st new file mode 100644 index 00000000..210bfc10 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st @@ -0,0 +1,6 @@ +helpers +ignorePackageNotificationClass + + ^ Smalltalk globals + at: #MetacelloIgnorePackageLoaded + ifAbsent: [ Notification ]. \ No newline at end of file From e4c673935de35f8bd7967427546f674c4df07d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Tue, 27 Aug 2024 23:01:12 +0200 Subject: [PATCH 05/11] Try using includesKey: instead of (at:) ifNil: --- .../class/ignorePackageNotificationClass.st | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st index a5989806..819820bd 100644 --- a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st +++ b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st @@ -1,5 +1,6 @@ helpers ignorePackageNotificationClass - - ^ (Smalltalk globals at: #MetacelloIgnorePackageLoaded) - ifNil: [ Notification ]. \ No newline at end of file + + ^ (Smalltalk globals includesKey: #MetacelloIgnorePackageLoaded) + ifTrue: [ Smalltalk at: #MetacelloIgnorePackageLoaded ] + ifFalse: [ Notification ] \ No newline at end of file From e515bb3759934a59c336ce4b9b236393a023adbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Tue, 27 Aug 2024 23:09:37 +0200 Subject: [PATCH 06/11] I think we don't need the P13 version of ignorePackageNotificationClass --- .../class/ignorePackageNotificationClass.st | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st deleted file mode 100644 index 210bfc10..00000000 --- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/ignorePackageNotificationClass.st +++ /dev/null @@ -1,6 +0,0 @@ -helpers -ignorePackageNotificationClass - - ^ Smalltalk globals - at: #MetacelloIgnorePackageLoaded - ifAbsent: [ Notification ]. \ No newline at end of file From 7e3bce02e01394ad3ba1c72689cddb055222d467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Wed, 28 Aug 2024 04:24:20 +0200 Subject: [PATCH 07/11] Avoid the mess of using Notification and re-introduce MetacelloIgnorePackageLoaded --- .../methodProperties.json | 5 +++++ .../properties.json | 14 ++++++++++++++ .../instance/basicLoadProjectOn..st | 2 +- .../instance/ignorePackageNotificationClass.st | 4 ---- .../class/ignorePackageNotificationClass.st | 6 ------ 5 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/methodProperties.json create mode 100644 repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json delete mode 100644 repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st delete mode 100644 repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/methodProperties.json b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/methodProperties.json new file mode 100644 index 00000000..0e4a6622 --- /dev/null +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + } } diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json new file mode 100644 index 00000000..1b24246b --- /dev/null +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "SmalltalkCI-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SCIMetacelloIgnorePackageLoaded", + "pools" : [ + ], + "super" : "Notification", + "type" : "normal" } diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st index 881c1f33..07c47a4c 100644 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st +++ b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/basicLoadProjectOn..st @@ -28,5 +28,5 @@ basicLoadProjectOn: aSmalltalkCI self withExceptionHandlerDo: [ aSmalltalkCI performMetacelloLoad: [ [ metacello load: self load ] - on: self ignorePackageNotificationClass + on: SCIMetacelloIgnorePackageLoaded do: [ :e | e resume: self ignoreImage ] ] ] \ No newline at end of file diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st deleted file mode 100644 index 90d79407..00000000 --- a/repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/ignorePackageNotificationClass.st +++ /dev/null @@ -1,4 +0,0 @@ -executing -ignorePackageNotificationClass - - ^ SmalltalkCI platformClass ignorePackageNotificationClass \ No newline at end of file diff --git a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st b/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st deleted file mode 100644 index 819820bd..00000000 --- a/repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ignorePackageNotificationClass.st +++ /dev/null @@ -1,6 +0,0 @@ -helpers -ignorePackageNotificationClass - - ^ (Smalltalk globals includesKey: #MetacelloIgnorePackageLoaded) - ifTrue: [ Smalltalk at: #MetacelloIgnorePackageLoaded ] - ifFalse: [ Notification ] \ No newline at end of file From 92f5df50cea277a3e5fcff8d396172ad45dd78e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Wed, 28 Aug 2024 04:29:42 +0200 Subject: [PATCH 08/11] Add missing README.md --- .../SCIMetacelloIgnorePackageLoaded.class/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/README.md diff --git a/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/README.md b/repository/SmalltalkCI-Core.package/SCIMetacelloIgnorePackageLoaded.class/README.md new file mode 100644 index 00000000..e69de29b From af33caf57aa29e0741aa520f784b041c45e49426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Wed, 28 Aug 2024 05:01:05 +0200 Subject: [PATCH 09/11] Add method to ignore author behavior in P13 but keeping compatibility with other plaforms for tests --- .../instance/authorName.st | 3 +++ .../methodProperties.json | 5 +++++ .../IceMetacelloPharoPlatform.extension/properties.json | 2 ++ .../SmalltalkCIPharo13.class/class/setAuthor.st | 3 +++ 4 files changed, 13 insertions(+) create mode 100644 repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st create mode 100644 repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json create mode 100644 repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json create mode 100644 repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st new file mode 100644 index 00000000..f662f288 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st @@ -0,0 +1,3 @@ +*Iceberg-Metacello-Integration +authorName: aString + "Do nothing. Kept here for SmalltalkCI compatibilitu with older/other platforms" \ No newline at end of file diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json new file mode 100644 index 00000000..ab6e8495 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "authorName:" : "HernanMoralesDurand 28/8/2024 04:56" } } diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json new file mode 100644 index 00000000..e40cfd16 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "IceMetacelloPharoPlatform" } diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st new file mode 100644 index 00000000..617d5501 --- /dev/null +++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st @@ -0,0 +1,3 @@ +helpers +setAuthor: anAuthor + "Do nothing. Author was removed in Pharo 13" From 6c1f8447020ae1b4b67d558eb2380968316b916d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Wed, 28 Aug 2024 05:06:42 +0200 Subject: [PATCH 10/11] Fix inconsistency in method extension name --- .../IceMetacelloPharoPlatform.extension/instance/authorName.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st index f662f288..4b3942af 100644 --- a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st +++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st @@ -1,3 +1,3 @@ -*Iceberg-Metacello-Integration +*IceMetacelloPharoPlatform authorName: aString "Do nothing. Kept here for SmalltalkCI compatibilitu with older/other platforms" \ No newline at end of file From e43b3c74e3c35c29dba43d74424128562f12c6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Wed, 28 Aug 2024 05:09:03 +0200 Subject: [PATCH 11/11] Try inconsistency fix again --- .../IceMetacelloPharoPlatform.extension/instance/authorName.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st index 4b3942af..fa25fd6d 100644 --- a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st +++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st @@ -1,3 +1,3 @@ -*IceMetacelloPharoPlatform +*SmalltalkCI-Pharo-Core authorName: aString "Do nothing. Kept here for SmalltalkCI compatibilitu with older/other platforms" \ No newline at end of file