Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history 
fix: Issues Metacello#323, Metacello#328, Metacello#329, Metacello#330
  • Loading branch information
@dalehenrich
dalehenrich committed Feb 17, 2015
2 parents 972b098 + 599c932 commit e6f690c
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 37 deletions.
9 changes: 7 additions & 2 deletions repository/Metacello-Core.package/MetacelloProjectRegistration.class/instance/versionInfo.st
View file
Expand Up @@ -2,6 +2,11 @@ accessing
versionInfo
versionInfo
ifNil: [
versionInfo := MetacelloProjectRegistrationVersionInfo new
versionString: self version ].
versionInfo := MetacelloProjectRegistrationVersionInfo new.
self
configurationProjectSpecIfPresent: [ versionInfo versionString: self version ]
ifAbsent: [
"do not set versionString for freshly minted baseline ...
see https://github.com/dalehenrich/metacello-work/issues/328"
] ].
^ versionInfo
2 changes: 1 addition & 1 deletion repository/Metacello-Core.package/MetacelloProjectRegistration.class/methodProperties.json
View file
Expand Up @@ -60,5 +60,5 @@
"unregisterProject" : "dkh 7/19/2012 11:33",
"validate" : "otto 11/18/2013 11:25",
"version" : "dkh 6/13/2012 13:52",
"versionInfo" : "dkh 05/08/2014 11:32",
"versionInfo" : "dkh 02/14/2015 09:15",
"versionInfo:" : "dkh 05/08/2014 11:31" } }
5 changes: 5 additions & 0 deletions ...-Core.package/MetacelloProjectRegistrationVersionInfo.class/instance/setVersionString..st
View file
@@ -0,0 +1,5 @@
accessing
setVersionString: anObject
"set versionString, only if it does not already have avalue"

