Merge branch 'pharo1.3' into pharo1.3_dev

.travis.yml

@@ -13,25 +13,12 @@ branches:
 install:
    - export PROJECT_HOME="$(pwd)"
    - cd $HOME
-   - wget -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
+   - wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
    - unzip -q builderCI.zip
    - cd dalehenrich-builderCI*
    - source build_env_vars
    - ln -s $PROJECT_HOME $GIT_PATH
    - ./build_image.sh
 
-script:
-
-   - ./build.sh -i $ST -s latAmMirror.st -m -f "$PROJECT_HOME/tests/travisCI.st" -o travisCI
-   - cd "${BUILD_PATH}/travisCI/"
-   - if ( test -e PharoDebug.log ); then cat TravisTranscript.txt; fi
-   - if ( test -e PharoDebug.log ); then cat PharoDebug.log; fi
-   - if ( test -e PharoDebug.log ); then die; fi
-   - if ( test -e SqueakDebug.log ); then cat TravisTranscript.txt; fi
-   - if ( test -e SqueakDebug.log ); then cat SqueakDebug.log; fi
-   - if ( test -e SqueakDebug.log ); then die; fi
-   - if ( test -e TravisCISuccess.txt ); then cat TravisCISuccess.txt; fi
-   - if ( test -e TravisCIFailure.txt ); then cat TravisTranscript.txt; fi
-   - if ( test -e TravisCIFailure.txt ); then cat TravisCIFailure.txt; fi
-   - if ( test -e TravisCIFailure.txt ); then die; fi
+script: $BUILDER_CI_HOME/testTravisCI.sh
 

repository/MonticelloFileTree-Core.package/MCFileTreeAbstractReader.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -13,5 +12,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCMczReader",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeAbstractStWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -14,5 +13,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeJsonParser.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "Object",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreePackageStructureStWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCStWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json

@@ -10,7 +10,7 @@
 		"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 8/10/2012 07:20",
 		"fileDirectoryOn:" : "dkh 8/10/2012 07:25",

repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		"defaultPackageExtension" ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -13,5 +12,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCDirectoryRepository",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeStSnapshotReader",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/class/initialize.st

@@ -0,0 +1,7 @@
+initialization
+initialize
+    "self initialize"
+
+    "force initialization of specials ..."
+
+    specials := nil

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/class/initializeSpecials.st

@@ -19,4 +19,4 @@ initializeSpecials
         at: $, put: 'comma';
         at: $@ put: 'at'.
     map keys do: [ :key | map at: (map at: key) put: key ].
-    ^ map
+    ^ map

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeClassDefinition..st

@@ -4,8 +4,16 @@ writeClassDefinition: definition
     properties := Dictionary new.
     properties at: 'name' put: definition className.
     properties at: 'super' put: definition superclassName.
-    definition traitComposition ifNotNil: [ :property | properties at: 'traitcomposition' put: property ].
-    definition classTraitComposition ifNotNil: [ :property | properties at: 'classtraitcomposition' put: property ].
+    definition traitCompositionString
+        ifNotNil: [ :property | 
+            "Issue #48: https://github.com/dalehenrich/filetree/issues/48"
+            property ~= '{}'
+                ifTrue: [ properties at: 'traitcomposition' put: property ] ].
+    definition classTraitCompositionString
+        ifNotNil: [ :property | 
+            "Issue #48: https://github.com/dalehenrich/filetree/issues/48"
+            property ~= '{}'
+                ifTrue: [ properties at: 'classtraitcomposition' put: property ] ].
     properties at: 'category' put: definition category.
     properties at: 'instvars' put: definition instVarNames asArray.
     properties at: 'classvars' put: definition classVarNames asArray.

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json

@@ -8,7 +8,7 @@
 		"fileNameForSelector:" : "dkh 4/4/2012 11:25",
 		"setFileStream:" : "dkh 4/4/2012 14:01",
 		"writeClassComment:" : "dkh 4/5/2012 10:01",
-		"writeClassDefinition:" : "dkh 4/5/2012 11:09",
+		"writeClassDefinition:" : "dkh 7/10/2012 09:33",
 		"writeClassDefinition:to:" : "dkh 6/12/2012 17:33:23",
 		"writeDefinitions:" : "dkh 8/10/2012 07:28",
 		"writeExtensionClassDefinition:" : "dkh 4/4/2012 17:52",

repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		"specials" ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeStSnapshotWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStReader.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractReader",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStSnapshotReader.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractReader",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStSnapshotWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -13,5 +12,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractStWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeStWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractStWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Core.package/MCFileTreeWriter.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Core",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -14,5 +13,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCMczWriter",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-FileDirectory-Utilities.package/monticello.meta/version

