Merge pull request #345 from topfreegames/fix_cli

Fix cli install
topfreegames · Sep 13, 2023 · a113d7e · a113d7e
2 parents 2ef50f2 + 1855104
commit a113d7e
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 1,054 deletions.
diff --git a/go.work b/go.work
@@ -2,6 +2,6 @@ go 1.20
 
 use (
 	.
-	./cli
+	./pitaya-cli
 	./xk6-pitaya
 )
diff --git a/go.work.sum b/go.work.sum
diff --git a/cli/LICENSE → pitaya-cli/LICENSE b/cli/LICENSE → pitaya-cli/LICENSE
diff --git a/cli/Makefile → pitaya-cli/Makefile b/cli/Makefile → pitaya-cli/Makefile
diff --git a/cli/README.md → pitaya-cli/README.md b/cli/README.md → pitaya-cli/README.md
diff --git a/cli/commands.go → pitaya-cli/commands.go b/cli/commands.go → pitaya-cli/commands.go
diff --git a/cli/file.go → pitaya-cli/file.go b/cli/file.go → pitaya-cli/file.go
diff --git a/cli/go.mod → pitaya-cli/go.mod b/cli/go.mod → pitaya-cli/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/abiosoft/ishell/v2 v2.0.2
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/sirupsen/logrus v1.9.2
-	github.com/topfreegames/pitaya/v2 v2.5.0
+	github.com/topfreegames/pitaya/v2 v2.7.1
 )
 
 require (
@@ -16,6 +16,7 @@ require (
 	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bitly/go-simplejson v0.5.0 // indirect
+	github.com/bufbuild/protocompile v0.4.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -43,8 +44,7 @@ require (
 	github.com/nats-io/nkeys v0.4.4 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.15.1 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
@@ -64,15 +64,14 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.54.1 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/cli/go.sum → pitaya-cli/go.sum b/cli/go.sum → pitaya-cli/go.sum
diff --git a/cli/helpers.go → pitaya-cli/helpers.go b/cli/helpers.go → pitaya-cli/helpers.go
diff --git a/cli/log.go → pitaya-cli/log.go b/cli/log.go → pitaya-cli/log.go
diff --git a/cli/main.go → pitaya-cli/main.go b/cli/main.go → pitaya-cli/main.go
diff --git a/cli/shell.go → pitaya-cli/shell.go b/cli/shell.go → pitaya-cli/shell.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,6 @@ go 1.20 @@
     use (
     	.
-    	./cli
+    	./pitaya-cli
     	./xk6-pitaya
     )