versionString ifNil: [ self versionString: anObject ]
3 changes: 2 additions & 1 deletion ...etacello-Core.package/MetacelloProjectRegistrationVersionInfo.class/methodProperties.json
View file
Expand Up @@ -4,5 +4,6 @@
"instance" : {
"projectVersion" : "dkh 08/11/2014 07:00",
"projectVersion:" : "dkh 08/11/2014 07:01",
"setVersionString:" : "dkh 02/14/2015 09:16",
"versionString" : "dkh 05/08/2014 11:31",
"versionString:" : "dkh 08/20/2014 07:32" } }
"versionString:" : "dkh 02/14/2015 09:17" } }
4 changes: 2 additions & 2 deletions ...ello-Core.package/MetacelloProjectRegistry.class/instance/registerProjectRegistration..st
View file
Expand Up @@ -21,7 +21,7 @@ registerProjectRegistration: aMetacelloProjectRegistration
spec versionString: version versionString ].
aMetacelloProjectRegistration configurationProjectSpec: spec.
(aMetacelloProjectRegistration respondsTo: #'versionInfo')
ifTrue: [ aMetacelloProjectRegistration versionInfo versionString: spec versionString ].
ifTrue: [ aMetacelloProjectRegistration versionInfo setVersionString: spec versionString ].
spec immutable.
self configurationRegistry
at: spec className
Expand All @@ -42,7 +42,7 @@ registerProjectRegistration: aMetacelloProjectRegistration
(aMetacelloProjectRegistration respondsTo: #'versionInfo')
ifTrue: [
aMetacelloProjectRegistration versionInfo
versionString: spec repositoryVersionString ].
setVersionString: spec repositoryVersionString ].
spec immutable.
self baselineRegistry
at: spec className
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Core.package/MetacelloProjectRegistry.class/methodProperties.json
View file
Expand Up @@ -17,7 +17,7 @@
"primeRegistryProjectSpecRegistered:" : "dkh 05/07/2014 14:46",
"projectSpecForClassNamed:ifAbsent:" : "dkh 7/19/2012 11:14",
"projectSpecs" : "dkh 7/19/2012 11:13",
"registerProjectRegistration:" : "dkh 09/04/2014 09:54",
"registerProjectRegistration:" : "dkh 02/14/2015 07:52",
"registrationFor:ifPresent:ifAbsent:" : "dkh 7/19/2012 11:30",
"registrationForClassNamed:ifAbsent:" : "dkh 05/14/2014 07:06",
"registrationForExactClassNamed:ifAbsent:" : "dkh 05/14/2014 07:05",
Expand Down
2 changes: 1 addition & 1 deletion .../Metacello-Core.package/MetacelloScriptGitBasedDownloadNotification.class/properties.json
View file
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "dkh 09/29/2014 12:27",
"commentStamp" : "",
"instvars" : [
"projectPath",
"versionString" ],
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Core.package/monticello.meta/version
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ry/Metacello-TestsCommonMC.pharo20.package/MetacelloTestsPackageSet.class/properties.json
View file
@@ -1,5 +1,5 @@
{
"category" : "Metacello-TestsPharo20MC",
"category" : "Metacello-TestsCommonMC",
"classinstvars" : [
],
"classvars" : [
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-TestsCommonMC.pharo20.package/monticello.meta/categories.st
View file
@@ -1 +1 @@
SystemOrganization addCategory: #'Metacello-TestsPharo20MC'!
SystemOrganization addCategory: #'Metacello-TestsCommonMC'!
2 changes: 1 addition & 1 deletion repository/Metacello-TestsCommonMC.pharo20.package/monticello.meta/package
View file
@@ -1 +1 @@
(name 'Metacello-TestsPharo20MC')
(name 'Metacello-TestsCommonMC')
2 changes: 1 addition & 1 deletion repository/Metacello-TestsCommonMC.pharo20.package/monticello.meta/version
View file
@@ -1 +1 @@
(name 'Metacello-TestsCommonMC.pharo20-dkh.4' message 'Issue #271: proposed fix' id '781df70a-efad-4fd9-984d-8191778838c7' date '09/12/2014' time '15:45:04' author 'dkh' ancestors ((name 'Metacello-TestsCommonMC.pharo20-dkh.3' message 'renamed to ''Metacello-TestsCommonMC.pharo20-dkh.3''' id '639ccb2a-7193-4417-88f9-a2fdf2131b49' date '06/17/2013' time '16:24:12' author 'dkh' ancestors ((name 'Metacello-TestsPharo20MC-ChristopheDemarey.2' message 'Move Pharo2 specific stuff to a new package.' id '7643d042-9b16-4fa0-bf7b-59f54bc89d52' date '05/31/2013' time '11:41:28' author 'ChristopheDemarey' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
(name 'Metacello-TestsCommonMC.pharo20-dkh.5' message 'bump version' id '48b54b1b-e607-4e27-97b5-b4b04ecf957d' date '02/16/2015' time '12:46:13' author 'dkh' ancestors ((name 'Metacello-TestsCommonMC.pharo20-dkh.4' message 'Issue #271: proposed fix' id '781df70a-efad-4fd9-984d-8191778838c7' date '09/12/2014' time '15:45:04' author 'dkh' ancestors ((name 'Metacello-TestsCommonMC.pharo20-dkh.3' message 'renamed to ''Metacello-TestsCommonMC.pharo20-dkh.3''' id '639ccb2a-7193-4417-88f9-a2fdf2131b49' date '06/17/2013' time '16:24:12' author 'dkh' ancestors ((name 'Metacello-TestsPharo20MC-ChristopheDemarey.2' message 'Move Pharo2 specific stuff to a new package.' id '7643d042-9b16-4fa0-bf7b-59f54bc89d52' date '05/31/2013' time '11:41:28' author 'ChristopheDemarey' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
2 changes: 1 addition & 1 deletion ...llo-TestsMC.package/MetacelloBasicScriptingTestCase.class/instance/tearDownPackageList.st
View file
@@ -1,3 +1,3 @@
running
tearDownPackageList
^ #('ConfigurationOfExternalX' 'ConfigurationOfExternalXX' 'ConfigurationOfExternal' 'ConfigurationOfExternalXXX' 'ConfigurationOfExternalIV' 'ConfigurationOfExternalIV' 'BaselineOfExternalX' 'BaselineOfGithubRefXX' 'BaselineOfGithubRefIV' 'BaselineOfGithubRefV' 'BaselineOfGithubRefVI' 'BaselineOfGithubRefVII' 'BaselineOfExternal' 'BaselineOfExternalX' 'External-CoreX' 'Sample-CoreX' 'ConfigurationOfMetacelloExample' 'GoferFoo' 'Sample-Core' 'Sample-Platform' 'Sample-Tests' 'External-Core' 'External-Tests' 'BaselineOfGithubRefVIII' 'BaselineOfGithubRefIX' 'MarianosImage' 'BaselineOfGithubRefXI' 'BaselineOfGithubRefXII' 'BaselineOfGithubRefXIII')
^ #('ConfigurationOfExternalX' 'ConfigurationOfExternalXX' 'ConfigurationOfExternal' 'ConfigurationOfExternalXXX' 'ConfigurationOfExternalIV' 'ConfigurationOfExternalIV' 'BaselineOfExternalX' 'BaselineOfGithubRefXX' 'BaselineOfGithubRefIV' 'BaselineOfGithubRefV' 'BaselineOfGithubRefVI' 'BaselineOfGithubRefVII' 'BaselineOfExternal' 'BaselineOfExternalX' 'External-CoreX' 'Sample-CoreX' 'ConfigurationOfMetacelloExample' 'GoferFoo' 'Sample-Core' 'Sample-Platform' 'Sample-Tests' 'External-Core' 'ExternalCore' 'External-Tests' 'BaselineOfGithubRefVIII' 'BaselineOfGithubRefIX' 'MarianosImage' 'BaselineOfGithubRefXI' 'BaselineOfGithubRefXII' 'BaselineOfGithubRefXIII')
2 changes: 1 addition & 1 deletion ...ory/Metacello-TestsMC.package/MetacelloBasicScriptingTestCase.class/methodProperties.json
View file
Expand Up @@ -5,4 +5,4 @@
"configurationRepositoryContents" : "dkh 07/29/2013 14:39",
"externalRepositoryContents" : "dkh 07/29/2013 14:39",
"setUpRepositoryContents" : "dkh 07/29/2013 14:40",
"tearDownPackageList" : "dkh 07/06/2014 10:52" } }
"tearDownPackageList" : "dkh 02/16/2015 15:47" } }
2 changes: 1 addition & 1 deletion repository/Metacello-TestsMC.package/monticello.meta/version
View file

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions ...etacello-TestsMCA.package/MetacelloGoferFunctionalTest.class/instance/expectedFailures.st
View file

This file was deleted.

13 changes: 9 additions & 4 deletions ...o-TestsMCA.package/MetacelloProjectRegistrationTestCase.class/instance/testVersionInfo.st
View file
@@ -1,8 +1,13 @@
tests
testVersionInfo
| baselineVersionInfo vs |
self
assert:
baselineProjectSpec asProjectRegistration versionInfo versionString = 'baseline'.
self
assert:
configurationProjectSpec asProjectRegistration versionInfo versionString = '1.0'
configurationProjectSpec asProjectRegistration versionInfo versionString = '1.0'.
baselineVersionInfo := baselineProjectSpec asProjectRegistration versionInfo.
self assert: baselineVersionInfo versionString isNil.
vs := '0abcde'.
baselineVersionInfo setVersionString: vs.
self assert: baselineVersionInfo versionString = vs.
baselineVersionInfo setVersionString: '111111'.
self assert: baselineVersionInfo versionString = vs
2 changes: 1 addition & 1 deletion ...tacello-TestsMCA.package/MetacelloProjectRegistrationTestCase.class/methodProperties.json
View file
Expand Up @@ -15,4 +15,4 @@
"testConfigurationsHasLoadConflicts" : "otto 11/19/2013 12:14",
"testHasLoadConflictsRaisesErrorsIfInvalid" : "otto 11/19/2013 12:35",
"testInvalidRegistration" : "otto 11/19/2013 12:22",
"testVersionInfo" : "dkh 05/08/2014 16:04" } }
"testVersionInfo" : "dkh 02/15/2015 12:08" } }

0 comments on commit e6f690c

Please sign in to comment.