Refactor runner

Author: ibuildthecloud

Makefile

@@ -1,3 +1,8 @@
-GO_TAGS ?= netgo
 build:
 	CGO_ENABLED=0 go build -o bin/gptscript -tags "${GO_TAGS}" -ldflags "-s -w" .
+
+test:
+	go test -v ./...
+
+ci: build
+	./bin/gptscript ./scripts/ci.gpt

README.md

@@ -57,7 +57,7 @@ arg: file: The filename to read
 
 #!/bin/bash
 
-cat ${ARG_FILE} </dev/null
+cat ${FILE} </dev/null
 ```
 #### From `./tables.gpt`
 ```
@@ -69,13 +69,13 @@ Arg: cmd: The sqlite command or sql statement to run.
 
 #!/bin/bash
 
-sqlite3 ${ARG_DATABASEFILE} -cmd "${ARG_CMD}" </dev/null
+sqlite3 ${DATABASEFILE} -cmd "${CMD}" </dev/null
 ```
 
 ## Additional Observations
 - The fields and code block are separated by a new line.
 - The arguments are indicated as `arg: argument_name: argument_description`.
-- The executable code is introduced with a `#!/bin/bash` shebang line and is expected to replace the argument placeholders (`${ARG_NAME}`) with actual values during execution.
+- The executable code is introduced with a `#!/bin/bash` shebang line and is expected to replace the argument placeholders (`${NAME}`) with actual values during execution.
 
 Please note that this description of the syntax is based on the provided examples and may not cover variations which are not included in those files. Additional GPT files may include diverse structures and should be reviewed to check for consistency with this syntax.
 

examples/describe.gpt

@@ -9,7 +9,7 @@ arg: list: A comma separated list of numbers to sort
 
 #!/bin/bash
 
-for i in $(echo "${ARG_LIST}" | sed 's/[[,\]]/ /g'); do
+for i in $(echo "${LIST}" | sed 's/[[,\]]/ /g'); do
     echo $i
 done | sort -n
 
@@ -28,7 +28,7 @@ arg: file: The filename to count the lines of
 
 #!/bin/bash
 
-wc -l "${ARG_FILE}"
+wc -l "${FILE}"
 
 ---
 name: summarize
@@ -46,4 +46,4 @@ arg: file: The filename to count the lines of
 
 #!/bin/bash
 
-cat "${ARG_FILE}" </dev/null
+cat "${FILE}" </dev/null

examples/echo.gpt

@@ -0,0 +1,2 @@
+# You can run this script with "gptscript echo.gpt --input 'Hello, World!'"
+echo "${input}"

examples/fib.gpt

@@ -0,0 +1,15 @@
+tools: myfunction
+What's the myfunction of 3
+
+---
+name: myfunction
+description: A function taking an integer as argument and returns an integer
+args: number: An integer
+tools: myfunction
+
+Do the following steps in strict sequence:
+Step 1. If ${number} is 0, skip the remaining steps and return 1
+Step 2. Calculate ${number} minus 1
+Step 3. Calculate myfunction of the result of Step 2
+Step 4. Multiply result of Step 3 with ${number}
+Step 5. Return the result of Step 4

examples/input.gpt

@@ -17,4 +17,4 @@ arg: file: The filename to read
 
 #!/bin/bash
 
-cat ${ARG_FILE} </dev/null
+cat ${FILE} </dev/null

examples/summarize-syntax.gpt

@@ -12,4 +12,4 @@ Arg: cmd: The sqlite command or sql statement to run.
 
 #!/bin/bash
 
-sqlite3 ${ARG_DATABASEFILE} -cmd "${ARG_CMD}" </dev/null
+sqlite3 ${DATABASEFILE} -cmd "${CMD}" </dev/null

examples/tables.gpt

@@ -4,12 +4,14 @@ go 1.21.5
 
 require (
 	github.com/acorn-io/baaah v0.0.0-20240119160309-2a58ee757bbd
-	github.com/acorn-io/cmd v0.0.0-20240101193821-66a32bc6b939
+	github.com/acorn-io/cmd v0.0.0-20240203032901-e9e631185ddb
 	github.com/adrg/xdg v0.4.0
+	github.com/hexops/autogold/v2 v2.1.0
 	github.com/pterm/pterm v0.12.76
 	github.com/sashabaranov/go-openai v1.18.3
+	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
+	github.com/stretchr/testify v1.8.4
 	golang.org/x/sync v0.5.0
 	golang.org/x/term v0.16.0
 )
@@ -20,29 +22,39 @@ require (
 	atomicgo.dev/schedule v0.1.0 // indirect
 	github.com/bombsimon/logrusr/v4 v4.0.0 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-containerregistry v0.16.1 // indirect
 	github.com/gookit/color v1.5.4 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
+	github.com/hexops/valast v1.4.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/nightlyone/lockfile v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/samber/lo v1.38.1 // indirect
 	github.com/samber/slog-logrus v1.0.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.16.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apimachinery v0.29.0 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
+	mvdan.cc/gofumpt v0.4.0 // indirect
 	sigs.k8s.io/controller-runtime v0.16.3 // indirect
 	sigs.k8s.io/controller-tools v0.12.0 // indirect
 )