Introduce temporary versions, to allow handling some requirements whi…

…le code is being loaded.
Fixed failing tests.
Added test for metacello integration.
Extend interface of IceMetacelloRepositoryAdapter (better metacello integration).

Iceberg-Tests.package/IceRepositoryTest.class/instance/testMetacelloIntegration.st

@@ -11,6 +11,7 @@ testMetacelloIntegration
 		detect: [ :repo | repo origin projectName = projectName ]
 		ifNone: [ self fail: 'Could not find repository for project: ', projectName ].
 
-	self assert: (repository loadedCode loadedVersions allSatisfy: [ :version | version isKindOf: IceSavedPackageVersion ]).
+	self assert: (repository loadedCode loadedVersions noneSatisfy: [ :version | version isKindOf: IceForeignVersion ]).
+	self assert: ((repository loadedCode versionFor: (repository packageNamed: packageName)) isKindOf: IceSavedPackageVersion ).
 	self assert: repository incommingCommits isEmpty.
 	self assert: repository outgoingCommits isEmpty.

Iceberg.package/IceAbstractVersion.class/instance/updatedVersion.st → Iceberg.package/IceAbstractVersion.class/instance/updated.st

@@ -1,3 +1,3 @@
 patches
-updatedVersion
+updated
 	^ self

Iceberg.package/IceForeignVersion.class/instance/mcVersion.st

@@ -1,4 +1,3 @@
 as yet unclassified
 mcVersion
-	self halt.
 	^ mcVersion ifNil: [ mcVersion := self package workingCopy loadedVersion ]

Iceberg.package/IceLoadedCode.class/instance/computeReferenceCommit.st

@@ -1,14 +1,15 @@
 initialization
 computeReferenceCommit
 	| candidates |
-
+
+	loadedVersions := self loadedVersions collect: #updated.
 	"1. If no code has been loaded, take HEAD commit as reference."
-	self loadedVersions isEmpty ifTrue: [ ^ self repository headCommit ].
+	loadedVersions isEmpty ifTrue: [ ^ self repository headCommit ].
 
 	"2. Happy path: see if all loaded code has the same updation commit. 
 	If we can't compute an updation commit for some loaded code, it means that it has been 
 	probably loaded from another kind of repository, we just ignore it."
-	candidates := (self loadedVersions collect: [:version | version commit] as: Set) reject: #isNil.
+	candidates := (loadedVersions collect: [:version | version commit] as: Set) reject: #isNil.
 	candidates size = 1 ifTrue: [ ^ candidates anyOne ].
 
 	"3. None of the loaded versions produced a non nil candidate, just use the HEAD commit"	

Iceberg.package/IceLoadedCode.class/instance/loadedVersions.st

@@ -1,8 +1,8 @@
 accessing
 loadedVersions
-	^ loadedVersions ifNil: [ 
-		loadedVersions := Dictionary new.
-		repository loadedPackages do: [ :pkg | self versionLoaded: pkg computeLoadedVersion ].
-
-		loadedVersions
- 	]
+	^ loadedVersions 
+		ifNil: [ 
+			loadedVersions := Dictionary new.
+			repository loadedPackages do: [ :pkg | self versionLoaded: pkg computeLoadedVersion ].
+			loadedVersions
+	 	]

Iceberg.package/IceLoadedCode.class/instance/versionFor..st

@@ -1,7 +1,7 @@
 querying
-versionFor: package 
+versionFor: package
 	^ self loadedVersions 
 		at: package 
-		ifPresent: #updatedVersion
+		ifPresent: #updated
 		ifAbsentPut: [ package computeLoadedVersion ]
 

Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/canUpgradeTo..st

@@ -0,0 +1,8 @@
+testing
+canUpgradeTo: anMCGitBasedRepository 
+	"Copied from MCGitBasedNetworkRepository"
+	self halt.
+  (anMCGitBasedRepository isKindOf: self class) ifFalse: [ ^ false ].
+
+  ^ self projectPath = anMCGitBasedRepository projectPath 
+	and: [ self repoPath = anMCGitBasedRepository repoPath ]

Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/hasNoLoadConflicts..st

@@ -0,0 +1,8 @@
+testing
+hasNoLoadConflicts: anMCGitBasedRepository
+	"Copied from MCGitBasedNetworkRepository"
+  	(anMCGitBasedRepository isKindOf: self class) ifFalse: [ ^ false ].
+
+	^ self projectPath = anMCGitBasedRepository projectPath and: [
+		self repoPath = anMCGitBasedRepository repoPath and: [ 
+			self projectVersion = anMCGitBasedRepository projectVersion ] ]

Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/projectPath.st

@@ -0,0 +1,3 @@
+accessing
+projectPath
+	^ self repository origin projectPath

Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/projectVersion.st

@@ -0,0 +1,3 @@
+accessing
+projectVersion
+	^ self repository branch name

Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/repoPath.st

@@ -0,0 +1,3 @@
+accessing
+repoPath
+	^ self repository subdirectory 

Iceberg.package/IceRemoteScpRepository.class/instance/projectPath.st

@@ -0,0 +1,3 @@
+accessing
+projectPath
+	^ self owner, '/', self projectName

Iceberg.package/IceTemporaryVersion.class/instance/commit.st

@@ -0,0 +1,5 @@
+as yet unclassified
+commit
+	"I am a temporary version, I am not related to any commit or it is unknown. 
+	When computing a reference commit I must be ignored."
+	^ nil

Iceberg.package/IceTemporaryVersion.class/instance/updatedVersion.st → Iceberg.package/IceTemporaryVersion.class/instance/updated.st

@@ -1,5 +1,5 @@
 patches
-updatedVersion
+updated
 	| newVersion |
 	newVersion := self package computeLoadedVersion.
 	self package repository loadedCode versionLoaded: newVersion.