Fixes #6 - Add abstract class for common test code. - Add IcePackageR…

…eference to model packages from our view.
- Differentiate loaded from unloaded packages in a repository.
-

Iceberg.package/FileSystemDirectoryEntry.extension/instance/asIcePackage.st

@@ -0,0 +1,3 @@
+*Iceberg-Core
+asIcePackage
+	^ Ice packageNamed: self asFileReference basenameWithoutExtension

Iceberg.package/FileSystemDirectoryEntry.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "FileSystemDirectoryEntry" }

Iceberg.package/Ice.class/class/packageNamed..st

@@ -1,3 +1,3 @@
 accessing
 packageNamed: packageName
-	^ MCPackage named: packageName 
+	^ IcePackageReference named: packageName

Iceberg.package/Ice.class/class/workingCopyForPackageNamed..st

@@ -1,3 +1,3 @@
 accessing
 workingCopyForPackageNamed: packageName
-	^ self workingCopyForPackage: (self packageNamed: packageName)
+	^ (self packageNamed: packageName) workingCopy

Iceberg.package/IcePackageChangeSet.class/instance/commitWithMessage.to..st

@@ -3,5 +3,5 @@ commitWithMessage: commitMessage to: repository
 	"It should not be necessary to receive the repository as an argument, I should get it
 	from the package (which should be smarter)"
 	repository 
-		savePackage: self package name
+		savePackage: self package packageName
 		withMessage: commitMessage

Iceberg.package/IcePackageChangeSet.class/instance/description.st

@@ -0,0 +1,3 @@
+printing
+description
+	^ self package packageName

Iceberg.package/IcePackageChangeSet.class/instance/printOn..st

@@ -1,3 +1,6 @@
 printing
 printOn: aStream
-	aStream nextPutAll: self package name
+	aStream nextPutAll: self class name;
+		nextPut: $(;
+		nextPutAll: self package packageName;
+		nextPut: $)

Iceberg.package/IcePackageReference.class/README.md

@@ -0,0 +1,7 @@
+I represent a package, that could be in an IceRepository or in the image.
+
+Public API and Key Messages
+- isLoaded tells if the package is currently loaded in the image.
+
+In the future we should add load/unload here.
+We could also add commit, but in general is better to commit at the project level and not at the package level.

Iceberg.package/IcePackageReference.class/class/named..st

@@ -0,0 +1,5 @@
+instance creation
+named: aPackageName
+	^ self new 
+		packageName: aPackageName;
+		yourself

Iceberg.package/IcePackageReference.class/instance/^equals.st

@@ -0,0 +1,4 @@
+comparing
+= anotherPackage
+	^ anotherPackage species = self species 
+	and: [ self packageName = anotherPackage packageName ]

Iceberg.package/IcePackageReference.class/instance/isLoaded.st

@@ -0,0 +1,3 @@
+accessing
+isLoaded
+	^ RPackageOrganizer default includesPackageNamed: packageName

Iceberg.package/IcePackageReference.class/instance/packageName..st

@@ -0,0 +1,3 @@
+accessing
+packageName: anObject
+	packageName := anObject

Iceberg.package/IcePackageReference.class/instance/packageName.st

@@ -0,0 +1,3 @@
+accessing
+packageName
+	^ packageName

Iceberg.package/IcePackageReference.class/instance/printOn..st

@@ -0,0 +1,9 @@
+printing
+printOn: aStream
+	aStream nextPutAll: self class name;
+		nextPut: $(;
+		nextPutAll: packageName;
+		nextPutAll: ', ';
+		nextPutAll: (self isLoaded ifTrue: 'loaded' ifFalse: 'not loaded');
+		nextPut: $)
+

Iceberg.package/IcePackageReference.class/instance/workingCopy.st

@@ -0,0 +1,4 @@
+querying
+workingCopy
+	^ self isLoaded ifTrue: [
+		MCWorkingCopy forPackage: (MCPackage named: self packageName)]

