Merge branch 'dev-2.0' into cleanups

jecisc · Nov 21, 2023 · a354b7f · a354b7f
2 parents 48291cd + 97582ee
commit a354b7f
Show file tree

Hide file tree

Showing 432 changed files with 4,557 additions and 4,075 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
@@ -32,16 +32,11 @@ jobs:
     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/.project b/.project
@@ -1,4 +1,3 @@
 {
-	'srcDirectory' : '',
-	'tags' : [ #system ]
+	'srcDirectory' : ''
 }
diff --git a/.smalltalk.release.ston b/.smalltalk.release.ston
diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st
@@ -17,7 +17,6 @@ BaselineOfIceberg >> baseline: spec [
 
 		self tonel: spec.
 		self libgit: spec.
-		self ring2: spec.
 
 		spec
 			"iceberg"
@@ -31,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') ];
@@ -77,7 +76,7 @@ BaselineOfIceberg >> libgit: spec [
 		baseline: 'LibGit' 
 		with: [ 
 			spec
-				repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.8';
+				repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.9';
   			loads: 'default' ].
 	spec  
 		project: 'LibGit-Tests'
@@ -125,13 +124,6 @@ BaselineOfIceberg >> resetKMRepository [
 		ifPresent: [ :class | class reset ]
 ]
 
-{ #category : 'baseline' }
-BaselineOfIceberg >> ring2: spec [
-	spec
-		baseline: 'Ring2'
-		with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ]
-]
-
 { #category : 'baseline' }
 BaselineOfIceberg >> tonel: spec [
 	spec

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 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-Filetree/IceLibgitFiletreeFileUtils.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st
@@ -2,27 +2,29 @@
 Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository.
 "
 Class {
-	#name : #IceLibgitFiletreeFileUtils,
-	#superclass : #Object,
-	#category : #'Iceberg-Libgit-Filetree-Utilities'
+	#name : 'IceLibgitFiletreeFileUtils',
+	#superclass : 'Object',
+	#category : 'Iceberg-Libgit-Filetree-Utilities',
+	#package : 'Iceberg-Libgit-Filetree',
+	#tag : 'Utilities'
 }
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> deleteAll: aTreeBuilder [ 
     ^ aTreeBuilder deleteAll
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> directoryExists: aLGitTreeEntry [ 
 	^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> directoryFromEntry: treeEntry [ 
 	^ treeEntry object
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aCommitOrTree [
 	^ aCommitOrTree 
 		entryByPath: aString 
@@ -31,27 +33,27 @@ IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aComm
 
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> directoryName: anEntry [
     ^ anEntry filename
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> fileName: anEntry [
     ^ anEntry filename
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 IceLibgitFiletreeFileUtils class >> pathNameDelimiter [
 	^ $/
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> readStreamFor: fileName in: tree do: aBlock [
 	(tree entryByPath: fileName) readStreamDo: aBlock
 ]
 
-{ #category : #utilities }
+{ #category : 'utilities' }
 IceLibgitFiletreeFileUtils class >> writeStreamFor: fileName in: directory do: aBlock [ 
 	directory addEntryNamed: fileName withContents: (String streamContents: aBlock).
 ]