Skip to content

Commit

Permalink
Add SCIMonticelloLoadSpec; supports HTTP repos, packages & versions; c…
Browse files Browse the repository at this point in the history 
…loses #152
  • Loading branch information
@fniephaus
fniephaus committed Jun 9, 2016
1 parent d05ada4 commit 657ad81
Show file tree
Hide file tree
Showing 50 changed files with 255 additions and 39 deletions.
2 changes: 1 addition & 1 deletion repository/BaselineOfSmalltalkCI.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'BaselineOfSmalltalkCI-fn.9' message 'Update baseline after splitting SmalltalkCI-Pharo into two packages' id 'd46c1fc2-c3be-41af-a93b-3d9bc85b54b5' date '15 April 2016' time '11:42:41.978 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-fn.8' message 'Update baseline after splitting SmalltalkCI-Squeak into two packages' id '75834ab5-c4be-4930-ab74-55d52f3873b4' date '15 April 2016' time '11:12:08.898 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-fn.7' message 'Merge tests into one baseline' id '89c9d6ff-286f-4dd2-8ac6-ee42c6cd0ae9' date '15 April 2016' time '5:04:47.233 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-dkh.6' message '#109 tweak the STON reference from the baseline for Pharo a bit ' id '27db0cf5-16f4-4ef1-89e7-21d7505ad7c0' date '3 April 2016' time '11:57:04 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.5' message '#108 first cut at fix for this issue' id 'ebc278d9-ed5c-47cd-9809-13db868abcc4' date '3 April 2016' time '10:35:58 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.4' message 'remove the SmalltalkCI-Report package from the baseline' id '919faf31-cf32-4f17-8bd5-bb4459f990f8' date '23 February 2016' time '7:12:25 pm' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.3' message 'PR #51: merge the pharo/squeak BaselineOfSmalltalkCI into the gemstone variant... ' id '91444a03-00df-4abd-a259-121d87a8dc8d' date '23 February 2016' time '6:47:08 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-TravisCI.2' message 'Issue #48: add SmalltalkCI-Report without porting ...' id 'cc69f0b7-c00a-46d7-8bc1-446a71f4e764' date '4 February 2016' time '4:48:18 pm' author 'TravisCI' ancestors ((name 'BaselineOfSmalltalkCI-dkh.1' message 'initial configuration' id 'd88909e6-d8b8-46c7-b261-09ff40d9be8b' date '4 February 2016' time '12:04:36 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'BaselineOfSmalltalkCI-fn.9' message 'Update baseline after splitting SmalltalkCI-Pharo into two packages' id 'd46c1fc2-c3be-41af-a93b-3d9bc85b54b5' date '15 April 2016' time '11:42:41.978 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-fn.8' message 'Update baseline after splitting SmalltalkCI-Squeak into two packages' id '75834ab5-c4be-4930-ab74-55d52f3873b4' date '15 April 2016' time '11:12:08.898 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-fn.7' message 'Merge tests into one baseline' id '89c9d6ff-286f-4dd2-8ac6-ee42c6cd0ae9' date '15 April 2016' time '5:04:47.233 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-dkh.6' message '#109 tweak the STON reference from the baseline for Pharo a bit ' id '27db0cf5-16f4-4ef1-89e7-21d7505ad7c0' date '3 April 2016' time '11:57:04 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.5' message '#108 first cut at fix for this issue' id 'ebc278d9-ed5c-47cd-9809-13db868abcc4' date '3 April 2016' time '10:35:58 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.4' message 'remove the SmalltalkCI-Report package from the baseline' id '919faf31-cf32-4f17-8bd5-bb4459f990f8' date '23 February 2016' time '7:12:25 pm' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-dkh.3' message 'PR #51: merge the pharo/squeak BaselineOfSmalltalkCI into the gemstone variant... ' id '91444a03-00df-4abd-a259-121d87a8dc8d' date '23 February 2016' time '6:47:08 am' author 'dkh' ancestors ((name 'BaselineOfSmalltalkCI-fn.2' message 'Issue #48: add SmalltalkCI-Report without porting ...' id 'cc69f0b7-c00a-46d7-8bc1-446a71f4e764' date '4 February 2016' time '4:48:18 pm' author 'fn' ancestors ((name 'BaselineOfSmalltalkCI-dkh.1' message 'initial configuration' id 'd88909e6-d8b8-46c7-b261-09ff40d9be8b' date '4 February 2016' time '12:04:36 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
4 changes: 2 additions & 2 deletions repository/SmalltalkCI-Core.package/SCIAbstractLoadSpec.class/instance/platforms..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
accessing
platforms: aPlatform
^ self subclassResponsibility
platforms: platformCollection
platforms := platformCollection
2 changes: 1 addition & 1 deletion repository/SmalltalkCI-Core.package/SCIAbstractLoadSpec.class/instance/platforms.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
accessing
platforms
^ self subclassResponsibility
^ platforms ifNil: [ platforms := OrderedCollection new ]
4 changes: 2 additions & 2 deletions repository/SmalltalkCI-Core.package/SCIAbstractLoadSpec.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"isComplete" : "fniep 1/10/2016 23:47",
"isPlatformCompatible" : "fn 1/31/2016 19:57",
"loadProjectOn:" : "fn 1/31/2016 19:18",
"platforms" : "fniep 1/11/2016 02:41",
"platforms:" : "fniep 1/11/2016 02:55",
"platforms" : "fn 6/9/2016 09:02",
"platforms:" : "fn 6/9/2016 09:02",
"prepareForCI" : "fn 4/14/2016 21:05",
"testClasses" : "fn 1/16/2016 16:03" } }
2 changes: 1 addition & 1 deletion repository/SmalltalkCI-Core.package/SCIAbstractLoadSpec.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"commentStamp" : "",
"instvars" : [
],
"platforms" ],
"name" : "SCIAbstractLoadSpec",
"pools" : [
],
Expand Down
3 changes: 0 additions & 3 deletions repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/platforms..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/platforms.st
View file

