bits and bobs

demos/git-lib.bass

@@ -3,6 +3,6 @@
 
 (defn main []
   (run
-    (from gh:cli
+    (from gh:image
       ($ gh --version)
       ($ ls git:github/vito/bass/ref/main/))))

docs/go/bass.go

@@ -8,7 +8,6 @@ import (
 	"image/color"
 	"io"
 	"os"
-	"os/signal"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -978,16 +977,13 @@ func newTerm() *vt100.VT100 {
 }
 
 func withProgress(ctx context.Context, name string, f func(context.Context) (bass.Value, error)) (bass.Value, *vt100.VT100) {
-	ctx, stop := signal.NotifyContext(ctx, os.Interrupt)
-	defer stop()
-
 	statuses, progW := progrock.Pipe()
 
 	recorder := progrock.NewRecorder(progW)
 	ctx = progrock.RecorderToContext(ctx, recorder)
 
 	vterm := newTerm()
-	model := ui.NewModel(stop, vterm, cli.ProgressUI, false)
+	model := ui.NewModel(func() {}, vterm, cli.ProgressUI, false)
 	model.SetWindowSize(200, 100)
 
 	wg := new(sync.WaitGroup)

hack/with-creds

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-op run --env-file $(dirname $0)/../creds.env "$@"
+op run --no-masking --env-file $(dirname $0)/../creds.env "$@"

pkg/bass/scope.go

@@ -219,7 +219,7 @@ func (value *Scope) eachShadow(top *Scope, f func(Symbol, Value) error, called m
 
 		err := f(k, v)
 		if err != nil {
-			return fmt.Errorf("%s: %w", k, err)
+			return fmt.Errorf("scope each: %s: %w", k, err)
 		}
 	}
 

pkg/hl/lexer.go

@@ -81,6 +81,11 @@ func bassRules() Rules {
 			words[i] = string(class.Bindings[i])
 		}
 
+		if len(words) == 0 {
+			// none; prevent zero-length match
+			continue
+		}
+
 		tokenType, found := class2chroma[class.Class]
 		if !found {
 			panic(fmt.Sprintf("unknown chroma token type for class: %s", class))

pkg/runtimes/bass.go

@@ -59,23 +59,6 @@ func (runtime *Bass) Run(ctx context.Context, w io.Writer, thunk bass.Thunk) err
 	return nil
 }
 
-func (runtime *Bass) Response(ctx context.Context, w io.Writer, thunk bass.Thunk) error {
-	_, response, err := runtime.run(ctx, thunk, true)
-	if err != nil {
-		return err
-	}
-
-	// XXX: this is a little strange since the other end just unmarshals it,
-	// but let's roll with it for now so we don't have to rehash the runtime
-	// interface
-	//
-	// the runtime interface just takes an io.Writer in case someday we want to
-	// handle direct responses (not JSON streams) - worth reconsidering at some
-	// point so this can just return an InMemorySource
-	_, err = w.Write(response)
-	return err
-}
-
 func (runtime *Bass) Load(ctx context.Context, thunk bass.Thunk) (*bass.Scope, error) {
 	module, _, err := runtime.run(ctx, thunk, false)
 	if err != nil {

pkg/runtimes/testdata/cache-paths.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def test-cache-path
   (subpath /test/counter/ (string->fs-path (str (now 0)))))
 

pkg/runtimes/testdata/dir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (next (read (-> (./cat 42)
                 (with-dir /bin/)
                 (with-image (linux/alpine)))

pkg/runtimes/testdata/env.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (next (read (-> ($ sh -c "echo $FOO")
                 (with-env {:FOO "42"})
                 (with-image (linux/alpine)))

pkg/runtimes/testdata/fs-paths.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def fs
   (mkfs ./foo "1\n"
         ./bar/baz "2\n"

pkg/runtimes/testdata/host-paths-sparse.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def cat-files
   (from (linux/alpine)
     ($ cat

pkg/runtimes/testdata/host-paths.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def thunk-arg
   (from (linux/alpine)
     ($ cat *dir*/host-paths/one)))

pkg/runtimes/testdata/many-layers-workdir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def many-layers
   (from (linux/alpine)
     ($ sh -c "echo 1 > a")

pkg/runtimes/testdata/memos.json

@@ -0,0 +1,32 @@
+{
+  "memo": {
+    "LR-ZTgqORmWVgYzlV0Tt74kKbUXf6h0bIph_heb-wHQ=:resolve": [
+      {
+        "input": [
+          {
+            "platform": {
+              "os": "linux"
+            },
+            "repository": "alpine",
+            "tag": "latest"
+          }
+        ],
+        "output": {
+          "digest": "sha256:4edbd2beb5f78b1014028f4fbb99f3237d9561100b6881aabbf5acce2c4f9454",
+          "platform": {
+            "os": "linux"
+          },
+          "repository": "alpine",
+          "tag": "latest"
+        }
+      }
+    ]
+  },
+  "thunks": {
+    "LR-ZTgqORmWVgYzlV0Tt74kKbUXf6h0bIph_heb-wHQ=": {
+      "cmd": {
+        "command": "run"
+      }
+    }
+  }
+}

pkg/runtimes/testdata/mount-run-dir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def created
   (from (linux/alpine)
     ($ mkdir ./some-dir/)

pkg/runtimes/testdata/mount.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def created
   (from (linux/alpine)
     ($ mkdir ./some-dir/)

pkg/runtimes/testdata/multi-env.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (let [echo-envs (-> ($ sh -c "echo $FOO $BAR")
                     (with-env {:FOO "42" :BAR "21"})
                     (with-image (linux/alpine)))

pkg/runtimes/testdata/oci-archive-image.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def hello
   (subpath
     (from (linux/alpine)

pkg/runtimes/testdata/read-path.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (defn echo [content]
   (-> ($ sh -c "echo \"$1\" > file" sh $content)
       (with-image (linux/alpine))

pkg/runtimes/testdata/recursive.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def create
   (from (linux/alpine)
     ($ sh -c "echo 42 > hello")))

pkg/runtimes/testdata/remount-workdir-subdir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def initial
   (subpath
     (from (linux/alpine)

pkg/runtimes/testdata/remount-workdir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def initial
   (-> ($ touch ./foo)
       (with-image (linux/alpine))

pkg/runtimes/testdata/response-file.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def values
   [null false true 42 "hello" [] [0 "one" -2] {} {:foo "bar"}])
 

pkg/runtimes/testdata/response-stdout.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def values
   [null false true 42 "hello" [] [0 "one" -2] {} {:foo "bar"}])
 

pkg/runtimes/testdata/run-thunk-path.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def hello
   (from (linux/alpine)
     ($ sh -c "echo \"#!/bin/sh\n\necho 42\n\" > some-script")

pkg/runtimes/testdata/secrets.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def bruce-banner
   (mask *env*:SECRET :bruce-banner))
 

pkg/runtimes/testdata/sleep.bass

@@ -1 +1,3 @@
+(def *memos* *dir*/memos.json)
+
 (run (-> ($ sleep "999") (with-label :now (now 1)) (with-image (linux/alpine))))

pkg/runtimes/testdata/succeeds.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 [(succeeds?
    (from (linux/alpine)
      ($ sh -c "exit 1")))

pkg/runtimes/testdata/thunk-path-dir-thunk-path-inputs.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def create-dir
   "mkdir some-dir; echo 1 > some-dir/some-file")
 

pkg/runtimes/testdata/thunk-path-dir.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def created
   (from (linux/alpine)
     ($ mkdir ./some-dir/)

pkg/runtimes/testdata/thunk-path-env.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def created
   (from (linux/alpine)
     ($ sh -c "echo \"#!/bin/sh\n\necho 42\n\" > some-script")

pkg/runtimes/testdata/thunk-path-image.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def test
   (from (linux/alpine)
     ($ sh -c "echo 42 > foo")

pkg/runtimes/testdata/thunk-paths.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def create-files
   "echo 42 > foo; mkdir some-dir; echo '\"hello\"' > some-dir/some-file")
 

pkg/runtimes/testdata/timestamps.bass

@@ -1,3 +1,5 @@
+(def *memos* *dir*/memos.json)
+
 (def touch
   (from (linux/alpine)
     ($ touch ./foo)

project.bass

@@ -69,7 +69,8 @@
   (defn zip [src zipname dir & files]
     (-> ($ zip (../ zipname) & $files)
         (with-image (deps+go src))
-        (with-dir dir)
+        (with-mount dir ./content/)
+        (with-dir ./content/)
         (subpath zipname)))
 
   ; runs a quick sanity check