Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

18849-Pharo-should-sync-with-Metacello #328

Merged
merged 8 commits into from Oct 9, 2017
Merged

18849-Pharo-should-sync-with-Metacello #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e03fd31
fix case 18849
estebanlm Oct 3, 2017
cc7f6c4
adding MetacelloPharo30Platform for compatibility
estebanlm Oct 6, 2017
67e57d2
remove bad commited class
estebanlm Oct 6, 2017
6827b26
remove undeclared
estebanlm Oct 6, 2017
fe61ca9
add missing methods
estebanlm Oct 7, 2017
0f92343
fix load order of metacello
estebanlm Oct 9, 2017
cf8d46f
remove incorrect exported package
estebanlm Oct 9, 2017
a39d3ef
fix tests for windows platform
estebanlm Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st
View file
Open in desktop
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Base.package/Metacello.class/instance/addStatement.args..st
View file
Open in desktop
@@ -1,3 +1,3 @@
private
addStatement: selector args: args
self statements add: selector -> args
self statements add: selector -> args
2 changes: 1 addition & 1 deletion src/Metacello-Bitbucket.package/MCBitbucketRepository.class/instance/normalizeTagsData..st
View file
Open in desktop
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/BlockClosure.extension/instance/execute.against..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core-scripting
*metacello-core-scripting
execute: projectSpecBlock against: aScriptExecutor
aScriptExecutor executeBlock: self do: projectSpecBlock
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/BlockClosure.extension/instance/setAuthorInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setAuthorInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setAuthorWithBlock: self
2 changes: 1 addition & 1 deletion ...acello-Core.package/BlockClosure.extension/instance/setBaseline.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setBaseline: aString withInMetacelloConfig: aMetacelloConfig
aMetacelloConfig setBaseline: aString withBlock: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/BlockClosure.extension/instance/setBlessingInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setBlessingInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setBlessingWithBlock: self
2 changes: 1 addition & 1 deletion ...o-Core.package/BlockClosure.extension/instance/setConfiguration.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setConfiguration: aString withInMetacelloConfig: aMetacelloConfig
aMetacelloConfig setConfiguration: aString withBlock: self
2 changes: 1 addition & 1 deletion ...etacello-Core.package/BlockClosure.extension/instance/setDescriptionInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setDescriptionInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setDescriptionWithBlock: self
2 changes: 1 addition & 1 deletion ...tacello-Core.package/BlockClosure.extension/instance/setPackage.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setPackage: aString withInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setPackage: aString withBlock: self
2 changes: 1 addition & 1 deletion ...tacello-Core.package/BlockClosure.extension/instance/setProject.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setProject: aString withInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setProject: aString withBlock: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/BlockClosure.extension/instance/setTimestampInMetacelloConfig..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setTimestampInMetacelloConfig: aMetacelloConfig

aMetacelloConfig setTimestampWithBlock: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/addToMetacelloPackages..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
addToMetacelloPackages: aMetacelloPackagesSpec

self do: [:each | each addToMetacelloPackages: aMetacelloPackagesSpec ]
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributeList.st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
asMetacelloAttributeList
^ self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/asMetacelloAttributePath.st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
asMetacelloAttributePath
^ MetacelloMethodSectionPath withAll: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/execute.against..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core-scripting
*metacello-core-scripting
execute: projectSpecBlock against: aScriptExecutor
aScriptExecutor executeCollection: self do: projectSpecBlock
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/mergeIntoMetacelloPackages..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
mergeIntoMetacelloPackages: aMetacelloPackagesSpec

self do: [:each | each mergeIntoMetacelloPackages: aMetacelloPackagesSpec ]
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/removeFromMetacelloPackages..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
removeFromMetacelloPackages: aMetacelloPackagesSpec

