dalehenrich/tode#322: checkpoint addressing the failing tODE tests ..…

…. because of missing tode directory
GsDevKit · May 26, 2023 · 85d5bd2 · 85d5bd2
1 parent aa3e38a
commit 85d5bd2
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,35 @@ Greatly simplified version of GsDevKit_home
 4. standard location for git repos
 5. if you are using tODE I think you should continue using GsDevKit_home
 
-After running install add superDoit/bin and GsDevKit_stone/bin to $PATH
+After running install add superDoit/bin and GsDevKit_stones/bin to $PATH
+
+## Setting up the registry structure
+```bash
+registryName="_home"
+projectSetName="gsdevkit"
+gemstoneProductsDirectory=""
+createRegistry.solo $registryName
+createProjectSet.solo --registry=$registryName projectSet=$projectSetName --ssh
+cloneProjectsFromProjectSet.solo --registry=$registryName --projectSet=$projectSetName \
+  --projectDirectory=$GS_HOME/shared/repos
+registerProductDirectory.solo --registry=$registryName --productDirectory=$GS_HOME/shared/repos
+
+# GemStone version not previously downloaded
+downloadGemStone.solo --directory=$gemstoneProductsDirectory --registry=$registryName 3.6.6
+# GemStone version previously downloaded
+registerProduct.solo --registry=$registryName --fromDirectory=$GS_HOME/shared/downloads/products 3.6.6
+
+registryReport.solo
+```
+
+## Create a stone
+```bash
+stoneDirectoryPath=$GS_HOME/server/stones/gs_366
+createStone.solo --force --registry=$registryName --template=default_seaside \
+				--start --root=stoneDirectoryPath 3.6.6
+
+registryReport.solo
+```
 
 ## Branch naming conventions
 1. vX

diff --git a/bin/createProjectSet.solo b/bin/createProjectSet.solo
@@ -4,7 +4,7 @@ options
 SuperDoitRequiredOptionWithRequiredArg long: 'registry'.
 SuperDoitRequiredOptionWithRequiredArg long: 'projectSet'.
 SuperDoitOptionalOptionWithRequiredArg long: 'from'.
-SuperDoitOptionalOptionWithRequiredArg long: 'key'.
+SuperDoitOptionalOptionWithRequiredArg long: 'key' default: 'server'.
 SuperDoitOptionalOptionWithNoArg long: 'ssh'.
 SuperDoitOptionalOptionWithNoArg long: 'https'.
 SuperDoitOptionalOptionWithNoArg long: 'spec'.
@@ -31,7 +31,7 @@ OPTIONS
                     dump stack to stdout and wait for topaz to attach using topaz
                     DEBUGGEM command.
   --registry=<registry-name>   
-                    name of the registry. Default is /usr/bin/hostname
+                    name of the registry. Default is host name.
   --projectSet=<projectSet-name>
                     Name of the project set.
 
@@ -79,7 +79,7 @@ populateProjectSet: projectSet type: type from: stonSpecDictionaryFilePath
 		ifFalse: [self error: 'The dictionary of type ', type printString , ' is not supported.'].
 %
 doit
-	| registryClass stonesRegistry name projectSet |
+	| registryClass stonesRegistry name projectSet stonSpecDictionaryFilePath type |
 	self preDoitSpecLoad: [:spec |
 		spec projectsHome: self dirname asFileReference parent parent].
 	registryClass := (self globalNamed: 'GDKRegistry').	
@@ -99,15 +99,15 @@ doit
 			stonesRegistry projectSets at: name put: projectSet registryPath.
 			stonesRegistry export ].
   self from
-		ifNotNil: [:stonSpecDictionaryFilePath |
-			| type |
-			type := self https
-				ifTrue: [ 'https' ]
-				ifFalse: [
-					self ssh
-						ifTrue: [ 'ssh' ]
-						ifFalse: [ self error: 'Either --https or --ssh must be specified.' ] ]. 
-			self populateProjectSet: projectSet type: type from: stonSpecDictionaryFilePath.
-			projectSet export ].
+		ifNil: [ stonSpecDictionaryFilePath := self scriptPath ].
+		ifNotNil: [:fromPath | stonSpecDictionaryFilePath := fromPath ].
+	type := self https
+		ifTrue: [ 'https' ]
+		ifFalse: [
+			self ssh
+				ifTrue: [ 'ssh' ]
+				ifFalse: [ self error: 'Either --https or --ssh must be specified.' ] ]. 
+	self populateProjectSet: projectSet type: type from: stonSpecDictionaryFilePath.
+	projectSet export.
 	^ projectSet
 %
diff --git a/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/tode..st b/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/tode..st
@@ -0,0 +1,3 @@
+accessing
+tode: object
+	tode := object
diff --git a/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/tode.st b/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/tode.st
@@ -0,0 +1,3 @@
+accessing
+tode
+	^tode
diff --git a/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/todeDir.st b/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/todeDir.st
@@ -0,0 +1,6 @@
+accessing
+todeDir
+	| dir |
+	dir := self root / self tode.
+	dir ensureCreateDirectory.
+	^ dir
diff --git a/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/properties.json b/src/GsDevKit_stones-Core.package/GDKhomeStoneDirectorySpec.class/properties.json
@@ -6,7 +6,7 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		 ],
+		"tode" ],
 	"name" : "GDKhomeStoneDirectorySpec",
 	"pools" : [
 		 ],

diff --git a/templates/default_seaside.ston b/templates/default_seaside.ston
@@ -1,4 +1,4 @@
-GDKstonesStoneDirectorySpec {
+GDKhomeStoneDirectorySpec {
 	#name : 'default_seaside',
 	#backups : 'backups',
 	#bin : 'bin',
@@ -8,5 +8,6 @@ GDKstonesStoneDirectorySpec {
 	#stats : 'stats',
 	#tranlogs : 'tranlogs',
 	#snapshots : 'snapshots',
-	#product : 'product'
+	#product : 'product',
+	#tode : 'tode'
 }