Merge pull request #328 from estebanlm/18849-Pharo-should-sync-with-M…

…etacello 18849-Pharo-should-sync-with-Metacello
pharo-project · Oct 9, 2017 · 94155d3 · 94155d3
2 parents 6d42482 + a39d3ef
commit 94155d3
Show file tree

Hide file tree

Showing 247 changed files with 1,230 additions and 484 deletions.
diff --git a/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st b/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st
@@ -17,12 +17,12 @@ mcPackages := #(
  'MonticelloFileTree-Core'
  'Metacello-MC'
  'Metacello-PharoCommonPlatform'
- 'Metacello-Platform'
- 'Metacello-ToolBox'
  'MonticelloFileTree-FileSystem-Utilities'
  'STON-Core'
  'Metacello-GitBasedRepository'
  'Metacello-GitHub'
+ 'Metacello-Platform'
+ 'Metacello-ToolBox'
  ).
 
 MCMethodDefinition initializersEnabled: false.

diff --git a/src/Metacello-Base.package/Metacello.class/instance/addStatement.args..st b/src/Metacello-Base.package/Metacello.class/instance/addStatement.args..st
@@ -1,3 +1,3 @@
 private
 addStatement: selector args: args
-    self statements add: selector -> args
+    self statements add: selector -> args
diff --git a/src/Metacello-Bitbucket.package/MCBitbucketRepository.class/instance/normalizeTagsData..st b/src/Metacello-Bitbucket.package/MCBitbucketRepository.class/instance/normalizeTagsData..st
@@ -1,6 +1,6 @@
 private
 normalizeTagsData: jsonObject
-  "return a dictionay mapping the tag name to the commit SHA."
+  "return a dictionay mapping the tag name to the commit SHA"
 
   | tagDict |
   jsonObject

diff --git a/src/Metacello-Core.package/BlockClosure.extension/instance/execute.against..st b/src/Metacello-Core.package/BlockClosure.extension/instance/execute.against..st
@@ -1,3 +1,3 @@
-*Metacello-Core-scripting
+*metacello-core-scripting
 execute: projectSpecBlock against: aScriptExecutor
     aScriptExecutor executeBlock: self do: projectSpecBlock
diff --git a/src/Metacello-Core.package/BlockClosure.extension/instance/setAuthorInMetacelloConfig..st b/src/Metacello-Core.package/BlockClosure.extension/instance/setAuthorInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setAuthorInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setAuthorWithBlock: self
diff --git a/...acello-Core.package/BlockClosure.extension/instance/setBaseline.withInMetacelloConfig..st b/...acello-Core.package/BlockClosure.extension/instance/setBaseline.withInMetacelloConfig..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setBaseline: aString withInMetacelloConfig: aMetacelloConfig
     aMetacelloConfig setBaseline: aString withBlock: self
diff --git a/src/Metacello-Core.package/BlockClosure.extension/instance/setBlessingInMetacelloConfig..st b/src/Metacello-Core.package/BlockClosure.extension/instance/setBlessingInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setBlessingInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setBlessingWithBlock: self
diff --git a/...o-Core.package/BlockClosure.extension/instance/setConfiguration.withInMetacelloConfig..st b/...o-Core.package/BlockClosure.extension/instance/setConfiguration.withInMetacelloConfig..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setConfiguration: aString withInMetacelloConfig: aMetacelloConfig
     aMetacelloConfig setConfiguration: aString withBlock: self
