Merge bca617d

pharo-vcs · Jan 18, 2024 · e875f30 · e875f30
2 parents e0f320f + bca617d
commit e875f30
Show file tree

Hide file tree

Showing 781 changed files with 11,105 additions and 10,172 deletions.
diff --git a/.github/scripts/preLoading.st b/.github/scripts/preLoading.st
diff --git a/.github/scripts/preTesting.st b/.github/scripts/preTesting.st
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,29 +19,24 @@ jobs:
       # Default value means that a failure in one OS cancels all 
       fail-fast: false
       matrix:
-        smalltalk: [ Pharo64-11 ]
+        smalltalk: [ Pharo64-12 ]
         os: [ ubuntu-latest, macos-latest ]
         ston: [ .smalltalk.ston ]
         # Test Windows with some exclusions. 
         # At least a part of the problem is reported here: 
         # https://github.com/pharo-vcs/iceberg/issues/1394
         include:
-          - smalltalk: Pharo64-11
+          - smalltalk: Pharo64-12
             os: windows-latest
             ston: .smalltalk.windows.ston
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup smalltalkCI
         uses: hpi-swa/setup-smalltalkCI@v1
         with:
-          smalltalk-image: ${{ matrix.smalltalk }}
-#      - name: Load Image and Run Release Tests
-#        run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.release.ston
-#        timeout-minutes: 10
-#      - name: Clean Up
-#        run: rm -Rf ${{ env.SMALLTALK_CI_BUILD }}
+          smalltalk-version: ${{ matrix.smalltalk }}
       - name: Load Image and Run Tests
         run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
         shell: bash

diff --git a/.smalltalk.release.ston b/.smalltalk.release.ston
diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st
@@ -2,12 +2,13 @@
 Baseline for https://github.com/pharo-vcs/iceberg project
 "
 Class {
-	#name : #BaselineOfIceberg,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfIceberg
+	#name : 'BaselineOfIceberg',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfIceberg',
+	#package : 'BaselineOfIceberg'
 }
 
