Merge pull request #54 from grafana/support-archive-in-cli

support archive in cli

Author: pablochacin

cmd/cmd.go

@@ -75,7 +75,15 @@ func New() *cobra.Command {
 
 func deps(opts *options, args []string) error {
 	if len(args) > 0 {
-		opts.Script.Name = args[0]
+		filename := args[0]
+		switch filepath.Ext(filename) {
+		case ".js":
+			opts.Script.Name = filename
+		case ".tar":
+			opts.Archive.Name = filename
+		default:
+			return fmt.Errorf("unsupported file extension: %s", filepath.Ext(filename))
+		}
 	}
 
 	var out io.Writer

cmd/cmd_test.go

@@ -14,43 +14,53 @@ func Test_New(t *testing.T) {
 	t.Parallel()
 
 	root := cmd.New()
-
 	require.Equal(t, "k6deps [flags] [script-file]", root.Use)
 
 	dir := t.TempDir()
 
 	scriptfile := filepath.Join("testdata", "script.js")
+	archive := filepath.Join("testdata", "archive.tar")
+
 	out := filepath.Clean(filepath.Join(dir, "output"))
 
+	root = cmd.New()
 	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "-o", out, scriptfile})
-
 	err := root.Execute()
 	require.NoError(t, err)
 
 	contents, err := os.ReadFile(out)
 	require.NoError(t, err)
 	require.Equal(t, `{"k6/x/faker":">v0.3.0","xk6-top":"*"}`+"\n", string(contents))
 
-	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "--format", "json", "-o", out, scriptfile})
+	root = cmd.New()
+	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "-o", out, archive})
+	err = root.Execute()
+	require.NoError(t, err)
 
+	contents, err = os.ReadFile(out)
+	require.NoError(t, err)
+	require.Equal(t, `{"k6":">0.54","k6/x/faker":">0.4.0","k6/x/sql":">=1.0.1","k6/x/sql/driver/ramsql":"*"}`+"\n", string(contents))
+
+	root = cmd.New()
+	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "--format", "json", "-o", out, scriptfile})
 	err = root.Execute()
 	require.NoError(t, err)
 
 	contents, err = os.ReadFile(out)
 	require.NoError(t, err)
 	require.Equal(t, `{"k6/x/faker":">v0.3.0","xk6-top":"*"}`+"\n", string(contents))
 
+	root = cmd.New()
 	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "--format", "text", "-o", out, scriptfile})
-
 	err = root.Execute()
 	require.NoError(t, err)
 
 	contents, err = os.ReadFile(out)
 	require.NoError(t, err)
 	require.Equal(t, `k6/x/faker>v0.3.0;xk6-top*`+"\n", string(contents))
 
+	root = cmd.New()
 	root.SetArgs([]string{"--ingnore-env", "--ignore-manifest", "--format", "js", "-o", out, scriptfile})
-
 	err = root.Execute()
 	require.NoError(t, err)