This file was deleted.

8 changes: 3 additions & 5 deletions repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"class" : {
"getAuthor" : "TravisCI 4/14/2016 21:10",
"getAuthor" : "fn 4/14/2016 21:10",
"setAuthor:" : "fn 1/31/2016 20:11",
"testAuthor" : "fn 1/31/2016 18:53" },
"instance" : {
Expand All @@ -21,11 +21,9 @@
"onWarningLog:" : "dkh 02/05/2016 16:24",
"originalAuthor" : "fn 1/31/2016 18:50",
"originalAuthor:" : "fn 1/31/2016 18:50",
"platforms" : "fniep 1/11/2016 02:39",
"platforms:" : "fniep 1/11/2016 02:39",
"prepareForCI" : "fn 1/31/2016 22:14",
"repository" : "fn 1/10/2016 11:44",
"repository:" : "fn 1/10/2016 11:44",
"testClasses" : "dkh 02/06/2016 06:41",
"version" : "TravisCI 2/20/2016 21:25",
"version:" : "TravisCI 2/20/2016 21:25" } }
"version" : "fn 2/20/2016 21:25",
"version:" : "fn 2/20/2016 21:25" } }
1 change: 0 additions & 1 deletion repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"directory",
"load",
"onWarningLog",
"platforms",
"repository",
"originalAuthor",
"version" ],
Expand Down
Empty file added repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/README.md
View file
Empty file.
7 changes: 7 additions & 0 deletions ...ry/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/addLoadedClassesFrom..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
executing
addLoadedClassesFrom: aDefinitionsCollection
| mcOrganization classes |
mcOrganization := aDefinitionsCollection detect: [ :def | def isOrganizationDefinition ].
mcOrganization ifNil: [ self error: 'Could not find MCOrganizationDefinition' ].
classes := SmalltalkCI classesInCategories: mcOrganization categories.
self loadedClasses addAll: classes
7 changes: 7 additions & 0 deletions ...tory/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/basicLoadProjectOn..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
executing
basicLoadProjectOn: aSmalltalkCI
| repository |
self smalltalkCI: aSmalltalkCI.
repository := self repository.
self extractVersionsFromPackages: repository.
self loadVersions: repository
7 changes: 7 additions & 0 deletions ...ltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/extractVersionsFromPackages..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
executing
extractVersionsFromPackages: aRepository
self packages do: [ :pkg | | versionNames |
versionNames := aRepository versionNamesForPackageNamed: pkg.
versionNames
ifEmpty: [ self error: 'No version for "', pkg asString ,'" found in ', aRepository asString ]
ifNotEmpty: [ self versions add: versionNames first ] ]
7 changes: 7 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/isComplete.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
testing
isComplete
self repository ifNil: [ ^ false ].
((self packages isNil or: [ self packages isEmpty ]) and: [
self versions isNil or: [ self versions isEmpty ] ])
ifTrue: [ ^ false ].
^ true
17 changes: 17 additions & 0 deletions .../SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/loadVersion.repository..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
executing
loadVersion: aVersionName repository: aRepository
| versionName reader |
versionName := aVersionName.
(aVersionName endsWith: '.mcz')
ifFalse: [ versionName := versionName, '.mcz' ].

