Support to search a tool by the alias name (#223)

* Support to search a tool by the alias name

* Fix the wrong alias name parse

Author: LinuxSuRen

cmd/fetch.go

@@ -29,9 +29,10 @@ func newFetchCmd(context.Context) (cmd *cobra.Command) {
 }
 
 func (o *fetchOption) preRunE(_ *cobra.Command, _ []string) (err error) {
+	fetcher := &installer.DefaultFetcher{}
 	if o.reset {
 		var configDir string
-		if configDir, err = installer.GetConfigDir(); err == nil {
+		if configDir, err = fetcher.GetConfigDir(); err == nil {
 			if err = os.RemoveAll(configDir); err != nil {
 				err = fmt.Errorf("failed to remove directory: %s, error %v", configDir, err)
 				return
@@ -45,7 +46,8 @@ func (o *fetchOption) preRunE(_ *cobra.Command, _ []string) (err error) {
 }
 
 func (o *fetchOption) runE(cmd *cobra.Command, _ []string) (err error) {
-	return installer.FetchLatestRepo(o.Provider, o.branch, cmd.OutOrStdout())
+	fetcher := &installer.DefaultFetcher{}
+	return fetcher.FetchLatestRepo(o.Provider, o.branch, cmd.OutOrStdout())
 }
 
 type fetchOption struct {

cmd/fetch_test.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"context"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_newFetchCmd(t *testing.T) {
+	cmd := newFetchCmd(context.Background())
+	assert.Equal(t, "fetch", cmd.Name())
+
+	flags := []struct {
+		name      string
+		shorthand string
+	}{{
+		name:      "branch",
+		shorthand: "b",
+	}, {
+		name: "reset",
+	}}
+	for i := range flags {
+		tt := flags[i]
+		t.Run(tt.name, func(t *testing.T) {
+			flag := cmd.Flag(tt.name)
+			assert.NotNil(t, flag)
+			assert.NotEmpty(t, flag.Usage)
+			assert.Equal(t, tt.shorthand, flag.Shorthand)
+		})
+	}
+}

cmd/get.go

@@ -111,7 +111,8 @@ func (o *downloadOption) fetch() (err error) {
 
 	// fetch the latest config
 	fmt.Println("start to fetch the config")
-	if err = installer.FetchLatestRepo(o.Provider, installer.ConfigBranch, sysos.Stdout); err != nil {
+	fetcher := &installer.DefaultFetcher{}
+	if err = fetcher.FetchLatestRepo(o.Provider, installer.ConfigBranch, sysos.Stdout); err != nil {
 		err = fmt.Errorf("unable to fetch the latest config, error: %v", err)
 		return
 	}

cmd/get_test.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"context"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_newGetCmd(t *testing.T) {
+	cmd := newGetCmd(context.Background())
+	assert.Equal(t, "get", cmd.Name())
+
+	flags := []struct {
+		name      string
+		shorthand string
+	}{{
+		name:      "output",
+		shorthand: "o",
+	}, {
+		name: "pre",
+	}, {
+		name: "time",
+	}, {
+		name: "max-attempts",
+	}, {
+		name: "show-progress",
+	}, {
+		name: "continue-at",
+	}, {
+		name: "keep-part",
+	}, {
+		name: "os",
+	}, {
+		name: "arch",
+	}, {
+		name: "print-schema",
+	}, {
+		name: "print-version",
+	}, {
+		name: "print-categories",
+	}, {
+		name: "print-version-count",
+	}}
+	for i := range flags {
+		tt := flags[i]
+		t.Run(tt.name, func(t *testing.T) {
+			flag := cmd.Flag(tt.name)
+			assert.NotNil(t, flag)
+			assert.NotEmpty(t, flag.Usage)
+			assert.Equal(t, tt.shorthand, flag.Shorthand)
+		})
+	}
+}

cmd/install_test.go

@@ -0,0 +1,57 @@
+package cmd
+
+import (
+	"context"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_newInstallCmd(t *testing.T) {
+	cmd := newInstallCmd(context.Background())
+	assert.Equal(t, "install", cmd.Name())
+
+	flags := []struct {
+		name      string
+		shorthand string
+	}{{
+		name:      "category",
+		shorthand: "c",
+	}, {
+		name: "show-progress",
+	}, {
+		name: "accept-preRelease",
+	}, {
+		name: "pre",
+	}, {
+		name: "from-source",
+	}, {
+		name: "from-branch",
+	}, {
+		name: "goget",
+	}, {
+		name: "download",
+	}, {
+		name:      "force",
+		shorthand: "f",
+	}, {
+		name: "clean-package",
+	}, {
+		name:      "thread",
+		shorthand: "t",
+	}, {
+		name: "keep-part",
+	}, {
+		name: "os",
+	}, {
+		name: "arch",
+	}}
+	for i := range flags {
+		tt := flags[i]
+		t.Run(tt.name, func(t *testing.T) {
+			flag := cmd.Flag(tt.name)
+			assert.NotNil(t, flag)
+			assert.NotEmpty(t, flag.Usage)
+			assert.Equal(t, tt.shorthand, flag.Shorthand)
+		})
+	}
+}

cmd/root.go

@@ -23,7 +23,7 @@ func NewRoot(cxt context.Context) (cmd *cobra.Command) {
 	}
 
 	cmd.AddCommand(
-		newGetCmd(cxt), newInstallCmd(cxt), newFetchCmd(cxt), newSearchCmd(cxt), newTestCmd(), newSetupCommand(),
+		newGetCmd(cxt), newInstallCmd(cxt), newFetchCmd(cxt), newSearchCmd(cxt), newSetupCommand(),
 		extver.NewVersionCmd("linuxsuren", "http-downloader", "hd", nil),
 		extpkg.NewCompletionCmd(cmd))
 	return

cmd/root_test.go

@@ -0,0 +1,12 @@
+package cmd
+
+import (
+	"context"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewRoot(t *testing.T) {
+	cmd := NewRoot(context.Background())
+	assert.Equal(t, "hd", cmd.Name())
+}

cmd/search.go

@@ -8,9 +8,6 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	sysos "os"
-	"path"
-	"path/filepath"
-	"strings"
 )
 
 func newSearchCmd(context.Context) (cmd *cobra.Command) {
@@ -43,34 +40,25 @@ Thanks to https://github.com/hunshcn/gh-proxy`)
 }
 
 func (s *searchOption) runE(_ *cobra.Command, args []string) (err error) {
-	err = search(args[0])
+	err = search(args[0], s.Fetch, &installer.DefaultFetcher{})
 	return
 }
 
-func search(keyword string) (err error) {
-	if err = installer.FetchLatestRepo("", "", sysos.Stdout); err != nil {
-		return
+func search(keyword string, fetch bool, fetcher installer.Fetcher) (err error) {
+	if fetch {
+		if err = fetcher.FetchLatestRepo("", "", sysos.Stdout); err != nil {
+			return
+		}
 	}
 
 	var configDir string
-	if configDir, err = installer.GetConfigDir(); err != nil {
+	if configDir, err = fetcher.GetConfigDir(); err != nil {
 		return
 	}
 
-	var files []string
-	if files, err = filepath.Glob(path.Join(configDir, "config/**/*.yml")); err == nil {
-		for _, metaFile := range files {
-			ext := path.Ext(metaFile)
-			fileName := path.Base(metaFile)
-			org := path.Base(path.Dir(metaFile))
-			repo := strings.TrimSuffix(fileName, ext)
-
-			if !strings.Contains(repo, keyword) {
-				continue
-			}
-
-			fmt.Println(path.Join(org, repo))
-		}
+	result := installer.FindByKeyword(keyword, configDir)
+	for _, item := range result {
+		fmt.Println(item)
 	}
 	return
 }

cmd/search_test.go

@@ -0,0 +1,67 @@
+package cmd
+
+import (
+	"context"
+	"errors"
+	"github.com/linuxsuren/http-downloader/pkg/installer"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"path"
+	"testing"
+)
+
+func Test_search(t *testing.T) {
+	err := search("keyword", true, &installer.FakeFetcher{})
+	assert.Nil(t, err)
+
+	// expect an error with GetConfigDir
+	err = search("", true, &installer.FakeFetcher{GetConfigDirErr: errors.New("fake")})
+	assert.NotNil(t, err)
+
+	// expect an error with FetchLatestRepo
+	err = search("", true, &installer.FakeFetcher{FetchLatestRepoErr: errors.New("fake")})
+	assert.NotNil(t, err)
+
+	tempDir, err := os.MkdirTemp("", "config")
+	assert.Nil(t, err)
+	defer func() {
+		_ = os.RemoveAll(tempDir)
+	}()
+
+	configDir := path.Join(tempDir, "config")
+	orgDir := path.Join(configDir, "org")
+	err = os.MkdirAll(orgDir, 0755)
+	assert.Nil(t, err)
+	err = os.WriteFile(path.Join(orgDir, "repo.yml"), []byte("x=x"), os.ModeAppend)
+	assert.Nil(t, err)
+	err = os.WriteFile(path.Join(orgDir, "fake.yml"), []byte{}, os.ModeAppend)
+	assert.Nil(t, err)
+
+	err = search("repo", true, &installer.FakeFetcher{ConfigDir: tempDir})
+	assert.Nil(t, err)
+}
+
+func Test_newSearchCmd(t *testing.T) {
+	cmd := newSearchCmd(context.Background())
+	assert.Equal(t, "search", cmd.Name())
+
+	flags := []struct {
+		name      string
+		shorthand string
+	}{{
+		name: "fetch",
+	}, {
+		name: "provider",
+	}, {
+		name: "proxy-github",
+	}}
+	for i := range flags {
+		tt := flags[i]
+		t.Run(tt.name, func(t *testing.T) {
+			flag := cmd.Flag(tt.name)
+			assert.NotNil(t, flag)
+			assert.NotEmpty(t, flag.Usage)
+			assert.Equal(t, tt.shorthand, flag.Shorthand)
+		})
+	}
+}

cmd/setup_test.go

@@ -0,0 +1,11 @@
+package cmd
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func Test_newSetupCommand(t *testing.T) {
+	cmd := newSetupCommand()
+	assert.Equal(t, "setup", cmd.Name())
+}