------------------------------------------------------------
commit 77305387d3925db851dadfbc9fd0569793b9fc30
Author: Breck Yunits <breck7@gmail.com>
Date: Mon Sep 16 04:05:56 2024 -1000
diff --git a/package.json b/package.json
index 40a0f21..64af831 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"build": "scroll build",
"format": "scroll format",
"open": "open index.html",
- "up": "npm install scroll-cli@latest"
+ "up": "npm install scroll-cli@latest; npm install scrollsdk@latest"
},
"bin": {
"wws": "./wws.js"
@@ -34,8 +34,8 @@
"homepage": "https://wws.scroll.pub",
"dependencies": {
"minimist": "^1.2.8",
- "scroll-cli": "^130.5.0",
- "scrollsdk": "^84.0.0"
+ "scroll-cli": "^133.0.0",
+ "scrollsdk": "^87.0.0"
},
"devDependencies": {
"tap": "^18.7.2"
diff --git a/settings.parsers b/settings.parsers
index 480cd15..6586e3c 100644
--- a/settings.parsers
+++ b/settings.parsers
@@ -3,7 +3,7 @@ wwsSubfolderParser
extends abstractStringMeasureParser
description What is the name and URL to the source repo of a subfolder?
float sortIndex 1.3
- cells keywordCell anyCell urlCell
+ atoms keywordAtom anyAtom urlAtom
wwsSnippetsParser
crux snippets
diff --git a/wws.js b/wws.js
index 6f1506b..4c79f45 100755
--- a/wws.js
+++ b/wws.js
@@ -68,7 +68,7 @@ class WWSCli {
get _allCommands() {
return Object.getOwnPropertyNames(Object.getPrototypeOf(this))
- .filter(word => word.endsWith(this.CommandFnDecoratorSuffix))
+ .filter(atom => atom.endsWith(this.CommandFnDecoratorSuffix))
.sort()
}
@@ -204,9 +204,9 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
settingsParticle
.filter(particle => particle.getLine().startsWith("subfolder"))
.forEach(subfolder => {
- const subfolderName = sanitizeFolderName(subfolder.words[1])
+ const subfolderName = sanitizeFolderName(subfolder.atoms[1])
const subfolderPath = path.join(rootFolder, subfolderName)
- const sourceRepo = subfolder.words[2]
+ const sourceRepo = subfolder.atoms[2]
console.log(`Updating subfolder '${subfolderName}'`)
if (!Disk.exists(subfolderPath)) {
Disk.mkdir(subfolderPath)
------------------------------------------------------------
commit 47b0c5fd8a52218c73fdefec7a67f99c75cc518a
Author: Breck Yunits <breck7@gmail.com>
Date: Sat Sep 14 12:43:40 2024 -1000
diff --git a/root.scroll b/root.scroll
index a25970d..9930e25 100644
--- a/root.scroll
+++ b/root.scroll
@@ -88,3 +88,14 @@ registered 6/12/2024
expires 6/12/2034
rep Breck Yunits
transactionId pm_1PQxCOJktJxKl0r5l24p6Zwu
+
+folder zombo
+description You can do anything.
+www https://zombo.breckyunits.com
+source https://github.com/breck7/zombo
+editor Breck Yunits
+ email breck7@gmail.com
+registered 9/14/2024
+expires 9/14/2034
+rep Breck Yunits
+transactionId pm_1Pz4fFJktJxKl0r537cx4sCs
\ No newline at end of file
------------------------------------------------------------
commit b7b2524da567eb795511e02b0abdd0b4d172a5cf
Author: Breck Yunits <breck7@gmail.com>
Date: Fri Sep 13 17:35:09 2024 -1000
diff --git a/package.json b/package.json
index 1df43b0..40a0f21 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"homepage": "https://wws.scroll.pub",
"dependencies": {
"minimist": "^1.2.8",
- "scroll-cli": "^130.4.1",
+ "scroll-cli": "^130.5.0",
"scrollsdk": "^84.0.0"
},
"devDependencies": {
------------------------------------------------------------
commit f49495947813bb32a83f82e8d8ee68783eb3a432
Author: Breck Yunits <breck7@gmail.com>
Date: Fri Sep 13 05:10:36 2024 -1000
diff --git a/clientInstall.scroll b/clientInstall.scroll
index 13305ed..5a03290 100644
--- a/clientInstall.scroll
+++ b/clientInstall.scroll
@@ -1,6 +1,12 @@
importOnly
# WWS command line client one-liner install
+
+From npm:
+code
+ sudo npm install -g @breck/wws
+
+From source:
code
git clone https://github.com/breck7/wws && cd wws && npm install --omit=dev && sudo npm install --omit=dev -g . && wws
------------------------------------------------------------
commit 9aa6cfa93a3645d43138b7b0fb1becd620311bb0
Author: Breck Yunits <breck7@gmail.com>
Date: Fri Sep 13 05:08:58 2024 -1000
diff --git a/package.json b/package.json
index a94e392..1df43b0 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "wws",
+ "name": "@breck/wws",
"version": "0.11.0",
"description": "The World Wide Scroll",
"main": "wws.js",
------------------------------------------------------------
commit 8ca8840b08c3e182577d44b73c064f6d7f37f709
Author: Breck Yunits <breck7@gmail.com>
Date: Thu Sep 12 19:11:02 2024 -1000
diff --git a/package.json b/package.json
index e4ec474..a94e392 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"homepage": "https://wws.scroll.pub",
"dependencies": {
"minimist": "^1.2.8",
- "scroll-cli": "^130.3.6",
+ "scroll-cli": "^130.4.1",
"scrollsdk": "^84.0.0"
},
"devDependencies": {
------------------------------------------------------------
commit e7f7595344dc738108a7ec8b4384a59a8f0184e1
Author: Breck Yunits <breck7@gmail.com>
Date: Thu Sep 12 16:39:23 2024 -1000
diff --git a/wws.js b/wws.js
index 4ce3571..6f1506b 100755
--- a/wws.js
+++ b/wws.js
@@ -91,26 +91,16 @@ class WWSCli {
async buildIndexPage() {
const { wwsDir } = this
const indexFile = path.join(wwsDir, "index.scroll")
- const content = `title Your Copy of the World Wide Scroll
+ const content = `title The World Wide Scroll
metaTags
gazetteCss
printTitle
buildHtml
-WWS version ${WWS_VERSION}
- https://wws.scroll.pub
- style text-align:center;
-
-import ../header.scroll
-
-thinColumns 1
-
-code
- ${wwsDir}
-
-endColumns
+center
+Your copy of the WWS is stored in \`${wwsDir}\`. ${this.fetchedFolders.length}/${this.folders.length} folders fetched. WWS version: ${WWS_VERSION}.
-thinColumns
+../header.scroll
wwsSnippetsParser
extends printSnippetsParser
@@ -122,6 +112,7 @@ wwsSnippetsParser
return super.makeSnippet(file, compileSettings).replace('<h1 class="scrollTitle">', '<h1 class="scrollTitle"><a href="' + folderName + '/index.html" style="color: gray;">~' + folderName + '</a><br>')
}
+thinColumns
snippets ${this.fetchedFolders
.map(concept => {
const settings = this.getFolderSettings(concept.folder)
@@ -132,20 +123,15 @@ snippets ${this.fetchedFolders
.filter(i => i)
.join(" ")}
limit 5
-
endColumns
-thinColumns 1
-
-# Fetched
+thinColumn
+# Fetched (${this.fetchedFolders.length})
${this.fetchedFolders.map(concept => `- ${concept.folder}\n link ${concept.folder}/index.html`).join("\n")}
-
-# Unfetched
+# Unfetched (${this.unfetchedFolders.length})
expander
${this.unfetchedFolders.map(concept => `- ${concept.folder}`).join("\n")}
-endColumns
-
center
viewSourceButton
scrollVersionLink
@@ -237,6 +223,11 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
this.buildIndexPage()
}
+ buildCommand() {
+ this.init()
+ this.buildIndexPage()
+ }
+
openCommand() {
// Trigger the terminal to run "open index.html", opening the users web browser:
this.init()
------------------------------------------------------------
commit 172a006b0ba25253cdd72a85a5a805ac32be8e74
Author: Breck Yunits <breck7@gmail.com>
Date: Thu Sep 12 10:24:55 2024 -1000
diff --git a/wws.js b/wws.js
index e4dd2e1..4ce3571 100755
--- a/wws.js
+++ b/wws.js
@@ -91,7 +91,7 @@ class WWSCli {
async buildIndexPage() {
const { wwsDir } = this
const indexFile = path.join(wwsDir, "index.scroll")
- const content = `title Your World Wide Scroll
+ const content = `title Your Copy of the World Wide Scroll
metaTags
gazetteCss
printTitle
------------------------------------------------------------
commit 8e38a48002ecd840b68532b7f1c4d51ef91dc5e8
Author: Breck Yunits <breck7@gmail.com>
Date: Thu Sep 12 10:24:07 2024 -1000
diff --git a/package.json b/package.json
index bede7c1..e4ec474 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wws",
- "version": "0.10.0",
+ "version": "0.11.0",
"description": "The World Wide Scroll",
"main": "wws.js",
"engines": {
diff --git a/releaseNotes.scroll b/releaseNotes.scroll
index 2978776..6e6d66a 100644
--- a/releaseNotes.scroll
+++ b/releaseNotes.scroll
@@ -6,18 +6,24 @@ header.scroll
printTitle
## A list of what has changed in WWS releases.
-thinColumns 1
+thinColumn
Download as CSV | TSV | JSON
link releaseNotes.csv CSV
link releaseNotes.tsv TSV
link releaseNotes.json JSON
-endColumns
-<br>
+
+br
node_modules/scroll-cli/microlangs/changes.parsers
thinColumns
+📦 0.11.0 9/12/2024
+🏥 bug fixes
+
+📦 0.10.0 9/6/2024
+🏥 upgrade scroll
+
📦 0.9.0 7/11/2024
🎉 added descriptions to folders (max 7 words)
🎉 nicer `wws list` output
------------------------------------------------------------
commit 8ddde26af6840cefcc17ece05b7c34e1ba8cf320
Author: Breck Yunits <breck7@gmail.com>
Date: Thu Sep 12 10:17:56 2024 -1000
diff --git a/clientInstall.scroll b/clientInstall.scroll
index c41b49a..13305ed 100644
--- a/clientInstall.scroll
+++ b/clientInstall.scroll
@@ -1,15 +1,16 @@
importOnly
-# Install the WWS client
+# WWS command line client one-liner install
code
- git clone https://github.com/breck7/wws
- cd wws
- npm install --omit=dev
- npm install --omit=dev -g .
- wws list
- # Fetch a few sites:
- wws fetch scroll breck pldb
- wws open
+ git clone https://github.com/breck7/wws && cd wws && npm install --omit=dev && sudo npm install --omit=dev -g . && wws
+
+# Fetch sites and open
+code
+ wws fetch scroll breck pldb && wws open
+
+# Uninstalling
+code
+ sudo npm uninstall -g wws
The WWS client currently requires Node.js. More clients coming soon.
https://nodejs.org/en Node.js
diff --git a/wws.js b/wws.js
index ac3b838..e4dd2e1 100755
--- a/wws.js
+++ b/wws.js
@@ -124,10 +124,10 @@ wwsSnippetsParser
snippets ${this.fetchedFolders
.map(concept => {
- const settings = this.getFolderSettings(concept.id)
+ const settings = this.getFolderSettings(concept.folder)
const snippets = settings.get("snippets")
if (!snippets) return ""
- return concept.id + "/" + snippets
+ return concept.folder + "/" + snippets
})
.filter(i => i)
.join(" ")}
@@ -138,11 +138,11 @@ endColumns
thinColumns 1
# Fetched
-${this.fetchedFolders.map(concept => `- ${concept.id}\n link ${concept.id}/index.html`).join("\n")}
+${this.fetchedFolders.map(concept => `- ${concept.folder}\n link ${concept.folder}/index.html`).join("\n")}
# Unfetched
expander
-${this.unfetchedFolders.map(concept => `- ${concept.id}`).join("\n")}
+${this.unfetchedFolders.map(concept => `- ${concept.folder}`).join("\n")}
endColumns
@@ -160,7 +160,7 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
const rootFilePath = path.join(__dirname, "root.scroll")
const wws = new ScrollFile(Disk.read(rootFilePath), rootFilePath, scrollFs)
const { concepts } = wws
- concepts.forEach(concept => (concept.fetched = Disk.exists(path.join(wwsDir, concept.id))))
+ concepts.forEach(concept => (concept.fetched = Disk.exists(path.join(wwsDir, concept.folder))))
return concepts
}
@@ -175,10 +175,10 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
listCommand() {
const table = new Particle(
this.folders.map(concept => {
- const { fetched, id, description } = concept
+ const { fetched, folder, description } = concept
return {
" ": fetched ? "🟩" : "⬜️",
- Folder: id,
+ Folder: folder,
Description: description
}
})
@@ -199,10 +199,10 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
fetchScroll(folderName) {
const { wwsDir } = this
- const folder = this.folders.find(concept => concept.id === folderName)
+ const folder = this.folders.find(concept => concept.folder === folderName)
if (!folder) return this.log(`\n👎 No folder '${folderName}' found.`)
// mkdir the folder if it doesn't exist:
- const rootFolder = path.join(wwsDir, folder.id)
+ const rootFolder = path.join(wwsDir, folder.folder)
const gitSource = folder.source
if (!Disk.exists(rootFolder)) {
this.log(`Fetching ${folderName}`)
@@ -214,7 +214,7 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
this.log(`Updating ${folderName}`)
require("child_process").execSync(`cd ${rootFolder} && git pull origin wws`)
}
- const settingsParticle = this.getFolderSettings(folder.id)
+ const settingsParticle = this.getFolderSettings(folder.folder)
settingsParticle
.filter(particle => particle.getLine().startsWith("subfolder"))
.forEach(subfolder => {
@@ -232,7 +232,7 @@ viewSourceUrl https://github.com/breck7/wws/blob/main/wws.js
fetchCommand(folderNames) {
this.init()
const { wwsDir, fetchedFolders } = this
- if (!folderNames.length) fetchedFolders.forEach(concept => this.fetchScroll(concept.id))
+ if (!folderNames.length) fetchedFolders.forEach(concept => this.fetchScroll(concept.folder))
else folderNames.forEach(folderName => this.fetchScroll(folderName))
this.buildIndexPage()
}