diff --git a/...etacello-Core.package/BlockClosure.extension/instance/setDescriptionInMetacelloConfig..st b/...etacello-Core.package/BlockClosure.extension/instance/setDescriptionInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setDescriptionInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setDescriptionWithBlock: self
diff --git a/...tacello-Core.package/BlockClosure.extension/instance/setPackage.withInMetacelloConfig..st b/...tacello-Core.package/BlockClosure.extension/instance/setPackage.withInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setPackage: aString withInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setPackage: aString withBlock: self
diff --git a/...tacello-Core.package/BlockClosure.extension/instance/setProject.withInMetacelloConfig..st b/...tacello-Core.package/BlockClosure.extension/instance/setProject.withInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setProject: aString withInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setProject: aString withBlock: self
diff --git a/src/Metacello-Core.package/BlockClosure.extension/instance/setTimestampInMetacelloConfig..st b/src/Metacello-Core.package/BlockClosure.extension/instance/setTimestampInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setTimestampInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setTimestampWithBlock: self
diff --git a/src/Metacello-Core.package/Collection.extension/instance/addToMetacelloPackages..st b/src/Metacello-Core.package/Collection.extension/instance/addToMetacelloPackages..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 addToMetacelloPackages: aMetacelloPackagesSpec
 
 	self do: [:each | each addToMetacelloPackages: aMetacelloPackagesSpec ]
diff --git a/src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributeList.st b/src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributeList.st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 asMetacelloAttributeList
     ^ self
diff --git a/src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributePath.st b/src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributePath.st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 asMetacelloAttributePath
     ^ MetacelloMethodSectionPath withAll: self
diff --git a/src/Metacello-Core.package/Collection.extension/instance/execute.against..st b/src/Metacello-Core.package/Collection.extension/instance/execute.against..st
@@ -1,3 +1,3 @@
-*Metacello-Core-scripting
+*metacello-core-scripting
 execute: projectSpecBlock against: aScriptExecutor
     aScriptExecutor executeCollection: self do: projectSpecBlock
diff --git a/src/Metacello-Core.package/Collection.extension/instance/mergeIntoMetacelloPackages..st b/src/Metacello-Core.package/Collection.extension/instance/mergeIntoMetacelloPackages..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 mergeIntoMetacelloPackages: aMetacelloPackagesSpec
 
 	self do: [:each | each mergeIntoMetacelloPackages: aMetacelloPackagesSpec ]
diff --git a/src/Metacello-Core.package/Collection.extension/instance/removeFromMetacelloPackages..st b/src/Metacello-Core.package/Collection.extension/instance/removeFromMetacelloPackages..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 removeFromMetacelloPackages: aMetacelloPackagesSpec
 
 	self do: [:each | each removeFromMetacelloPackages: aMetacelloPackagesSpec ]
diff --git a/src/Metacello-Core.package/Collection.extension/instance/setForDo.withInMetacelloConfig..st b/src/Metacello-Core.package/Collection.extension/instance/setForDo.withInMetacelloConfig..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setForDo: aBlock withInMetacelloConfig: aMetacelloConstructore
     aMetacelloConstructore setFor: self do: aBlock
diff --git a/...acello-Core.package/Collection.extension/instance/setForVersion.withInMetacelloConfig..st b/...acello-Core.package/Collection.extension/instance/setForVersion.withInMetacelloConfig..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setForVersion: aString withInMetacelloConfig: aMetacelloConstructore
     aMetacelloConstructore setFor: self version: aString
diff --git a/src/Metacello-Core.package/Collection.extension/instance/setImportInVersionSpec..st b/src/Metacello-Core.package/Collection.extension/instance/setImportInVersionSpec..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setImportInVersionSpec: aMetacelloVersionSpec
   aMetacelloVersionSpec setImport: self asArray
diff --git a/src/Metacello-Core.package/Collection.extension/instance/setIncludesInMetacelloPackage..st b/src/Metacello-Core.package/Collection.extension/instance/setIncludesInMetacelloPackage..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setIncludesInMetacelloPackage: aMetacelloPackageSpec
 
 	aMetacelloPackageSpec setIncludes: self asArray.
diff --git a/src/Metacello-Core.package/Collection.extension/instance/setLoadsInMetacelloProject..st b/src/Metacello-Core.package/Collection.extension/instance/setLoadsInMetacelloProject..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setLoadsInMetacelloProject: aMetacelloPackageSpec
 
 	aMetacelloPackageSpec setLoads: self asArray.
