From 01c466bae3e98a53366ae9ece76d2265867719ad Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Sun, 27 Aug 2023 21:39:20 +0200 Subject: [PATCH] update installation/update of semantics package --- .../instance/installDependencies.st | 10 +++++++++- .../instance/installSemanticText.st | 9 --------- .../methodProperties.json | 3 +-- .../TalkInbox.class/class/enableSemanticSearch..st | 2 +- .../TalkInbox.class/methodProperties.json | 2 +- .../class/basicSelfUpdateMetacelloSpec..st | 4 ++++ .../class/ensureSemanticTextOrCancel.st | 7 ------- .../class/ensureSemanticsPackageOrCancel.st | 8 ++++++++ .../class/selfUpdateFromMetacello.st | 2 +- .../class/selfUpdateMetacelloSpec..st | 7 +++++++ .../class/selfUpdateMetacelloSpec.st | 8 ++++++++ .../TalkInboxBrowser.class/methodProperties.json | 7 +++++-- .../TalkInboxBrowser.class/properties.json | 1 + 13 files changed, 46 insertions(+), 24 deletions(-) delete mode 100644 packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st create mode 100644 packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st delete mode 100644 packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st create mode 100644 packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticsPackageOrCancel.st create mode 100644 packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec..st create mode 100644 packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st diff --git a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installDependencies.st b/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installDependencies.st index df0c3db..f16fa0e 100644 --- a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installDependencies.st +++ b/packages/BaselineOfSqueakInboxTalk.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'. \ No newline at end of file + load: 'SqueakHistory'. + + (Smalltalk hasClassNamed: #TalkSemanticConversationBrowserPlugin) ifTrue: [ + self flag: #todo. "rename repo" + Metacello new + baseline: 'SemanticText'; + repository: 'github://LinqLover/squeak-chatgpt:main'; + get; + load]. \ No newline at end of file diff --git a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st b/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st deleted file mode 100644 index 2e64941..0000000 --- a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/instance/installSemanticText.st +++ /dev/null @@ -1,9 +0,0 @@ -self-updating -installSemanticText - - self flag: #todo. "rename repo" - Metacello new - baseline: 'ChatGPT'; - repository: 'github://LinqLover/squeak-chatgpt:main'; - get; - load. \ No newline at end of file diff --git a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/methodProperties.json b/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/methodProperties.json index b698aac..d69686f 100644 --- a/packages/BaselineOfSqueakInboxTalk.package/BaselineOfSqueakInboxTalk.class/methodProperties.json +++ b/packages/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 index c9e793f..072b3dc 100644 --- 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. \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInbox.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkInbox.class/methodProperties.json index 86a853b..504dae5 100644 --- 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/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st new file mode 100644 index 0000000..cd3ae1d --- /dev/null +++ b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/basicSelfUpdateMetacelloSpec..st @@ -0,0 +1,4 @@ +self-updating +basicSelfUpdateMetacelloSpec: aString + + SelfUpdateMetacelloSpec := Compiler evaluate: aString. \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st deleted file mode 100644 index fcf3626..0000000 --- a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticTextOrCancel.st +++ /dev/null @@ -1,7 +0,0 @@ -self-updating -ensureSemanticTextOrCancel - - (Smalltalk classNamed: #SemanticText) ifNotNil: [:class | ^ class]. - (self confirm: 'Install SemanticText?') ifFalse: [^ nil]. - self metacello installSemanticText. - ^ Smalltalk classNamed: #SemanticText \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticsPackageOrCancel.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/ensureSemanticsPackageOrCancel.st new file mode 100644 index 0000000..5658965 --- /dev/null +++ b/packages/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. \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateFromMetacello.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateFromMetacello.st index a6fc874..7d084e7 100644 --- 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. \ No newline at end of file + metacello load: self selfUpdateMetacelloSpec. \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec..st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec..st new file mode 100644 index 0000000..dad333b --- /dev/null +++ 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] \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st new file mode 100644 index 0000000..0ee4d7c --- /dev/null +++ b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/class/selfUpdateMetacelloSpec.st @@ -0,0 +1,8 @@ +self-updating +selfUpdateMetacelloSpec + + + ^ (SelfUpdateMetacelloSpec ifNil: [#default]) storeString \ No newline at end of file diff --git a/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/methodProperties.json b/packages/SqueakInboxTalk.package/TalkInboxBrowser.class/methodProperties.json index fd9b4f8..f07462c 100644 --- 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 index 05a943a..1ca5ad8 100644 --- 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" : [