self do: [:each | each removeFromMetacelloPackages: aMetacelloPackagesSpec ]
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/setForDo.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setForDo: aBlock withInMetacelloConfig: aMetacelloConstructore
aMetacelloConstructore setFor: self do: aBlock
2 changes: 1 addition & 1 deletion ...acello-Core.package/Collection.extension/instance/setForVersion.withInMetacelloConfig..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setForVersion: aString withInMetacelloConfig: aMetacelloConstructore
aMetacelloConstructore setFor: self version: aString
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/setImportInVersionSpec..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setImportInVersionSpec: aMetacelloVersionSpec
aMetacelloVersionSpec setImport: self asArray
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/setIncludesInMetacelloPackage..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setIncludesInMetacelloPackage: aMetacelloPackageSpec

aMetacelloPackageSpec setIncludes: self asArray.
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/setLoadsInMetacelloProject..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setLoadsInMetacelloProject: aMetacelloPackageSpec

aMetacelloPackageSpec setLoads: self asArray.
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Collection.extension/instance/setRequiresInMetacelloPackage..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setRequiresInMetacelloPackage: aMetacelloPackageSpec

aMetacelloPackageSpec setRequires: self asArray.
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloConfig..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
setTimestampInMetacelloConfig: aMetacelloConfig
aMetacelloConfig setTimestampWithString: self printString
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/DateAndTime.extension/instance/setTimestampInMetacelloVersion..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
setTimestampInMetacelloVersion: aMetacelloVersionSpec

aMetacelloVersionSpec setTimestamp:
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Integer.extension/instance/metacelloIntegerLessThanSelf..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
metacelloIntegerLessThanSelf: anInteger

^anInteger < self
2 changes: 1 addition & 1 deletion ...etacello-Core.package/Integer.extension/instance/metacelloSemanticIntegerLessThanSelf..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
metacelloSemanticIntegerLessThanSelf: anInteger
^ anInteger < self
2 changes: 1 addition & 1 deletion ...Metacello-Core.package/Integer.extension/instance/metacelloSemanticStringLessThanSelf..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
metacelloSemanticStringLessThanSelf: aString
"string version components are always '<' integer component"

Expand Down
2 changes: 1 addition & 1 deletion ...llo-Core.package/Integer.extension/instance/metacelloSemanticVersionComponentLessThan..st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
metacelloSemanticVersionComponentLessThan: aMetacelloVersonComponent
^ aMetacelloVersonComponent metacelloSemanticIntegerLessThanSelf: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Integer.extension/instance/metacelloStringLessThanSelf..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
metacelloStringLessThanSelf: aString
"string version components are always '<' integer component"

Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/Integer.extension/instance/metacelloVersionComponentLessThan..st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
metacelloVersionComponentLessThan: aMetacelloVersonComponent

^aMetacelloVersonComponent metacelloIntegerLessThanSelf: self
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/MCRepository.extension/instance/flushForScriptGet.st
View file
Open in desktop
@@ -1,3 +1,3 @@
*Metacello-Core
*metacello-core
flushForScriptGet
"noop"
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/MCRepository.extension/instance/repositoryBranchName.st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
repositoryBranchName
"extract a branch name from the repository ... if possible"

Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/MCRepository.extension/instance/repositoryDescription.st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
repositoryDescription
"return a description that includes a repositoryVersionString and repositoryBranchName if present"

Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/MCRepository.extension/instance/repositoryVersionString.st
View file
Open in desktop
@@ -1,4 +1,4 @@
*Metacello-Core
*metacello-core
repositoryVersionString
"extract a version string from the repository ... if possible"

Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core.package/MetacelloAbstractConstructor.class/instance/configurationClass.st
View file
Open in desktop
@@ -1,4 +1,4 @@
accessing
configurationClass

