Issue #4: create session description ... looks kosher

GsDevKit · Jun 3, 2023 · ba7961b · ba7961b
1 parent 56e19e9
commit ba7961b
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 77 deletions.
diff --git a/rowan/components/Core.ston b/rowan/components/Core.ston
@@ -10,4 +10,4 @@ RwSimpleProjectLoadComponentV2 {
 		'GsDevKit_stones-Core'
 	],
 	#comment : ''
-}
+}
diff --git a/rowan/components/Tode.ston b/rowan/components/Tode.ston
@@ -7,4 +7,4 @@ RwSimpleProjectLoadComponentV2 {
 		'GsDevKit_stones-Tode'
 	],
 	#comment : 'Shared classes between GsDevKit_stones and Tode'
-}
+}
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/backupsDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/backupsDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/binDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/binDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/extentsDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/extentsDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/productDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/productDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/snapshotsDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/snapshotsDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/statsDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/statsDir.st
diff --git a/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/tranlogsDir.st b/src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/tranlogsDir.st
diff --git a/..._stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/createSessionDescripton..st b/..._stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/createSessionDescripton..st
@@ -1,6 +1,21 @@
 stone creation
 createSessionDescripton: stoneSpec
-	| sessionDescriptionFile |
-	sessionDescriptionFile := stoneSpec todeSharedDirectory asFileReference / 'sessions'
-		/ stoneSpec stoneName.
-	sessionDescriptionFile ensureCreateFile
+	| sessionDescriptionFile description localHostName |
+	sessionDescriptionFile := stoneSpec todeSharedDirectory asFileReference
+		/ 'sessions' / stoneSpec stoneName.
+	localHostName := System hostname.
+	description := TDSessionDescription new
+		name: stoneSpec stoneName;
+		gemstoneVersion: stoneSpec gemstoneVersionString;
+		stoneHost: localHostName;
+		stoneName: stoneSpec stoneName;
+		gemHost: localHostName;
+		netLDI: stoneSpec stoneName , '_ldi';
+		netLDIPort: self netldiPort asString;
+		gemTask: 'gemnetobject';
+		userId: stoneSpec userId;
+		password: stoneSpec password;
+		backupDirectory: (stoneSpec rootDir / self backups) pathString;
+		snapshotDirectory: (stoneSpec rootDir / self snapshots) pathString;
+		yourself.
+	description exportTo: sessionDescriptionFile
diff --git a/...it_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/destroyStoneStructure..st b/...it_stones-Core.package/GDKhomeStoneDirectorySpec.class/instance/destroyStoneStructure..st
@@ -3,9 +3,8 @@ destroyStoneStructure: stoneSpec
 	"clean up the stone-specific tode meta data"
 
 	| sharedtodeDir stoneDir sessionsFile |
-self halt.
 	sharedtodeDir := stoneSpec todeSharedDirectory asFileReference.
-	stoneDir := sharedtodeDir / 'stones' / stoneSpec stoneName.
+	stoneDir := sharedtodeDir / 'server' / 'stones' / stoneSpec stoneName.
 	stoneDir ensureDeleteAll.
 	sessionsFile := sharedtodeDir / 'sessions' / stoneSpec stoneName.
 	sessionsFile ensureDelete
diff --git a/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/exportTo..st b/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/exportTo..st
@@ -1,3 +1,4 @@
 accessing
-exportTo: filepath
-	self exportTo: filepath extension: ''
+exportTo: fileRef
+	fileRef
+		writeStreamDo: [ :fileStream | STON put: self onStreamPretty: fileStream ]
diff --git a/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/exportTo.extension..st b/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/exportTo.extension..st
diff --git a/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/gemstoneVersion..st b/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/gemstoneVersion..st
@@ -1,7 +1,4 @@
 accessing
 gemstoneVersion: aString
-	| tokens |
-	tokens := aString findTokens: '.'.
-	tokens size <= 2
-		ifTrue: [ self error: 'GemStone version must have a minimum of three version fields: ''3.2.0''' ].
+	aString asRwGemStoneVersionNumber.	"validate that is a proper GemStone version"
 	gemstoneVersion := aString
diff --git a/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/stonOn..st b/src/GsDevKit_stones-Tode.package/TDSessionDescription.class/instance/stonOn..st
@@ -1,7 +1,12 @@
 ston
 stonOn: stonWriter
-  stonWriter
-    writeObject: self
-    streamMap: [ :dictionary | 
-      self stonInstVarNames
-        do: [ :each | dictionary at: each asSymbol put: (self instVarNamed: each) ] ]
+	| allInstanceVariableNames |
+	allInstanceVariableNames := self class allInstVarNames.
+	stonWriter
+		writeObject: self
+		streamMap: [ :dictionary | 
+			self stonInstVarNames
+				do: [ :each | 
+					dictionary
+						at: each asSymbol
+						put: (self instVarAt: (allInstanceVariableNames indexOf: each asSymbol)) ] ]