Iceberg.package/IcePackageReference.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "NicoPasserini 5/25/2016 12:00",
+	"instvars" : [
+		"packageName" ],
+	"name" : "IcePackageReference",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }

Iceberg.package/IceRepository.class/instance/allPackages.st

@@ -1,7 +1,3 @@
 querying
 allPackages
-	^ Array streamContents: [ :result |
-		self lookupPackages collect: [ :directory |
-			Ice packageNamed: (directory asFileReference basenameWithoutExtension)
-				 ifPresent: [ :package | result nextPut: package mcPackage ]
-		]]
+	^ self lookupPackages collect: #asIcePackage

Iceberg.package/IceRepository.class/instance/latestVersionForPackage..st

@@ -5,4 +5,4 @@ latestVersionForPackage: package
 			| latest | 
 			latest := versions detectMax: #versionNumber.
 			repository versionFromFileNamed: latest]
-		ifEmpty: [ self error: 'Package ', package name, ' is not found in repository ', self ]
+		ifEmpty: [ self error: 'Package ', package name, ' is not found in repository ', self printString ]

Iceberg.package/IceRepository.class/instance/loadedPackages.st

@@ -0,0 +1,3 @@
+working copies
+loadedPackages
+	^ self allPackages filter: #isLoaded

Iceberg.package/IceRepository.class/instance/printOn..st

@@ -0,0 +1,6 @@
+printing
+printOn: aStream
+	aStream nextPutAll: self class name;
+		nextPut: $(;
+		nextPutAll: self origin url;
+		nextPut: $)

Iceberg.package/IceRepository.class/instance/versionsFor..st

@@ -1,3 +1,3 @@
 versions handling
 versionsFor: package
-	^ self allVersionDescriptors select: [ :version | version packageName = package name ]
+	^ self allVersionDescriptors select: [ :version | version packageName = package packageName ]

Iceberg.package/IceRepository.class/instance/workingCopies.st

@@ -0,0 +1,9 @@
+working copies
+workingCopies
+	^ self loadedPackages collect: #workingCopy
+"	^ Array streamContents: [ :result |
+		self lookupPackages collect: [ :directory |
+			Ice packageNamed: (directory asFileReference basenameWithoutExtension)
+				 ifPresent: [ :package | result nextPut: package mcPackage ]
+		]]
+"

Iceberg.package/IceSimpleClassReference.class/instance/package.st

@@ -1,3 +1,3 @@
 accessing
 package
-	^ self targetClass package mcPackage
+	^ Ice packageNamed: self targetClass package name

Iceberg.package/IceWorkingCopyDiff.class/instance/changes.st

@@ -2,9 +2,8 @@ querying
 changes
 	^ changes ifNil: [changes := 
 		repository allPackages flatCollect: [ :package |
-			| workingCopy mine theirs patch |
-			workingCopy := Ice workingCopyForPackage: package.
-			mine := workingCopy snapshot.
+			| mine theirs patch |
+			mine := package workingCopy snapshot.
 			theirs := (repository latestVersionForPackage: package) snapshot.
 			patch := MCPatch fromBase: theirs target: mine.
 			patch operations

Iceberg.package/IceWorkingCopyList.class/instance/repository..st

@@ -1,5 +1,5 @@
 initialization
 repository: aGitRepository
 	repository := aGitRepository.
-	list items: ((Ice workingCopiesForRepository: repository) 
+	list items: (repository workingCopies
 		sorted: [ :a :b | a name < b name ]).

Iceberg.package/ImportingResourceHelp.extension/class/otraPrueba.st

@@ -0,0 +1,2 @@
+*Iceberg
+otraPrueba

Iceberg.package/ImportingResourceHelp.extension/class/prueba.st

@@ -0,0 +1,2 @@
+*Iceberg-Core
+prueba

Iceberg.package/ImportingResourceHelp.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "ImportingResourceHelp" }