Merge pull request #7 from GsDevKit/dev-1.1.12

Dev 1.1.12
SeasideSt · Nov 8, 2014 · 00a7df6 · 00a7df6
2 parents 27ae1e2 + ed57cb0
commit 00a7df6
Show file tree

Hide file tree

Showing 295 changed files with 1,693 additions and 151 deletions.
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
@@ -1,10 +1,9 @@
 baseline
 baseline: spec
   <baseline>
-  spec
-    for: #'common'
-    do: [ 
-      spec blessing: #'baseline'.
+
+  spec for: #'common' do: [ 
+	spec blessing: #'baseline'.
       spec
         package: 'Grease-Core';
         package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
@@ -14,72 +13,75 @@ baseline: spec
         group: 'Slime' with: #('Core');
         group: 'Slime Tests' with: #('Core Tests');
         group: 'Tests' with: #('Core Tests' 'Slime Tests');
-        group: 'default' with: #('Slime') ].
-  spec
-    for: #'pharo3.x'
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Pharo30-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
-        package: 'Grease-Pharo30-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Pharo20-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ];
-        package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Slime'
-          with: [ spec requires: #('Grease-Slime') ].
-      spec
-        group: 'Slime' with: #('Grease-Slime');
-        group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
-  spec
-    for: #'pharo2.x'
-    do: [ 
-      spec
-        package: 'Grease-Core'
-          with: [ spec includes: #('Grease-Pharo20-Core') ];
-        package: 'Grease-Tests-Core'
-          with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
-        package: 'Grease-Pharo20-Core'
-          with: [ spec requires: #('Grease-Core') ];
-        package: 'Grease-Tests-Pharo20-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ].
-      self slimeForSqueakPharo1xPharo2x: spec ].
-  spec
-    for: #'pharo1.x'
-    do: [ 
+        group: 'default' with: #('Slime')
+  ].
+
+  spec for: #'squeak' do: [ 
       self greaseCoreAndTestsForSqueakAndPharo1x: spec.
-      self slimeForSqueakPharo1xPharo2x: spec ].
-  spec
-    for: #'pharo1.1'
-    do: [ 
+      self slimeForSqueakPharo1xPharo2x: spec
+  ].
+
+  spec for: #'pharo1.0' do: [ 
       spec
         package: 'Grease-Pharo-Core'
-        with: [ spec includes: #('Grease-Pharo11-Core') ] ].
-  spec
-    for: #'pharo1.0'
-    do: [ 
+        with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ] 
+  ].
+
+  spec for: #'pharo1.x' do: [ 
+      self greaseCoreAndTestsForSqueakAndPharo1x: spec.
+      self slimeForSqueakPharo1xPharo2x: spec
+  ].
+
+  spec for: #'pharo1.1' do: [ 
       spec
         package: 'Grease-Pharo-Core'
-        with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ] ].
-  spec
-    for: #'squeak'
-    do: [ 
-      self greaseCoreAndTestsForSqueakAndPharo1x: spec.
+        with: [ spec includes: #('Grease-Pharo11-Core') ]
+  ].
+
+  spec for: #'pharo2.x' do: [ 
+      spec
+        package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo20-Core') ];
+        package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
+        package: 'Grease-Pharo20-Core' with: [ spec requires: #('Grease-Core') ];
+        package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core') ].
       self slimeForSqueakPharo1xPharo2x: spec ].
-  spec
-    for: #'gemstone'
-    do: [ 
+
+  spec for: #'pharo3.x' do: [ 
+      spec
+        package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
+        package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
+        package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ];
+        package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core') ];
+        package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
+        package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Slime') ].
+      spec
+        group: 'Slime' with: #('Grease-Slime');
+        group: 'Slime Tests' with: #('Grease-Tests-Slime') 
+  ].
+
+  spec for: #'pharo4.x' do: [ 
+	spec
+	  package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
+	  package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
+	  package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ];
+	  package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core')];
+	  package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
+	  package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
+	spec
+	  group: 'Slime' with: #('Grease-Pharo40-Slime');
+	  group: 'Slime Tests' with: #('Grease-Tests-Slime').
+  ].	
+
+  spec for: #'gemstone' do: [ 
       spec
         project: 'GsCore'