diff --git a/src/Metacello-Core.package/Collection.extension/instance/setRequiresInMetacelloPackage..st b/src/Metacello-Core.package/Collection.extension/instance/setRequiresInMetacelloPackage..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setRequiresInMetacelloPackage: aMetacelloPackageSpec
 
 	aMetacelloPackageSpec setRequires: self asArray.
diff --git a/src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloConfig..st b/src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloConfig..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 setTimestampInMetacelloConfig: aMetacelloConfig
     aMetacelloConfig setTimestampWithString: self printString
diff --git a/src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloVersion..st b/src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloVersion..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 setTimestampInMetacelloVersion: aMetacelloVersionSpec
 
 	aMetacelloVersionSpec setTimestamp: 

diff --git a/src/Metacello-Core.package/Integer.extension/instance/metacelloIntegerLessThanSelf..st b/src/Metacello-Core.package/Integer.extension/instance/metacelloIntegerLessThanSelf..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 metacelloIntegerLessThanSelf: anInteger
 
 	^anInteger < self
diff --git a/...etacello-Core.package/Integer.extension/instance/metacelloSemanticIntegerLessThanSelf..st b/...etacello-Core.package/Integer.extension/instance/metacelloSemanticIntegerLessThanSelf..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 metacelloSemanticIntegerLessThanSelf: anInteger
     ^ anInteger < self
diff --git a/...Metacello-Core.package/Integer.extension/instance/metacelloSemanticStringLessThanSelf..st b/...Metacello-Core.package/Integer.extension/instance/metacelloSemanticStringLessThanSelf..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 metacelloSemanticStringLessThanSelf: aString
     "string version components are always '<' integer component"
 

diff --git a/...llo-Core.package/Integer.extension/instance/metacelloSemanticVersionComponentLessThan..st b/...llo-Core.package/Integer.extension/instance/metacelloSemanticVersionComponentLessThan..st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 metacelloSemanticVersionComponentLessThan: aMetacelloVersonComponent
     ^ aMetacelloVersonComponent metacelloSemanticIntegerLessThanSelf: self
diff --git a/src/Metacello-Core.package/Integer.extension/instance/metacelloStringLessThanSelf..st b/src/Metacello-Core.package/Integer.extension/instance/metacelloStringLessThanSelf..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 metacelloStringLessThanSelf: aString
 	"string version components are always '<' integer component"
 

diff --git a/src/Metacello-Core.package/Integer.extension/instance/metacelloVersionComponentLessThan..st b/src/Metacello-Core.package/Integer.extension/instance/metacelloVersionComponentLessThan..st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 metacelloVersionComponentLessThan: aMetacelloVersonComponent
 
 	^aMetacelloVersonComponent metacelloIntegerLessThanSelf: self
diff --git a/src/Metacello-Core.package/MCRepository.extension/instance/flushForScriptGet.st b/src/Metacello-Core.package/MCRepository.extension/instance/flushForScriptGet.st
@@ -1,3 +1,3 @@
-*Metacello-Core
+*metacello-core
 flushForScriptGet
     "noop"
diff --git a/src/Metacello-Core.package/MCRepository.extension/instance/repositoryBranchName.st b/src/Metacello-Core.package/MCRepository.extension/instance/repositoryBranchName.st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 repositoryBranchName
   "extract a branch name from the repository ... if possible"
 

diff --git a/src/Metacello-Core.package/MCRepository.extension/instance/repositoryDescription.st b/src/Metacello-Core.package/MCRepository.extension/instance/repositoryDescription.st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 repositoryDescription
   "return a description that includes a repositoryVersionString and repositoryBranchName if present"
 

diff --git a/src/Metacello-Core.package/MCRepository.extension/instance/repositoryVersionString.st b/src/Metacello-Core.package/MCRepository.extension/instance/repositoryVersionString.st
@@ -1,4 +1,4 @@
-*Metacello-Core
+*metacello-core
 repositoryVersionString
   "extract a version string from the repository ... if possible"
 