^ self subclassResponsibility
^self subclassResponsibility
6 changes: 4 additions & 2 deletions ...acello-Core.package/MetacelloAbstractVersionConstructor.class/instance/evaluatePragma..st
View file
Open in desktop
@@ -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 ]
7 changes: 7 additions & 0 deletions src/Metacello-Core.package/MetacelloGenericProjectSpec.class/instance/repository.st
View file
Open in desktop
@@ -0,0 +1,7 @@
querying
repository
| specs |
self deprecated: 'Use repositories or repositorySpecs'.
(specs := self repositorySpecs) isEmpty
ifTrue: [ ^ nil ].
^ specs first
6 changes: 6 additions & 0 deletions src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute..st
View file
Open in desktop
@@ -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
8 changes: 8 additions & 0 deletions src/Metacello-Core.package/MetacelloMethodSection.class/instance/attribute.st
View file
Open in desktop
@@ -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
Empty file added src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/README.md
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions ...etacello-Core.package/MetacelloOldSemanticVersionNumber.class/class/integerFromString..st
View file
Open in desktop
@@ -0,0 +1,3 @@
private
integerFromString: aString
^ aString asInteger
4 changes: 4 additions & 0 deletions ...e.package/MetacelloOldSemanticVersionNumber.class/class/validateVersionNumber.against..st
View file
Open in desktop
@@ -0,0 +1,4 @@
private
validateVersionNumber: svn against: aString
"no validation"

11 changes: 11 additions & 0 deletions src/Metacello-Core.package/MetacelloOldSemanticVersionNumber.class/properties.json
View file
Open in desktop
@@ -0,0 +1,11 @@
{
"commentStamp" : "",
"super" : "MetacelloSemanticVersionNumber",
"category" : "Metacello-Core-Model",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "MetacelloOldSemanticVersionNumber",
"type" : "normal"
}
4 changes: 2 additions & 2 deletions ...kage/MetacelloPackagesSpec.class/instance/sortPackageSpecs.packageSpec.groupLoops.for..st
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ sortPackageSpecs: orderedSpecs packageSpec: packageSpec groupLoops: groupLoops f
cr;
tab;
tab;
show: each name ].
show: each ].
Transcript
cr;
show:
Expand All @@ -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: [
Expand Down
13 changes: 13 additions & 0 deletions src/Metacello-Core.package/MetacelloPlatform.class/instance/createRepository..st
View file
Open in desktop
Expand Up @@ -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 |
Expand Down
3 changes: 3 additions & 0 deletions src/Metacello-Core.package/MetacelloPlatform.class/instance/deleteFileNamed..st
View file
Open in desktop
@@ -0,0 +1,3 @@
file system
deleteFileNamed: filePath
(self fileDirectoryClass on: filePath) containingDirectory deleteFileNamed: (self fileDirectoryClass localNameFor: filePath)
5 changes: 5 additions & 0 deletions src/Metacello-Core.package/MetacelloPlatform.class/instance/disableUndefinedSybolUpdates.st
View file
Open in desktop
@@ -0,0 +1,5 @@
tests
disableUndefinedSybolUpdates
"noop for most platforms - needed for GemStone"

^ nil
2 changes: 2 additions & 0 deletions src/Metacello-Core.package/MetacelloPlatform.class/instance/extractTypeFromDescription..st
View file
Open in desktop
Expand Up @@ -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://')
Expand Down
3 changes: 1 addition & 2 deletions src/Metacello-Core.package/MetacelloPlatform.class/instance/fileDirectoryClass.st
View file
Open in desktop
@@ -1,4 +1,3 @@
github/bitbucket support
fileDirectoryClass

^ self class environment at: #FileDirectory
^ Smalltalk at: #FileDirectory
13 changes: 13 additions & 0 deletions ...e.package/MetacelloPlatform.class/instance/primeStackCacheFor.doing.defaultDictionary..st
View file
Open in desktop
@@ -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
4 changes: 4 additions & 0 deletions ...Metacello-Core.package/MetacelloPlatform.class/instance/reenableUndefinedSybolUpdates..st
View file
Open in desktop
@@ -0,0 +1,4 @@
tests
reenableUndefinedSybolUpdates: undefinedSymbols
"noop for most platforms - needed for GemStone"