@@ -1 +1 @@
-(name 'MonticelloFileTree-FileDirectory-Utilities-dkh.11' message 'implement #directoryFromEntry:' id '56a1d735-772d-4d4e-a0e6-3a9d4daf18a6' date '10 August 2012' time '2:06:33.445 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.10' message 'more ... repackaging in preparation for live Pharo-2.0 tests' id 'bf793bd3-0b85-498d-aa67-9724d104ed6d' date '10 August 2012' time '10:19:28.124 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.9' message 'repackaging in preparation for live Pharo-2.0 tests' id '8b713b1a-9b9c-41d5-bf21-10bbf8cdb444' date '10 August 2012' time '10:06:33.633 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.8' message 'add #directoryFromPath:' id 'c52f0b8d-6d5b-479c-a531-f0d28a9d92d0' date '10 August 2012' time '9:52:32.638 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.7' message 'replaced all of the obvious FileDirectoryisms ... entries have not been touched yet ...tests are green ' id '6d5729e0-49ae-404c-b217-c04dc1dd51ed' date '10 August 2012' time '8:01:30.629 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.6' message 'implement #readStreamFor:in:do:' id '00185437-5916-4f1f-8d63-05e47beb7d04' date '10 August 2012' time '6:03:23.937 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.5' message 'implement #directoryFromPath:relativeTo: , #ensureDirectoryExists: and #ensuerFilePathExists:relativeTo:' id 'f11a19d5-2a8c-47f9-8321-09f425467d4d' date '10 August 2012' time '5:35:33.005 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.4' message '#buildPathFrom:, #ensurePathExists:relativeTo:, and #writeStreamFor:in:do: implemented/tested' id '2c2e4f4e-c7ab-451e-8c31-9a10a95ce3b5' date '9 August 2012' time '3:54:09.273 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.3' message 'settling into an api' id '271f4d9c-3493-463a-9326-7277b974d5ae' date '9 August 2012' time '9:49:24.198 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.2' message 'create MCFileTreeFileUtils' id '8d563560-e596-45a9-a10f-ba592336c6a5' date '8 August 2012' time '10:47:44.668 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.1' message 'checkpoint' id 'fc4a448c-abe9-40be-b05e-affca01e4b34' date '8 August 2012' time '10:16:57.906 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'MonticelloFileTree-FileDirectory-Utilities-dkh.13' message 'put pharo13 branch into history for FileTree 1.0 (dkh.29)' id '1ec29df9-06ed-4969-9495-eacff3bbe6c6' date '15 September 2012' time '3:05:42 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities.pharo13-dkh.12' message 'release FileTree 1.0 (dkh.29)' id '39fe9f59-05ba-4567-954f-17ff83aa5b0e' date '15 September 2012' time '2:58:47 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.11' message 'implement #directoryFromEntry:' id '56a1d735-772d-4d4e-a0e6-3a9d4daf18a6' date '10 August 2012' time '2:06:33.445 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.10' message 'more ... repackaging in preparation for live Pharo-2.0 tests' id 'bf793bd3-0b85-498d-aa67-9724d104ed6d' date '10 August 2012' time '10:19:28.124 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.9' message 'repackaging in preparation for live Pharo-2.0 tests' id '8b713b1a-9b9c-41d5-bf21-10bbf8cdb444' date '10 August 2012' time '10:06:33.633 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.8' message 'add #directoryFromPath:' id 'c52f0b8d-6d5b-479c-a531-f0d28a9d92d0' date '10 August 2012' time '9:52:32.638 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.7' message 'replaced all of the obvious FileDirectoryisms ... entries have not been touched yet ...tests are green ' id '6d5729e0-49ae-404c-b217-c04dc1dd51ed' date '10 August 2012' time '8:01:30.629 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.6' message 'implement #readStreamFor:in:do:' id '00185437-5916-4f1f-8d63-05e47beb7d04' date '10 August 2012' time '6:03:23.937 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.5' message 'implement #directoryFromPath:relativeTo: , #ensureDirectoryExists: and #ensuerFilePathExists:relativeTo:' id 'f11a19d5-2a8c-47f9-8321-09f425467d4d' date '10 August 2012' time '5:35:33.005 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.4' message '#buildPathFrom:, #ensurePathExists:relativeTo:, and #writeStreamFor:in:do: implemented/tested' id '2c2e4f4e-c7ab-451e-8c31-9a10a95ce3b5' date '9 August 2012' time '3:54:09.273 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.3' message 'settling into an api' id '271f4d9c-3493-463a-9326-7277b974d5ae' date '9 August 2012' time '9:49:24.198 am' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.2' message 'create MCFileTreeFileUtils' id '8d563560-e596-45a9-a10f-ba592336c6a5' date '8 August 2012' time '10:47:44.668 pm' author 'dkh' ancestors ((name 'MonticelloFileTree-FileDirectory-Utilities-dkh.1' message 'checkpoint' id 'fc4a448c-abe9-40be-b05e-affca01e4b34' date '8 August 2012' time '10:16:57.906 pm' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

repository/MonticelloFileTree-Tests.package/MCFileTreeAbstractTest.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "TestCase",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Tests.package/MCFileTreeGenericLoaderTest.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractTest",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Tests.package/MCFileTreeIssue26Test.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeGenericLoaderTest",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Tests.package/MCFileTreeIssue33Test.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeGenericLoaderTest",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Tests.package/MCFileTreeJsonTest.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeAbstractTest",
-	"traitcomposition" : "{}",
 	"type" : "normal" }

repository/MonticelloFileTree-Tests.package/MCFileTreeLoaderTest.class/properties.json

@@ -2,7 +2,6 @@
 	"category" : "MonticelloFileTree-Tests",
 	"classinstvars" : [
 		 ],
-	"classtraitcomposition" : "{}",
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
@@ -12,5 +11,4 @@
 	"pools" : [
 		 ],
 	"super" : "MCFileTreeGenericLoaderTest",
-	"traitcomposition" : "{}",
 	"type" : "normal" }