diff --git a/src/Metacello-Core.package/MetacelloAbstractConstructor.class/instance/configurationClass.st b/src/Metacello-Core.package/MetacelloAbstractConstructor.class/instance/configurationClass.st
@@ -1,4 +1,4 @@
 accessing
 configurationClass
 
-	^ self subclassResponsibility
+	^self subclassResponsibility
diff --git a/...acello-Core.package/MetacelloAbstractVersionConstructor.class/instance/evaluatePragma..st b/...acello-Core.package/MetacelloAbstractVersionConstructor.class/instance/evaluatePragma..st
@@ -1,5 +1,7 @@
 private
 evaluatePragma: pragma
 	currentContext := pragma.
-	[ self configuration perform: pragma methodSelector with: self ]
-		ensure: [ currentContext := nil ]
+	[ self configuration 
+		perform: (MetacelloPlatform current selectorForPragma: pragma) 
+		with: self ] 
+	ensure: [ currentContext := nil ]
diff --git a/src/Metacello-Core.package/MetacelloGenericProjectSpec.class/instance/repository.st b/src/Metacello-Core.package/MetacelloGenericProjectSpec.class/instance/repository.st
@@ -0,0 +1,7 @@
+querying
+repository
+    | specs |
+    self deprecated: 'Use repositories or repositorySpecs'.
+    (specs := self repositorySpecs) isEmpty
+        ifTrue: [ ^ nil ].
+    ^ specs first
diff --git a/src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute..st b/src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute..st
@@ -0,0 +1,6 @@
+accessing
+attribute: anObject
+    self deprecated: 'Use attributes: instead'.
+    self attributes size > 1
+        ifTrue: [ self error: 'invalid use of attribute:' ].
+    attributes := OrderedCollection with: anObject
diff --git a/src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute.st b/src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute.st
@@ -0,0 +1,8 @@
+accessing
+attribute
+    self deprecated: 'Use attributes instead'.
+    self attributes size > 1
+        ifTrue: [ self error: 'invalid use of attribute' ].
+    self attributes isEmpty
+        ifTrue: [ ^ nil ].
+    ^ self attributes first
diff --git a/src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/README.md b/src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/README.md
diff --git a/...etacello-Core.package/MetacelloOldSemanticVersionNumber.class/class/integerFromString..st b/...etacello-Core.package/MetacelloOldSemanticVersionNumber.class/class/integerFromString..st
@@ -0,0 +1,3 @@
+private
+integerFromString: aString
+  ^ aString asInteger
diff --git a/...e.package/MetacelloOldSemanticVersionNumber.class/class/validateVersionNumber.against..st b/...e.package/MetacelloOldSemanticVersionNumber.class/class/validateVersionNumber.against..st
@@ -0,0 +1,4 @@
+private
+validateVersionNumber: svn against: aString
+  "no validation"
+
diff --git a/src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/properties.json b/src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "MetacelloSemanticVersionNumber",
+	"category" : "Metacello-Core-Model",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "MetacelloOldSemanticVersionNumber",
+	"type" : "normal"
+}
diff --git a/...kage/MetacelloPackagesSpec.class/instance/sortPackageSpecs.packageSpec.groupLoops.for..st b/...kage/MetacelloPackagesSpec.class/instance/sortPackageSpecs.packageSpec.groupLoops.for..st
@@ -44,7 +44,7 @@ sortPackageSpecs: orderedSpecs packageSpec: packageSpec groupLoops: groupLoops f
                     cr;
                     tab;
                     tab;
-                    show: each name ].
+                    show: each ].
               Transcript
                 cr;
                 show:
@@ -58,7 +58,7 @@ sortPackageSpecs: orderedSpecs packageSpec: packageSpec groupLoops: groupLoops f
                     cr;
                     tab;
                     tab;
