Issue GsDevKit#58: disable web-socket test load for 'CI' until Crypto…

…graphy load issue resolved Issue GsDevKit#60: fix NeoJSON specification and add 'REST' to 'CI' group ... defer reference to GsDevKit/NeoJSON project until travis tests have been enabled ...
glassdb · Nov 18, 2014 · 7aba2fd · 7aba2fd
1 parent a9aaa40
commit 7aba2fd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st b/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st
@@ -10,11 +10,7 @@ baseline: spec
               spec
                 versionString: #'stable';
                 repository: 'http://www.squeaksource.com/MetacelloRepository' ];
-        configuration: 'Neo JSON'
-          with: [ 
-              spec
-                versionString: #'stable';
-                repository: 'http://mc.stfx.eu/Neo' ].
+        yourself.
       spec
         package: 'Zinc-Character-Encoding-Core';
         package: 'Zinc-Character-Encoding-Tests'
@@ -28,7 +24,7 @@ baseline: spec
         package: 'Zinc-Patch-HTTPSocket' with: [ spec requires: 'Zinc-HTTP' ];
         package: 'Zinc-AWS'
           with: [ spec requires: #('Zinc-HTTP' 'XML Support') ];
-        package: 'Zinc-REST' with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
+        package: 'Zinc-REST' with: [ spec requires: #('Zinc-HTTP' 'NeoJSON') ];
         package: 'Zinc-Zodiac'
           with: [ spec requires: #('Zinc-HTTP' 'Zodiac-Core' 'Zodiac-Tests') ];
         package: 'Zodiac-Core';
@@ -37,9 +33,9 @@ baseline: spec
         package: 'Zinc-WebSocket-Tests'
           with: [ spec requires: 'Zinc-WebSocket-Core' ];
         package: 'Zinc-SSO-OAuth1-Core'
-          with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
+          with: [ spec requires: #('Zinc-HTTP' 'NeoJSON') ];
         package: 'Zinc-SSO-OAuth2-Core'
-          with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
+          with: [ spec requires: #('Zinc-HTTP' 'NeoJSON') ];
         package: 'Zinc-SSO-OpenID-Core'
           with: [ spec requires: #('Zinc-HTTP' 'XML Support') ];
         package: 'Zinc-SSO-Demo'
@@ -90,6 +86,13 @@ baseline: spec
   spec
     for: #'squeakCommon'
     do: [ 
+      spec
+        configuration: 'NeoJSON'
+          with: [ 
+              spec
+                versionString: #'stable';
+                repository: 'http://mc.stfx.eu/Neo' ];
+        yourself.
       spec package: 'Zinc-Patch-HTTPSocket' with: [ spec requires: 'Zinc-HTTP' ].
       spec group: 'Patch-HTTPSocket' with: #('Zinc-Patch-HTTPSocket') ].
   spec
@@ -124,7 +127,13 @@ baseline: spec
           with: [ 
               spec
                 versionString: #'stable';
-                repository: 'http://seaside.gemtalksystems.com/ss/Cryptography' ].
+                repository: 'http://seaside.gemtalksystems.com/ss/Cryptography' ];
+        configuration: 'NeoJSON'
+          with: [ 
+              spec
+                versionString: #'stable';
+                repository: 'http://mc.stfx.eu/Neo' ];
+        yourself.
       spec
         package: 'SocketStream';
         package: 'Zinc-FileSystem-Legacy' with: [ spec requires: #('GLASS1') ];
@@ -137,7 +146,7 @@ baseline: spec
                 includes: #('SocketStream') ];
         package: 'Zinc-Tests' with: [ spec requires: #('GsPharo') ].
       spec
-        group: 'CI' with: #('Zinc-WebSocket-Tests');
+        group: 'CI' with: #('REST');
         yourself ].
   spec
     for: #'gs2.x'

diff --git a/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/methodProperties.json b/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 11/01/2014 12:26" } }
+		"baseline:" : "dkh 11/17/2014 16:30" } }
diff --git a/repository/BaselineOfZincHTTPComponents.package/monticello.meta/version b/repository/BaselineOfZincHTTPComponents.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfZincHTTPComponents-dkh.6' message 'Issue #58: cryptography configuration needed updating, so added stable version while I was at it ...' id '00296be5-2d30-418d-a474-2f373393e313' date '11/01/2014' time '13:00:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.5' message 'Issue #58: no stable version defined in the current Cryptography configuration...' id '67a67e96-6cf9-4c32-a87a-9e3d8bc3d647' date '11/01/2014' time '12:46:46' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.4' message 'Issue #58: create CI group to specifiy packages to be loaded by travis-ci for testing ... for GemStone that includes Zinc-WebSocket-Tests ... expect failures since Cryptography project is not up to snuff...yet' id '15af9af6-9829-412c-be6b-70cdc7fda24a' date '11/01/2014' time '12:28:52' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.3' message 'Issue #55: bump mcz version of the gs_master branch BaselineOfZincHTTPComponents, to avoid duplice mcz versions' id 'e175a78c-9a07-4da1-97a2-96eb0d40ba96' date '10/27/2014' time '15:10:49' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.2' message 'restore Zodiac packages and groups to configuration ... not ported to GemStone yet, see Issue #55 for details' id '6311a4fb-03de-42dc-81c7-b96971d30368' date '10/15/2014' time '11:55:57' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-JohanBrichau.1' message 'renamed BaselineOfZinc to BaselineOfZincHTTPComponents' id 'e022a66b-5bb4-47eb-b582-74a3ebaa1f9e' date '07/09/2014' time '21:16:19' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'BaselineOfZincHTTPComponents-dkh.7' message 'Issue #58: disable web-socket test load for ''CI'' until Cryptography load issue resolvedIssue #60: fix NeoJSON specification and add ''REST'' to ''CI'' group ... defer reference to GsDevKit/NeoJSON project until travis tests have been enabled ...' id 'fec29f56-7062-41a6-85d2-9d7a439559e4' date '11/17/2014' time '16:33:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.6' message 'Issue #58: cryptography configuration needed updating, so added stable version while I was at it ...' id '00296be5-2d30-418d-a474-2f373393e313' date '11/01/2014' time '13:00:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.5' message 'Issue #58: no stable version defined in the current Cryptography configuration...' id '67a67e96-6cf9-4c32-a87a-9e3d8bc3d647' date '11/01/2014' time '12:46:46' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.4' message 'Issue #58: create CI group to specifiy packages to be loaded by travis-ci for testing ... for GemStone that includes Zinc-WebSocket-Tests ... expect failures since Cryptography project is not up to snuff...yet' id '15af9af6-9829-412c-be6b-70cdc7fda24a' date '11/01/2014' time '12:28:52' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.3' message 'Issue #55: bump mcz version of the gs_master branch BaselineOfZincHTTPComponents, to avoid duplice mcz versions' id 'e175a78c-9a07-4da1-97a2-96eb0d40ba96' date '10/27/2014' time '15:10:49' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.2' message 'restore Zodiac packages and groups to configuration ... not ported to GemStone yet, see Issue #55 for details' id '6311a4fb-03de-42dc-81c7-b96971d30368' date '10/15/2014' time '11:55:57' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-JohanBrichau.1' message 'renamed BaselineOfZinc to BaselineOfZincHTTPComponents' id 'e022a66b-5bb4-47eb-b582-74a3ebaa1f9e' date '07/09/2014' time '21:16:19' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())