-{ #category : #baseline }
+{ #category : 'baseline' }
 BaselineOfIceberg >> baseline: spec [
 	<baseline>
 
@@ -16,7 +17,6 @@ BaselineOfIceberg >> baseline: spec [
 
 		self tonel: spec.
 		self libgit: spec.
-		self ring2: spec.
 
 		spec
 			"iceberg"
@@ -30,7 +30,7 @@ BaselineOfIceberg >> baseline: spec [
 			package: 'Iceberg-TipUI' with: [ spec requires: #('Iceberg') ];
 			package: 'Iceberg-Memory' with: [ spec requires: #('Iceberg') ];
 			"tests"
-			package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory' 'Ring2') ];
+			package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory') ];
 			package: 'Iceberg-Tests-MetacelloIntegration' with: [ spec requires: #('Iceberg-Tests') ];
 			package: 'Iceberg-UI-Tests' with: [ spec requires: #('Iceberg-TipUI' 'Iceberg-Tests')];
 			package: 'Iceberg-Plugin-Migration-Tests' with: [ spec requires: #('Iceberg-Plugin-Migration' 'Iceberg-Tests') ];
@@ -63,14 +63,14 @@ BaselineOfIceberg >> baseline: spec [
 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BaselineOfIceberg >> customProjectAttributes [
 	Smalltalk os isMacOS ifTrue: [ ^ #(#MacOS) ].
 	Smalltalk os isUnix ifTrue: [ ^ #(#Unix) ].
 	Smalltalk os isWindows ifTrue: [ ^ #(#Windows) ]
 ]
 
-{ #category : #baseline }
+{ #category : 'baseline' }
 BaselineOfIceberg >> libgit: spec [
 	spec 
 		baseline: 'LibGit' 
@@ -84,14 +84,14 @@ BaselineOfIceberg >> libgit: spec [
 		with: [ spec loads: #('tests') ]
 ]
 
-{ #category : #script }
+{ #category : 'script' }
 BaselineOfIceberg >> postLoad [
 
 	self resetKMRepository.
 	(Smalltalk at: #Iceberg) bootstrap
 ]
 
-{ #category : #script }
+{ #category : 'script' }
 BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [
 	| repository |
 	self resetKMRepository.
@@ -108,7 +108,7 @@ BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [
 		packageList: aSpec packageNames
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BaselineOfIceberg >> projectClass [
 	^ super projectClass 
 	"this is breaking the bootstrap. Reverting it for now."
@@ -117,23 +117,16 @@ BaselineOfIceberg >> projectClass [
 		do: [ super projectClass ]"
 ]
 
-{ #category : #script }
+{ #category : 'script' }
 BaselineOfIceberg >> resetKMRepository [
 	Smalltalk 
 		at: #KMRepository 
 		ifPresent: [ :class | class reset ]
 ]
 
-{ #category : #baseline }
-BaselineOfIceberg >> ring2: spec [
-	spec
-		baseline: 'Ring2'
-		with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ]
-]
-
-{ #category : #baseline }
+{ #category : 'baseline' }
 BaselineOfIceberg >> tonel: spec [
 	spec
 		baseline: 'Tonel' 
-		with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.19' ]
+		with: [ spec repository: 'github://pharo-vcs/tonel:Pharo12' ]
 ]
diff --git a/BaselineOfIceberg/package.st b/BaselineOfIceberg/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfIceberg }
+Package { #name : 'BaselineOfIceberg' }
diff --git a/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st b/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st
@@ -1,47 +1,48 @@
 Class {
-	#name : #IceLibgitRuleBreakerRepository,
-	#superclass : #IceLibgitRepository,
-	#category : 'Iceberg-ArchitecturalRules'
+	#name : 'IceLibgitRuleBreakerRepository',
+	#superclass : 'IceLibgitRepository',
+	#category : 'Iceberg-ArchitecturalRules',
+	#package : 'Iceberg-ArchitecturalRules'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testDefinedRepositoryAccessor [
 
 	<repositoryHandleAccessor>
 	^ handle
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectly [
 
 	^ handle allBranches
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectlyWithErrorHandler [
 
 	self handleLibgitError: [handle allBranches]
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessor [
 
 	^ self testDefinedRepositoryAccessor allBranches
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessorWithErrorHandler [
 
 	self handleLibgitError: [ self testDefinedRepositoryAccessor allBranches]
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testMethodNotBreakingRule [
 
 	^ 1+1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceLibgitRuleBreakerRepository >> testNonDefinedRepositoryAccessor [
 
 	^ handle

diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st
@@ -6,18 +6,19 @@ Otherwise, libgit errors may be thrown to the user and produce ugly effects. E.g
 	- Libgit errors are criptyc and can only be understood by reading the message text...
 "
 Class {
-	#name : #IceShouldHandleLibgitErrors,
-	#superclass : #ReAbstractRule,
-	#category : 'Iceberg-ArchitecturalRules'
+	#name : 'IceShouldHandleLibgitErrors',
+	#superclass : 'ReAbstractRule',
+	#category : 'Iceberg-ArchitecturalRules',
+	#package : 'Iceberg-ArchitecturalRules'
 }
 
-{ #category : #'testing-interest' }
+{ #category : 'testing-interest' }
 IceShouldHandleLibgitErrors class >> checksNode [
 
 	^ true
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [
 
 	"Detect strange case where method node is nil"
@@ -44,21 +45,21 @@ IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [
 		ifFalse: [ aBlock cull: (self critiqueFor: aNode) ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceShouldHandleLibgitErrors >> group [
 
 	^ 'Architectural'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [
 
 	^ aClass allMethods
 		select:
-			[ :m | m pragmas anySatisfy: [ :p | p keyword = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ]
+			[ :m | m pragmas anySatisfy: [ :p | p selector = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ]
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceShouldHandleLibgitErrors >> name [
 
 	^ 'Should manage errors when doing a libgit call'

diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st
@@ -1,15 +1,16 @@
 Class {
-	#name : #IceShouldHandleLibgitErrorsTest,
-	#superclass : #TestCase,
-	#category : 'Iceberg-ArchitecturalRules'
+	#name : 'IceShouldHandleLibgitErrorsTest',
+	#superclass : 'TestCase',
+	#category : 'Iceberg-ArchitecturalRules',
+	#package : 'Iceberg-ArchitecturalRules'
 }
 
-{ #category : #rules }
+{ #category : 'rules' }
 IceShouldHandleLibgitErrorsTest class >> libgitRepositoryHandleAccessors [
 	self shouldBeImplemented.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [
 
 	| lintRule |
@@ -18,7 +19,7 @@ IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [
 	^ lintRule result smallLintCritics
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule [
 
 	| critiques |
@@ -27,7 +28,7 @@ IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule
 	self assert: critiques isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [
 
 	| critiques |
@@ -36,7 +37,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [
 	self assert: critiques isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [
 
 	| critiques |
@@ -45,7 +46,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [
 	self assert: critiques notEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErrorChecking [
 
 	| critiques |
@@ -54,7 +55,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErr
 	self assert: critiques isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithoutErrorChecking [
 
 	| critiques |
@@ -63,7 +64,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithout
 	self assert: critiques notEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [
 
 	| critiques |
@@ -72,7 +73,7 @@ IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [
 	self assert: critiques isEmpty.
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 IceShouldHandleLibgitErrorsTest >> testNonDefinedRepositoryAccessorBreaksRule [
 
 	| critiques |

diff --git a/Iceberg-ArchitecturalRules/package.st b/Iceberg-ArchitecturalRules/package.st
@@ -1 +1 @@
-Package { #name : #'Iceberg-ArchitecturalRules' }
+Package { #name : 'Iceberg-ArchitecturalRules' }
diff --git a/Iceberg-Libgit/IceBranchNotFound.class.st b/Iceberg-Libgit/IceBranchNotFound.class.st
@@ -2,20 +2,22 @@
 A branch was not found.
 "
 Class {
-	#name : #IceBranchNotFound,
-	#superclass : #IceError,
+	#name : 'IceBranchNotFound',
+	#superclass : 'IceError',
 	#instVars : [
 		'branchName'
 	],
-	#category : #'Iceberg-Libgit-Exceptions'
+	#category : 'Iceberg-Libgit-Exceptions',
+	#package : 'Iceberg-Libgit',
+	#tag : 'Exceptions'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceBranchNotFound >> branchName [
 	^ branchName
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceBranchNotFound >> branchName: aString [ 
 	branchName := aString
 ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Package { #name : #BaselineOfIceberg }
		Package { #name : 'BaselineOfIceberg' }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Package { #name : #'Iceberg-ArchitecturalRules' }
		Package { #name : 'Iceberg-ArchitecturalRules' }