Fix BaselineOfGitS>>installedVersion for installing git-s via git in CI

Fixes #33.
hpi-swa · Nov 12, 2024 · f1c64f4 · f1c64f4
1 parent 8ea5deb
commit f1c64f4
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 9 deletions.
diff --git a/src/BaselineOfGitS.package/BaselineOfGitS.class/instance/installedVersion.st b/src/BaselineOfGitS.package/BaselineOfGitS.class/instance/installedVersion.st
@@ -1,5 +1,8 @@
 accessing
 installedVersion
-	^ ((self project version spec repositorySpecs collect: #createRepository)
-		detect: [:each | each projectPath = GSSelfUpdater fullRepositoryName])
-		projectVersion
+	(self project version spec repositorySpecs collect: #createRepository) do: [:each |
+		(self installedVersionFromRepository: each) ifNotNil: [:version | ^ version]].
+	self error:
+		'Please install git-s via git, either using a Metacello GitHub repository
+		or by cloning git-s using a git client (e. g. using a GitHub action).'
+			withoutLineEndings withBlanksCondensed.
diff --git a/...eOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromDirectoryRepository..st b/...eOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromDirectoryRepository..st
@@ -0,0 +1,10 @@
+accessing
+installedVersionFromDirectoryRepository: anMCRepository
+	| current |
+	(anMCRepository isKindOf: MCDirectoryRepository) ifFalse: [^ nil].
+	current := anMCRepository directory asFSReference.
+	[current isRoot] whileFalse: [ | repository |
+		repository := GitRepository uninitializedOn: current.
+		repository exists ifTrue: [^ repository unitOfWork headRef].
+		current := current parent].
+	^ nil
diff --git a/...lineOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromGitHubRepository..st b/...lineOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromGitHubRepository..st
@@ -0,0 +1,5 @@
+accessing
+installedVersionFromGitHubRepository: anMCRepository
+	(anMCRepository isKindOf: MCFetchGithubRepository) ifFalse: [^ nil].
+	anMCRepository projectPath = GSSelfUpdater fullRepositoryName ifFalse: [^ nil].
+	^ anMCRepository projectVersion
diff --git a/src/BaselineOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromRepository..st b/src/BaselineOfGitS.package/BaselineOfGitS.class/instance/installedVersionFromRepository..st
@@ -0,0 +1,5 @@
+accessing
+installedVersionFromRepository: each
+	(self installedVersionFromGitHubRepository: each) ifNotNil: [:version | ^ version].
+	(self installedVersionFromDirectoryRepository: each) ifNotNil: [:version | ^ version].
+	^ nil
diff --git a/src/BaselineOfGitS.package/BaselineOfGitS.class/methodProperties.json b/src/BaselineOfGitS.package/BaselineOfGitS.class/methodProperties.json
@@ -3,6 +3,9 @@
 		 },
 	"instance" : {
 		"baseline:" : "mad 10/9/2024 22:23",
-		"installedVersion" : "mad 10/9/2024 21:00",
+		"installedVersion" : "mad 10/24/2024 14:25",
+		"installedVersionFromDirectoryRepository:" : "mad 10/24/2024 14:59",
+		"installedVersionFromGitHubRepository:" : "mad 10/24/2024 14:27",
+		"installedVersionFromRepository:" : "mad 10/24/2024 14:26",
 		"postLoad" : "mad 10/9/2024 19:35",
 		"projectClass" : "jr 5/4/2017 17:25" } }
diff --git a/src/FileSystem-Git.package/GitRepository.class/class/uninitializedOn..st b/src/FileSystem-Git.package/GitRepository.class/class/uninitializedOn..st
@@ -0,0 +1,3 @@
+instance creation
+uninitializedOn: aReference
+	^ self basicNew basicInitializeOn: aReference asFileReference
diff --git a/src/FileSystem-Git.package/GitRepository.class/instance/basicInitializeOn..st b/src/FileSystem-Git.package/GitRepository.class/instance/basicInitializeOn..st
@@ -0,0 +1,4 @@
+initialize-release
+basicInitializeOn: anFSReference
+	reference := anFSReference.
+	self initializeCache.
diff --git a/src/FileSystem-Git.package/GitRepository.class/instance/initializeOn..st b/src/FileSystem-Git.package/GitRepository.class/instance/initializeOn..st
@@ -1,5 +1,5 @@
 initialize-release
 initializeOn: anFSReference
-	reference := anFSReference.
-	self initializeCache.
-	self gitInitialize
+	self
+		basicInitializeOn: anFSReference;
+		gitInitialize.
diff --git a/src/FileSystem-Git.package/GitRepository.class/methodProperties.json b/src/FileSystem-Git.package/GitRepository.class/methodProperties.json
@@ -3,11 +3,13 @@
 		"initialize" : "jr 6/3/2017 12:07",
 		"memory" : "DamienCassou 2/26/2013 15:53",
 		"new" : "MaxLeske 8/11/2011 22:15",
-		"on:" : "CamilloBruni 8/30/2012 13:58" },
+		"on:" : "CamilloBruni 8/30/2012 13:58",
+		"uninitializedOn:" : "mad 10/24/2024 14:41" },
 	"instance" : {
 		"=" : "CamilloBruni 7/20/2011 13:07",
 		"addRemote:" : "jr 12/1/2018 23:35",
 		"baseDir" : "CamilloBruni 7/15/2011 15:40",
+		"basicInitializeOn:" : "mad 10/24/2024 14:39",
 		"configAt:ifAbsent:" : "jr 2/23/2020 21:29",
 		"configFile" : "jr 12/13/2016 17:45",
 		"configPartsFromSectionLabel:" : "jr 4/13/2017 23:04",
@@ -26,7 +28,7 @@
 		"headsDir" : "CamilloBruni 8/9/2011 17:41",
 		"initializeCache" : "jr 3/10/2020 21:22",
 		"initializeHEAD" : "CamilloBruni 9/2/2012 11:47",
-		"initializeOn:" : "jr 3/22/2017 15:12",
+		"initializeOn:" : "mad 10/24/2024 14:39",
 		"isInitialized" : "CamilloBruni 9/2/2012 11:33",
 		"nameOf:in:" : "jr 11/23/2016 18:22",
 		"newUnitOfWork" : "jr 4/20/2020 21:21",