Skip to content

Commit

Permalink
finally a real fix for Issue #36: .package needs to be valid extensio…
Browse files Browse the repository at this point in the history 
…n in absence of .filetree file

not sure why I couldn't reproduce interactively ... ah well this should nail it...
  • Loading branch information
Dale Henrichs committed Jun 28, 2012
1 parent 4058b81 commit c0cbc33
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 63 deletions.
16 changes: 2 additions & 14 deletions ...itory/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/allFileNames.st
View file
@@ -1,16 +1,4 @@
as yet unclassified
allFileNames
Transcript
cr;
show: 'packageExtension' , self packageExtension printString.
^ (self directory entries
select: [ :entry |
Transcript
cr;
show: 'select-> ' , entry name printString.
entry isDirectory and: [ self canReadFileNamed: entry name ] ])
collect: [ :entry |
Transcript
cr;
show: 'collect-> ' , entry name printString.
entry name ]
^ (self directory entries select: [ :entry | entry isDirectory and: [ self canReadFileNamed: entry name ] ])
collect: [ :entry | entry name ]
7 changes: 6 additions & 1 deletion .../MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/canReadFileNamed..st
View file
@@ -1,3 +1,8 @@
as yet unclassified
canReadFileNamed: aString
^ (aString endsWith: self packageExtension) or: [ aString endsWith: '.tree' ]
^ (aString endsWith: self packageExtension)
or: [
(aString endsWith: '.tree')
or: [
"Cypress format"
aString endsWith: '.package' ] ]
4 changes: 2 additions & 2 deletions repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json
View file
Expand Up @@ -6,11 +6,11 @@
"parseName:" : "dkh 2/29/2012 09:40:37",
"parseName:extension:" : "dkh 2/16/2012 14:49:00" },
"instance" : {
"allFileNames" : "dkh 6/28/2012 15:06",
"allFileNames" : "dkh 6/16/2012 09:03",
"asRepositorySpecFor:" : "dkh 2/16/2012 14:49:00",
"basicStoreVersion:" : "dkh 4/5/2012 10:33",
"cachedFileNames" : "dkh 2/16/2012 14:49:00",
"canReadFileNamed:" : "dkh 2/29/2012 10:15",
"canReadFileNamed:" : "dkh 6/28/2012 15:14",
"description" : "dkh 2/16/2012 14:49:00",
"directory:" : "dkh 3/7/2012 17:09:47",
"directoryFrom:" : "dkh 2/16/2012 14:49:00",
Expand Down
4 changes: 2 additions & 2 deletions repository/MonticelloFileTree-Core.package/monticello.meta/version
View file

Large diffs are not rendered by default.

45 changes: 3 additions & 42 deletions ...nticelloFileTree-Tests.package/MCFileTreeLoaderTest.class/instance/testCypressCuisLoad.st
View file
@@ -1,49 +1,10 @@
testing
testCypressCuisLoad
| gofer repo |
[
| packageName |
packageName := 'Cypress-Mocks'.
(gofer := Gofer new)
Gofer new
disablePackageCache;
repository: (repo := self getTestRepository: 'cuisCypress');
repository: (self getTestRepository: 'cuisCypress');
package: packageName;
load.
self validateAgainst: self snapshotCypressCuisDefinitions for: packageName ]
on: Error
do: [ :ex |
Transcript
cr;
show: 'Repo: ' , repo description.
Transcript
cr;
show: '**************REFS'.
gofer allResolved
do: [ :ref |
Transcript
cr;
show: ref name , ' ' , ref package ].
Transcript
cr;
show: '***************************************************';
cr;
show: ex description.
(ex signalerContext stackOfSize: 100)
do: [ :item |
Transcript
cr;
show: item printString asString.
item tempScopedNames
doWithIndex: [ :title :index |
Transcript
cr;
tab;
nextPutAll: title;
nextPut: $:;
space;
tab;
nextPutAll: (item tempAt: index) printString ].
Transcript
cr;
show: '***************************************************' ].
ex pass ]
self validateAgainst: self snapshotCypressCuisDefinitions for: packageName
2 changes: 1 addition & 1 deletion ...ository/MonticelloFileTree-Tests.package/MCFileTreeLoaderTest.class/methodProperties.json
View file
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"tearDownPackagesList" : "dkh 6/12/2012 13:50:30",
"testBaseLoad" : "dkh 4/6/2012 14:43:38",
"testCypressCuisLoad" : "dkh 6/28/2012 14:54",
"testCypressCuisLoad" : "dkh 6/27/2012 15:00",
"testSnapshotBaseLoad" : "dkh 5/23/2012 21:20:24",
"testTargetLoad" : "dkh 4/6/2012 14:43:38",
"testTreeBaseLoad" : "dkh 6/27/2012 14:51",
Expand Down
2 changes: 1 addition & 1 deletion tests/repository/MonticelloFileTree-Tests.package/monticello.meta/version
View file
@@ -1 +1 @@
(name 'MonticelloFileTree-Tests-dkh.22' message 'print stack on error' id '08000000-1508-f408-1508-f40814000000' date '28 June 2012' time '2:55 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.21' message 'print stack on error' id '08000000-1508-f600-1508-f60014000000' date '28 June 2012' time '2:47:32 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.20' message 'print stack on error' id '08000000-1508-c60a-1508-c60a14000000' date '28 June 2012' time '2:34:12 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.19' message 'print stack on error' id '08000000-1508-ba0b-1508-ba0b14000000' date '28 June 2012' time '2:26:57 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.18' message 'print stack on error' id '08000000-1508-121d-1508-121d14000000' date '28 June 2012' time '2:21:21 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.17' message 'print stack on error' id '08000000-1508-d014-1508-d01414000000' date '28 June 2012' time '2:14:34 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.16' message 'Issue #36' id '08000000-1508-6a1d-1508-6a1d14000000' date '27 June 2012' time '3:01:22 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.15' message 'checkpoint issue #33' id '3bddbec1-3131-4a1c-a791-754dc06db1ed' date '12 June 2012' time '6:03:41 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.14' message 'checkpoint issue #33' id '18919a5b-d8c5-4523-82ee-4cae357808e0' date '12 June 2012' time '5:33:44 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.13' message 'checkpoint Issue #34' id '7113bf71-d119-489c-9099-d78bf86f9ae9' date '12 June 2012' time '1:50:30 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.12' message 'fix Issue #34' id '5ebb1b25-238a-421a-a630-9919c557b219' date '12 June 2012' time '12:03:47.351 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.11' message 'fix Issue #26' id 'c74d3e0e-0911-452f-9cfd-834d3df2e78d' date '9 June 2012' time '2:24:37 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.10' message 'checkpoint Issue #23' id '5976f525-1fc0-47b6-afa3-f63c046ef538' date '9 June 2012' time '1:19:06 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.9' message 'tests for Issue #26 ... 12 run, 12 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '38239c88-58bb-49d4-a2ad-8db29315c5c6' date '23 May 2012' time '9:20:24 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.8' message 'add tests for snapshot and old filetree formats: 9 run, 9 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '3b02e82c-b352-44f1-8540-12309d5533b8' date '9 April 2012' time '2:34:58 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.7' message 'passing tests after upgrading an image' id '1177dd6f-20d1-4061-8ede-9e31f4f2c859' date '6 April 2012' time '6:00:20 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.6' message 'checkpoint: 7 run, 7 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '33014e30-d2a5-4915-84d9-13feb1e1ff70' date '6 April 2012' time '2:43:38 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.5' message 'checkpoint: 6 run, 6 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '6d3b8106-6da5-45c3-a153-0f04caa180be' date '6 April 2012' time '12:54:32 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.4' message 'checkpoint' id '1c2291bb-a3df-43df-b8cc-0aeb8938ac7f' date '6 April 2012' time '12:28:06 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.3' message 'checkpoint' id '0b8d8cf7-278d-4cf4-9440-ec11bd9aa772' date '6 April 2012' time '12:25:22 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.2' message 'passing MCFileTreeJsonTest' id '38111966-def7-4a88-90f6-18c493da52f6' date '6 April 2012' time '11:54:29 am' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.1' message 'initial checkin' id '563f5b8d-760f-474b-94ff-40b64d1548bd' date '5 April 2012' time '8:57:38 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'MonticelloFileTree-Tests-dkh.23' message 'Issue #36' id '08000000-1508-c001-1508-c00114000000' date '28 June 2012' time '3:18:19 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.22' message 'print stack on error' id '08000000-1508-f408-1508-f40814000000' date '28 June 2012' time '2:55 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.21' message 'print stack on error' id '08000000-1508-f600-1508-f60014000000' date '28 June 2012' time '2:47:32 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.20' message 'print stack on error' id '08000000-1508-c60a-1508-c60a14000000' date '28 June 2012' time '2:34:12 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.19' message 'print stack on error' id '08000000-1508-ba0b-1508-ba0b14000000' date '28 June 2012' time '2:26:57 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.18' message 'print stack on error' id '08000000-1508-121d-1508-121d14000000' date '28 June 2012' time '2:21:21 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.17' message 'print stack on error' id '08000000-1508-d014-1508-d01414000000' date '28 June 2012' time '2:14:34 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.16' message 'Issue #36' id '08000000-1508-6a1d-1508-6a1d14000000' date '27 June 2012' time '3:01:22 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.15' message 'checkpoint issue #33' id '3bddbec1-3131-4a1c-a791-754dc06db1ed' date '12 June 2012' time '6:03:41 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.14' message 'checkpoint issue #33' id '18919a5b-d8c5-4523-82ee-4cae357808e0' date '12 June 2012' time '5:33:44 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.13' message 'checkpoint Issue #34' id '7113bf71-d119-489c-9099-d78bf86f9ae9' date '12 June 2012' time '1:50:30 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.12' message 'fix Issue #34' id '5ebb1b25-238a-421a-a630-9919c557b219' date '12 June 2012' time '12:03:47.351 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.11' message 'fix Issue #26' id 'c74d3e0e-0911-452f-9cfd-834d3df2e78d' date '9 June 2012' time '2:24:37 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.10' message 'checkpoint Issue #23' id '5976f525-1fc0-47b6-afa3-f63c046ef538' date '9 June 2012' time '1:19:06 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.9' message 'tests for Issue #26 ... 12 run, 12 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '38239c88-58bb-49d4-a2ad-8db29315c5c6' date '23 May 2012' time '9:20:24 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.8' message 'add tests for snapshot and old filetree formats: 9 run, 9 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '3b02e82c-b352-44f1-8540-12309d5533b8' date '9 April 2012' time '2:34:58 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.7' message 'passing tests after upgrading an image' id '1177dd6f-20d1-4061-8ede-9e31f4f2c859' date '6 April 2012' time '6:00:20 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.6' message 'checkpoint: 7 run, 7 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '33014e30-d2a5-4915-84d9-13feb1e1ff70' date '6 April 2012' time '2:43:38 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.5' message 'checkpoint: 6 run, 6 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes' id '6d3b8106-6da5-45c3-a153-0f04caa180be' date '6 April 2012' time '12:54:32 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.4' message 'checkpoint' id '1c2291bb-a3df-43df-b8cc-0aeb8938ac7f' date '6 April 2012' time '12:28:06 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.3' message 'checkpoint' id '0b8d8cf7-278d-4cf4-9440-ec11bd9aa772' date '6 April 2012' time '12:25:22 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.2' message 'passing MCFileTreeJsonTest' id '38111966-def7-4a88-90f6-18c493da52f6' date '6 April 2012' time '11:54:29 am' author 'dkh' ancestors ((name 'MonticelloFileTree-Tests-dkh.1' message 'initial checkin' id '563f5b8d-760f-474b-94ff-40b64d1548bd' date '5 April 2012' time '8:57:38 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

0 comments on commit c0cbc33

Please sign in to comment.