reader := aRepository versionReaderForFileNamed: versionName.
reader
ifNil: [ self error: 'Version "', aVersionName asString, '" not found in ', aRepository asString ]
ifNotNil: [ | version |
version := reader version.
[ version load ] on: Warning do: [ :ex |
Transcript cr; show: ex description.
self smalltalkCI isHeadless ifTrue: [ ex resume ]].
self addLoadedClassesFrom: reader definitions.
version workingCopy repositoryGroup addRepository: aRepository ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/loadVersions..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
executing
loadVersions: aRepository
self versions do: [ :version |
self loadVersion: version repository: aRepository ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/loadedClasses..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
loadedClasses: anObject

loadedClasses := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/loadedClasses.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
loadedClasses

^ loadedClasses ifNil: [ loadedClasses := Set new ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/packages..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
packages: anObject

packages := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/packages.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
packages

^ packages ifNil: [ packages := OrderedCollection new ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/password..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
password: anObject

password := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/password.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
password

^ password ifNil: [ ^ '' ]
8 changes: 8 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/repository.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
private
repository
self url ifNil: [ ^ nil ].

^ MCHttpRepository
location: self url
user: self user
password: self password
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/smalltalkCI..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
smalltalkCI: anObject

smalltalkCI := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/smalltalkCI.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
smalltalkCI

^ smalltalkCI
3 changes: 3 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/testClasses.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
testing
testClasses
^ self loadedClasses asOrderedCollection select: [ :cl | cl inheritsFrom: TestCase ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/url..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
url: anObject

url := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/url.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
url

^ url
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/user..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
user: anObject

user := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/user.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
user

^ user ifNil: [ ^ '' ]
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/versions..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
versions: anObject

versions := anObject
4 changes: 4 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/instance/versions.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
versions

^ versions ifNil: [ versions := OrderedCollection new ]
26 changes: 26 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"class" : {
},
"instance" : {
"addLoadedClassesFrom:" : "fn 6/9/2016 09:50",
"basicLoadProjectOn:" : "fn 6/9/2016 10:40",
"extractVersionsFromPackages:" : "fn 6/9/2016 09:25",
"isComplete" : "fn 6/9/2016 09:59",
"loadVersion:repository:" : "fn 6/9/2016 10:41",
"loadVersions:" : "fn 6/9/2016 09:23",
"loadedClasses" : "fn 6/9/2016 09:51",
"loadedClasses:" : "fn 6/9/2016 09:39",
"packages" : "fn 6/9/2016 10:24",
"packages:" : "fn 6/9/2016 08:57",
"password" : "fn 6/9/2016 09:06",
"password:" : "fn 6/9/2016 09:06",
"repository" : "fn 6/9/2016 10:06",
"smalltalkCI" : "fn 6/9/2016 10:40",
"smalltalkCI:" : "fn 6/9/2016 10:40",
"testClasses" : "fn 6/9/2016 10:11",
"url" : "fn 6/9/2016 09:06",
"url:" : "fn 6/9/2016 09:06",
"user" : "fn 6/9/2016 10:07",
"user:" : "fn 6/9/2016 10:06",
"versions" : "fn 6/9/2016 10:23",
"versions:" : "fn 6/9/2016 08:57" } }
20 changes: 20 additions & 0 deletions repository/SmalltalkCI-Core.package/SCIMonticelloLoadSpec.class/properties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"category" : "SmalltalkCI-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
"url",
"user",
"password",
"packages",
"versions",
"loadedClasses",
"smalltalkCI" ],
"name" : "SCIMonticelloLoadSpec",
"pools" : [
],
"super" : "SCIAbstractLoadSpec",
"type" : "normal" }

0 comments on commit 657ad81

Please sign in to comment.