-          with: [ 
+        with: [ 
               spec
                 className: 'ConfigurationOfGsCore';
                 versionString: #'stable';
                 repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
         project: 'UTF8'
-          with: [ 
+        with: [ 
               spec
                 className: 'ConfigurationOfGsMisc';
                 versionString: #'stable';
@@ -105,42 +107,45 @@ baseline: spec
                 requires:
                   #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
         package: 'Grease-Tests-GemStone-Core'
-          with: [ spec requires: #('Grease-Tests-Core') ] ].
-  spec
-    for: #'gs2.x'
-    do: [ 
+          with: [ spec requires: #('Grease-Tests-Core') ] 
+  ].
+
+  spec for: #'gs2.x' do: [ 
       spec
         package: 'Grease-GemStone-Core'
           with: [ spec includes: #('Grease-GemStone200-Core') ];
         package: 'Grease-GemStone200-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs2.3.x'
-    do: [ 
+          with: [ spec requires: #('Grease-GemStone-Core') ] 
+  ].
+
+  spec for: #'gs2.3.x' do: [ 
       spec
         package: 'Grease-GemStone-Core'
           with: [ spec includes: #('Grease-GemStone230-Core') ];
         package: 'Grease-GemStone230-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs2.4.x'
-    do: [ 
+          with: [ spec requires: #('Grease-GemStone-Core') ]
+  ].
+
+  spec for: #'gs2.4.x' do: [ 
       spec
         package: 'Grease-GemStone-Core'
           with: [ spec includes: #('Grease-GemStone240-Core') ];
         package: 'Grease-GemStone240-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs3.x'
-    do: [ 
+          with: [ spec requires: #('Grease-GemStone-Core') ]
+  ].
+
+  spec for: #'gs3.x' do: [ 
       spec
         package: 'Grease-GemStone-Core'
           with: [ spec includes: #('Grease-GemStone300-Core') ];
         package: 'Grease-GemStone300-Core'
-          with: [ spec requires: #('Grease-GemStone-Core') ] ].
-  spec
-    for: #'gs3.2.x'
-    do: [ 
+          with: [ spec 
+				requires: #('Grease-GemStone-Core');
+				postLoadDoIt: #initializeLatin1ToUtf8Encodings ] 
+  ].
+
+  spec for: #'gs3.2.x' do: [ 
       spec
         package: 'Grease-Tests-GemStone-Core'
-        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
+        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ]
+  ]
diff --git a/...selineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st b/...selineOfGrease.package/BaselineOfGrease.class/instance/initializeLatin1ToUtf8Encodings.st
@@ -0,0 +1,4 @@
+doits
+initializeLatin1ToUtf8Encodings
+
+	GRUtf8CodecStream initialize
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 06/04/2014 15:13",
+		"baseline:" : "JohanBrichau 11/8/2014 09:27",
 		"greaseCoreAndTestsForSqueakAndPharo1x:" : "JohanBrichau 02/16/2014 03:50",
+		"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
 		"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
diff --git a/repository/BaselineOfGrease.package/monticello.meta/categories.st b/repository/BaselineOfGrease.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'BaselineOfGrease'!
+SystemOrganization addCategory: #BaselineOfGrease!
diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '06/04/2014' time '15:13:26' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '06/04/2014' time '15:12:31' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '06/04/2014' time '14:57:48' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '02/16/2014' time '03:50:22' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '02/16/2014' time '01:49:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01.45573 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/fileExists..st b/repository/Grease-Core.package/GRPlatform.class/instance/fileExists..st
@@ -0,0 +1,3 @@
+file library
+fileExists: aString
+	self subclassResponsibility 
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st b/repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st
@@ -0,0 +1,3 @@
+file library
+fileStreamOn: aString do: aBlock binary: aBoolean
+	self subclassResponsibility 
diff --git a/repository/Grease-Core.package/GRPlatform.class/methodProperties.json b/repository/Grease-Core.package/GRPlatform.class/methodProperties.json
@@ -16,6 +16,8 @@
 		"directoriesIn:" : "NickAger 3/9/2012 11:29",
 		"doTransaction:" : "lr 7/25/2011 19:51",
 		"ensureExistenceOfFolder:" : "pmm 2/5/2011 09:54",
+		"fileExists:" : "JohanBrichau 10/3/2014 20:02",
+		"fileStreamOn:do:binary:" : "JohanBrichau 10/3/2014 20:00",
 		"filesIn:" : "pmm 2/5/2011 09:54",
 		"isProcessTerminated:" : "jf 2/6/2009 16:00",
 		"label" : "jf 2/9/2010 00:57",

diff --git a/repository/Grease-Core.package/monticello.meta/categories.st b/repository/Grease-Core.package/monticello.meta/categories.st
@@ -1,5 +1,5 @@
 SystemOrganization addCategory: #'Grease-Core'!
-SystemOrganization addCategory: #'Grease-Core-Collections'!
-SystemOrganization addCategory: #'Grease-Core-Exceptions'!
-SystemOrganization addCategory: #'Grease-Core-Text'!
-SystemOrganization addCategory: #'Grease-Core-Utilities'!
+SystemOrganization addCategory: 'Grease-Core-Collections'!
+SystemOrganization addCategory: 'Grease-Core-Exceptions'!
+SystemOrganization addCategory: 'Grease-Core-Text'!
+SystemOrganization addCategory: 'Grease-Core-Utilities'!
diff --git a/repository/Grease-Core.package/monticello.meta/version b/repository/Grease-Core.package/monticello.meta/version
diff --git a/.../Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/contentsOfFile.binary..st b/.../Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/contentsOfFile.binary..st
@@ -1,10 +1,3 @@
 file-library
 contentsOfFile: aString binary: aBoolean
-	| stream dir file |
-	[
-	file := GsFile openReadOnServer: aString.
-		[stream := RWBinaryOrTextStream on: file contents.
-		aBoolean 
-			ifTrue: [ stream binary ]
-			ifFalse: [ stream ascii ]. 
-		^stream contents ] ensure: [ stream close ]] ensure: [ file close ].
+	^ self fileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean
diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileExists..st
@@ -0,0 +1,3 @@
+file-library
+fileExists: aString
+	^ (FileDirectory forFileName: aString) exists
diff --git a/...Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st b/...Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/fileStreamOn.do.binary..st
@@ -0,0 +1,10 @@
+file-library
+fileStreamOn: aString do: aBlock binary: aBoolean
+	| stream dir file |
+	[
+	file := GsFile openReadOnServer: aString.
+		[stream := RWBinaryOrTextStream on: file contents.
+		aBoolean 
+			ifTrue: [ stream binary ]
+			ifFalse: [ stream ascii ]. 
+		^ aBlock value: stream ] ensure: [ stream close ]] ensure: [ file close ].
diff --git a/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json b/repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json
@@ -9,7 +9,7 @@
 		"asMethodReturningString:named:" : "dkh 04/25/2011 20:21",
 		"base64Decode:" : "dkh 11/06/2009 08:41",
 		"compile:into:classified:" : "dkh 11/06/2009 08:41",
-		"contentsOfFile:binary:" : "DaleHenrichs 12/03/2010 16:33",
+		"contentsOfFile:binary:" : "JohanBrichau 10/11/2014 02:26",
 		"defaultDispatcherName" : "dkh 11/06/2009 08:41",
 		"deprecationExceptionSet" : "JohanBrichau 04/19/2014 10:55",
 		"directoriesIn:" : "JohanBrichau 02/15/2014 07:02",
@@ -18,6 +18,8 @@
 		"doCommitTransaction" : "dkh 11/06/2009 08:41",
 		"doTransaction:" : "JohanBrichau 03/21/2014 17:45",
 		"ensureExistenceOfFolder:" : "DaleHenrichs 12/03/2010 16:28",
+		"fileExists:" : "JohanBrichau 10/11/2014 02:18",
+		"fileStreamOn:do:binary:" : "JohanBrichau 10/11/2014 02:27",
 		"filesIn:" : "DaleHenrichs 09/02/2010 15:45",
 		"isProcessTerminated:" : "dkh 11/06/2009 08:41",
 		"label" : "DaleHenrichs 06/02/2010 16:39",