remove list --assets flag (#34)

marwanhawari · Apr 2, 2024 · 612bece · 612bece
1 parent 0a27356
commit 612bece
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 34 deletions.
diff --git a/cmd/list.go b/cmd/list.go
@@ -7,7 +7,7 @@ import (
 )
 
 // List is executed when you run `stew list`
-func List(cliTagsFlag bool, cliAssetsFlag bool) {
+func List(cliTagsFlag bool) {
 
 	userOS, userArch, _, systemInfo, err := stew.Initialize()
 	stew.CatchAndExit(err)
@@ -26,12 +26,10 @@ func List(cliTagsFlag bool, cliAssetsFlag bool) {
 		case "other":
 			fmt.Println(pkg.URL)
 		case "github":
-			if !cliTagsFlag && !cliAssetsFlag {
-				fmt.Println(pkg.Owner + "/" + pkg.Repo)
-			} else if cliTagsFlag && !cliAssetsFlag {
+			if cliTagsFlag {
 				fmt.Println(pkg.Owner + "/" + pkg.Repo + "@" + pkg.Tag)
 			} else {
-				fmt.Println(pkg.Owner + "/" + pkg.Repo + "@" + pkg.Tag + "::" + pkg.Asset)
+				fmt.Println(pkg.Owner + "/" + pkg.Repo)
 			}
 		}
 	}

diff --git a/lib/stewfile.go b/lib/stewfile.go
@@ -111,7 +111,7 @@ func ReadStewLockFileContents(lockFilePath string) ([]string, error) {
 		case "other":
 			packages = append(packages, pkg.URL)
 		case "github":
-			path := fmt.Sprintf("%s/%s@%s::%s", pkg.Owner, pkg.Repo, pkg.Tag, pkg.Asset)
+			path := fmt.Sprintf("%s/%s@%s", pkg.Owner, pkg.Repo, pkg.Tag)
 			packages = append(packages, path)
 		}
 	}

diff --git a/lib/stewfile_test.go b/lib/stewfile_test.go
@@ -89,8 +89,8 @@ var testStewLockFileContents string = `{
 `
 
 var testStewLockFileSlice []string = []string{
-	"cli/[email protected]::gh_2.4.0_macOS_amd64.tar.gz",
-	"junegunn/[email protected]::fzf-0.29.0-darwin_arm64.zip",
+	"cli/[email protected]",
+	"junegunn/[email protected]",
 	"https://github.com/sharkdp/hyperfine/releases/download/v1.12.0/hyperfine-v1.12.0-x86_64-apple-darwin.tar.gz",
 }
 

diff --git a/lib/util.go b/lib/util.go
@@ -235,7 +235,7 @@ func ParseCLIInput(cliInput string) (CLIInput, error) {
 func parseGithubInput(cliInput string) (CLIInput, error) {
 	parsedInput := CLIInput{}
 	parsedInput.IsGithubInput = true
-	trimmedString := strings.Trim(strings.Trim(strings.Trim(strings.TrimSpace(cliInput), "/"), "@"), "::")
+	trimmedString := strings.Trim(strings.Trim(strings.TrimSpace(cliInput), "/"), "@")
 	splitInput := strings.SplitN(trimmedString, "@", 2)
 
 	ownerAndRepo := splitInput[0]
@@ -244,12 +244,7 @@ func parseGithubInput(cliInput string) (CLIInput, error) {
 	parsedInput.Repo = splitOwnerAndRepo[1]
 
 	if len(splitInput) == 2 {
-		tagAndAsset := splitInput[1]
-		splitTagAndAsset := strings.SplitN(tagAndAsset, "::", 2)
-		parsedInput.Tag = splitTagAndAsset[0]
-		if len(splitTagAndAsset) == 2 {
-			parsedInput.Asset = splitTagAndAsset[1]
-		}
+		parsedInput.Tag = splitInput[1]
 	}
 
 	return parsedInput, nil

diff --git a/lib/util_test.go b/lib/util_test.go
@@ -505,20 +505,6 @@ func Test_parseGithubInput(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "test3",
-			args: args{
-				cliInput: "marwanhawari/[email protected]::ppath-v0.0.3-linux-amd64.tar.gz",
-			},
-			want: CLIInput{
-				IsGithubInput: true,
-				Owner:         "marwanhawari",
-				Repo:          "ppath",
-				Tag:           "v0.0.3",
-				Asset:         "ppath-v0.0.3-linux-amd64.tar.gz",
-			},
-			wantErr: false,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/main.go b/main.go
@@ -89,13 +89,9 @@ func main() {
 						Name:  "tags",
 						Usage: "include the version tags",
 					},
-					&cli.BoolFlag{
-						Name:  "assets",
-						Usage: "include the assets and version tags",
-					},
 				},
 				Action: func(c *cli.Context) error {
-					cmd.List(c.Bool("tags"), c.Bool("assets"))
+					cmd.List(c.Bool("tags"))
 					return nil
 				},
 			},