Merge pull request #60 from pharo-vcs/59-import-fails-on-method-exten…

…sion 59-import-fails-on-method-extension
pharo-vcs · Jan 6, 2019 · d4c6161 · d4c6161
2 parents 7695b52 + d6ea569
commit d4c6161
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/MonticelloTonel-Core.package/TonelWriter.class/instance/createDefaultOrganizationFrom..st b/MonticelloTonel-Core.package/TonelWriter.class/instance/createDefaultOrganizationFrom..st
@@ -1,3 +1,12 @@
 private
-createDefaultOrganizationFrom: aMCClassDefinition 
-	^ MCOrganizationDefinition categories: { aMCClassDefinition category }
+createDefaultOrganizationFrom: aCollection
+	"answers a default organisation for the cases where there are none"
+
+	"simplest case, I answer the clas definition"
+	snapshot definitions 
+		detect: #isClassDefinition
+		ifFound: [ :each | ^ each category  ].
+
+	^ self createDefaultOrganizationFromDefinition: (snapshot definitions
+		detect: #isMethodDefinition
+		ifNone: [ self error: 'cannot determine package name from empty snapshot' ])
diff --git a/...Tonel-Core.package/TonelWriter.class/instance/createDefaultOrganizationFromDefinition..st b/...Tonel-Core.package/TonelWriter.class/instance/createDefaultOrganizationFromDefinition..st
@@ -0,0 +1,4 @@
+private
+createDefaultOrganizationFromDefinition: aMethodDefinition
+
+	^ MCOrganizationDefinition categories: (self packageNameForMethodDefinition: aMethodDefinition)
diff --git a/MonticelloTonel-Core.package/TonelWriter.class/instance/packageNameForMethodDefinition..st b/MonticelloTonel-Core.package/TonelWriter.class/instance/packageNameForMethodDefinition..st
@@ -0,0 +1,10 @@
+private
+packageNameForMethodDefinition: aMethodDefinition
+	| category |
+
+	self assert: aMethodDefinition category first = $*.
+	category := aMethodDefinition category allButFirst.
+	^(MCWorkingCopy allManagers
+		detect: ((category allSatisfy: #isLowercase)
+			ifTrue: [[: wc| category beginsWith: wc packageName asLowercase]]
+			ifFalse: [[: wc| category beginsWith: wc packageName]])) packageName
diff --git a/MonticelloTonel-Core.package/TonelWriter.class/instance/writeSnapshot..st b/MonticelloTonel-Core.package/TonelWriter.class/instance/writeSnapshot..st
@@ -6,8 +6,7 @@ writeSnapshot: aSnapshot
 	 It has to be just one but well..."
 	self writePackage: (snapshot definitions 
 		detect: #isOrganizationDefinition
-		ifFound: [ :each | each ]
-		ifNone: [ self createDefaultOrganizationFrom: (snapshot definitions detect: #isClassDefinition) ]).
+		ifNone: [ self createDefaultOrganizationFrom: snapshot definitions ]).
 	"now export classes"
 	(snapshot definitions 
 		select: #isClassDefinition)