-                    show: each name ] ].
+                    show: each ] ].
           movePackage := movePackage or: [ packageIndex <= targetIndex ].
           false
             ifTrue: [ 

diff --git a/src/Metacello-Core.package/MetacelloPlatform.class/instance/createRepository..st b/src/Metacello-Core.package/MetacelloPlatform.class/instance/createRepository..st
@@ -25,6 +25,19 @@ createRepository: aRepositorySpec
               (self
                 fileHandleOn:
                   (aRepositorySpec description copyFrom: headerSize + 1 to: description size)) ] ].
+  Smalltalk
+    at: #'TonelRepository'
+    ifPresent: [ :cl | 
+      type = 'tonel'
+        ifTrue: [ 
+          | description headerSize |
+          description := aRepositorySpec description.
+          headerSize := 'tonel://' size.
+          ^ cl new
+            directory:
+              (self
+                fileHandleOn:
+                  (aRepositorySpec description copyFrom: headerSize + 1 to: description size)) ] ].
   Smalltalk
     at: #'MCGitHubRepository'
     ifPresent: [ :cl | 

diff --git a/src/Metacello-Core.package/MetacelloPlatform.class/instance/deleteFileNamed..st b/src/Metacello-Core.package/MetacelloPlatform.class/instance/deleteFileNamed..st
@@ -0,0 +1,3 @@
+file system
+deleteFileNamed: filePath
+	(self fileDirectoryClass on: filePath) containingDirectory deleteFileNamed: (self fileDirectoryClass localNameFor: filePath)
diff --git a/src/Metacello-Core.package/MetacelloPlatform.class/instance/disableUndefinedSybolUpdates.st b/src/Metacello-Core.package/MetacelloPlatform.class/instance/disableUndefinedSybolUpdates.st
@@ -0,0 +1,5 @@
+tests
+disableUndefinedSybolUpdates
+  "noop for most platforms - needed for GemStone"
+
+  ^ nil
diff --git a/src/Metacello-Core.package/MetacelloPlatform.class/instance/extractTypeFromDescription..st b/src/Metacello-Core.package/MetacelloPlatform.class/instance/extractTypeFromDescription..st
@@ -8,6 +8,8 @@ extractTypeFromDescription: description
     ifTrue: [ ^ 'dictionary' ].
   (description beginsWith: 'filetree://')
     ifTrue: [ ^ 'filetree' ].
+  (description beginsWith: 'tonel://')
+    ifTrue: [ ^ 'tonel' ].
   (description beginsWith: 'github://')
     ifTrue: [ ^ 'github' ].
   (description beginsWith: 'gitorious://')

diff --git a/src/Metacello-Core.package/MetacelloPlatform.class/instance/fileDirectoryClass.st b/src/Metacello-Core.package/MetacelloPlatform.class/instance/fileDirectoryClass.st
@@ -1,4 +1,3 @@
 github/bitbucket support
 fileDirectoryClass
-
-	^ self class environment at: #FileDirectory 
+	^ Smalltalk at: #FileDirectory
diff --git a/...e.package/MetacelloPlatform.class/instance/primeStackCacheFor.doing.defaultDictionary..st b/...e.package/MetacelloPlatform.class/instance/primeStackCacheFor.doing.defaultDictionary..st
@@ -0,0 +1,13 @@
+caching
+primeStackCacheFor: cacheName doing: noArgBlock defaultDictionary: aDictionary
+
+	self deprecated: 'use #primeStackCacheWith:doing:'.
+	self 
+		useStackCacheDuring: [:dict | | cache |
+			cache := dict at: cacheName ifAbsent: [].
+			cache == nil
+				ifTrue: [ 
+					cache := Dictionary new.
+					dict at: cacheName put: cache ].
+			^noArgBlock value ] 
+		defaultDictionary: aDictionary
diff --git a/...Metacello-Core.package/MetacelloPlatform.class/instance/reenableUndefinedSybolUpdates..st b/...Metacello-Core.package/MetacelloPlatform.class/instance/reenableUndefinedSybolUpdates..st
@@ -0,0 +1,4 @@
+tests
+reenableUndefinedSybolUpdates: undefinedSymbols
+  "noop for most platforms - needed for GemStone"
+