update installation/update of semantics package

hpi-swa-lab · Aug 27, 2023 · 01c466b · 01c466b
1 parent a9126f7
commit 01c466b
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 24 deletions.
diff --git a/...OfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installDependencies.st b/...OfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installDependencies.st
@@ -6,4 +6,12 @@ installDependencies
 		baseline: 'SqueakHistory';
 		repository: 'github://LinqLover/squeak-history:stream-github--hpi-swa-lab--squeak-inbox-talk/packages';
 		get;
-		load: 'SqueakHistory'.
+		load: 'SqueakHistory'.
+
+	(Smalltalk hasClassNamed: #TalkSemanticConversationBrowserPlugin) ifTrue: [
+		self flag: #todo. "rename repo"
+		Metacello new
+			baseline: 'SemanticText';
+			repository: 'github://LinqLover/squeak-chatgpt:main';
+			get;
+			load].
diff --git a/...OfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st b/...OfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st
diff --git a/...s/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/methodProperties.json b/...s/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/methodProperties.json
@@ -4,8 +4,7 @@
 	"instance" : {
 		"baseline:" : "ct 8/27/2023 19:54",
 		"initializeSqhPreferences" : "ct 7/8/2021 21:00",
-		"installDependencies" : "ct 6/3/2023 19:54",
-		"installSemanticText" : "ct 8/17/2023 20:16",
+		"installDependencies" : "ct 8/27/2023 21:35",
 		"isCI" : "ct 10/15/2022 21:23",
 		"openWelcomeContentsSync" : "ct 7/8/2021 21:00",
 		"postLoad" : "ct 5/26/2021 15:42",

diff --git a/packages/SqueakInboxTalk.package/TalkInbox.class/class/enableSemanticSearch..st b/packages/SqueakInboxTalk.package/TalkInbox.class/class/enableSemanticSearch..st
@@ -2,6 +2,6 @@ preferences
 enableSemanticSearch: aBoolean
 
 	aBoolean ifTrue: [
-		TalkInboxBrowser ensureSemanticTextOrCancel ifNil: [^ self]].
+		TalkInboxBrowser ensureSemanticsPackageOrCancel ifNil: [^ self]].
 
 	EnableSemanticSearch := aBoolean.
diff --git a/packages/SqueakInboxTalk.package/TalkInbox.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkInbox.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"defaultMessageSignature" : "ct 6/1/2023 19:12",
 		"editMessageSignature" : "ct 6/3/2023 20:51",
 		"enableSemanticSearch" : "ct 8/26/2023 02:34",
-		"enableSemanticSearch:" : "ct 8/17/2023 20:19",
+		"enableSemanticSearch:" : "ct 8/27/2023 21:35",
 		"etoysDev" : "ct 6/3/2023 18:29",
 		"messageSignature" : "ct 6/1/2023 19:09",
 		"messageSignature:" : "ct 7/9/2021 19:15",

diff --git a/...ges/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st b/...ges/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st
@@ -0,0 +1,4 @@
+self-updating
+basicSelfUpdateMetacelloSpec: aString
+
+	SelfUpdateMetacelloSpec := Compiler evaluate: aString.
diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st
diff --git a/...es/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticsPackageOrCancel.st b/...es/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticsPackageOrCancel.st
@@ -0,0 +1,8 @@
+self-updating
+ensureSemanticsPackageOrCancel
+
+	(Smalltalk classNamed: #TalkSemanticConversationBrowserPlugin) ifNotNil: [:class | ^ class].
+	(self confirm: 'Install SemanticText?') ifFalse: [^ nil].
+
+	self basicSelfUpdateMetacelloSpec: {self selfUpdateMetacelloSpec. 'SqueakInboxTalkExtras-Semantic'}.
+	self selfUpdateFromMetacello.
diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateFromMetacello.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateFromMetacello.st
@@ -5,4 +5,4 @@ selfUpdateFromMetacello
 	metacello := self metacello.
 	project := metacello get.
 	project configuration installDependencies.
-	metacello load.
+	metacello load: self selfUpdateMetacelloSpec.
diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec..st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec..st
@@ -0,0 +1,7 @@
+self-updating
+selfUpdateMetacelloSpec: aString
+
+	self basicSelfUpdateMetacelloSpec: aString.
+
+	(Project uiManager confirm: 'Would you like to install updates now?' title: ('{1} self-update' format: {self appName}))
+		ifTrue: [self selfUpdate]
diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st
@@ -0,0 +1,8 @@
+self-updating
+selfUpdateMetacelloSpec
+	<preference: 'Squeak Inbox Talk self-update Metacello spec'
+		category: #'Squeak Inbox Talk'
+		description: 'The Metacello used for installing updates for Squeak Inbox Talk from the GitHub repository.'
+		type: #String>
+
+	^ (SelfUpdateMetacelloSpec ifNil: [#default]) storeString
diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/methodProperties.json
@@ -4,6 +4,7 @@
 		"appName" : "ct 5/20/2021 19:04",
 		"authorMailAddress" : "ct 5/26/2021 23:54",
 		"basicSelfUpdateBranch:" : "ct 11/25/2022 21:27",
+		"basicSelfUpdateMetacelloSpec:" : "ct 8/27/2023 21:36",
 		"cleanUp:" : "ct 11/25/2022 21:27",
 		"defaultFeedbackText" : "ct 7/24/2021 04:18",
 		"defaultInbox" : "ct 5/26/2021 23:41",
@@ -12,7 +13,7 @@
 		"defaultSelfUpdateBranch" : "ct 6/3/2023 20:00",
 		"defaultWindowColor" : "ct 5/8/2021 20:13",
 		"durationFromString:" : "ct 1/10/2023 18:21",
-		"ensureSemanticTextOrCancel" : "ct 8/26/2023 03:07",
+		"ensureSemanticsPackageOrCancel" : "ct 8/27/2023 21:37",
 		"githubNewIssueUrl" : "ct 5/26/2021 23:52",
 		"githubNewIssueUrlWithBody:" : "ct 5/26/2021 23:52",
 		"githubRepositoryParams" : "ct 5/26/2021 23:15",
@@ -45,10 +46,12 @@
 		"selfUpdate" : "ct 6/3/2023 19:45",
 		"selfUpdateBranch" : "ct 11/25/2022 21:17",
 		"selfUpdateBranch:" : "ct 11/25/2022 21:28",
-		"selfUpdateFromMetacello" : "ct 6/23/2023 00:31",
+		"selfUpdateFromMetacello" : "ct 8/27/2023 21:32",
 		"selfUpdateGitHubPath" : "ct 5/26/2021 23:15",
 		"selfUpdateGitRepository" : "ct 5/26/2021 23:15",
 		"selfUpdateGitRepositoryPattern" : "ct 5/26/2021 23:15",
+		"selfUpdateMetacelloSpec" : "ct 8/27/2023 21:31",
+		"selfUpdateMetacelloSpec:" : "ct 8/27/2023 21:37",
 		"selfUpdateRepositoryParams" : "ct 5/26/2021 20:56",
 		"sendFeedback" : "ct 7/14/2021 18:34",
 		"sendFeedbackGitHub" : "ct 6/15/2021 19:36",

diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/properties.json b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/properties.json
@@ -7,6 +7,7 @@
 		"InboxAgeForDanger",
 		"InboxAgeForWarning",
 		"SelfUpdateBranch",
+		"SelfUpdateMetacelloSpec",
 		"UseSimpleIcons" ],
 	"commentStamp" : "ct 7/24/2021 02:53",
 	"instvars" : [