Fix the install with category name when no config found (#192)

* Fix the install with category name when no config found

* Add codecov config file

Author: LinuxSuRen

README.md

@@ -42,10 +42,16 @@ hd get --pre ks
 ## Install
 You can also install a package from GitHub:
 
-```
+```shell
 hd install jenkins-zh/jenkins-cli/jcli -t 6
 ```
 
+or install by a category name:
+
+```shell
+hd install --category security
+```
+
 ## Search
 hd can download or install via the format of `$org/$repo`. If you find that it's not working. It might because of there's 
 no record in [hd-home](https://github.com/LinuxSuRen/hd-home). You're welcome to help us to maintain it.

cmd/get.go

@@ -10,6 +10,7 @@ import (
 	"gopkg.in/yaml.v2"
 	"net/http"
 	"net/url"
+	sysos "os"
 	"path"
 	"runtime"
 	"strings"
@@ -53,6 +54,8 @@ func newGetCmd(ctx context.Context) (cmd *cobra.Command) {
 		"Print the schema of HDConfig if the flag is true without other function")
 	flags.BoolVarP(&opt.PrintVersion, "print-version", "", false,
 		"Print the version list")
+	flags.BoolVarP(&opt.PrintCategories, "print-categories", "", false,
+		"Print the category list")
 	flags.IntVarP(&opt.PrintVersionCount, "print-version-count", "", 20,
 		"The number of the version list")
 
@@ -84,6 +87,7 @@ type downloadOption struct {
 	PrintSchema       bool
 	PrintVersion      bool
 	PrintVersionCount int
+	PrintCategories   bool
 
 	// inner fields
 	name    string
@@ -100,12 +104,35 @@ const (
 	ProviderGitee = "gitee"
 )
 
+func (o *downloadOption) fetch() (err error) {
+	if !o.Fetch {
+		return
+	}
+
+	// fetch the latest config
+	fmt.Println("start to fetch the config")
+	if err = installer.FetchLatestRepo(o.Provider, installer.ConfigBranch, sysos.Stdout); err != nil {
+		err = fmt.Errorf("unable to fetch the latest config, error: %v", err)
+		return
+	}
+	o.Fetch = false
+	return
+}
+
 func (o *downloadOption) preRunE(cmd *cobra.Command, args []string) (err error) {
 	// this might not be the best way to print schema
 	if o.PrintSchema {
 		return
 	}
 
+	if err = o.fetch(); err != nil {
+		return
+	}
+
+	if o.PrintCategories {
+		return
+	}
+
 	o.Tar = true
 	if len(args) <= 0 {
 		return fmt.Errorf("no URL provided")
@@ -177,6 +204,11 @@ func (o *downloadOption) runE(cmd *cobra.Command, args []string) (err error) {
 		return
 	}
 
+	if o.PrintCategories {
+		cmd.Println(installer.FindCategories())
+		return
+	}
+
 	cmd.Printf("start to download from %s\n", o.URL)
 	if o.Thread <= 1 {
 		err = pkg.DownloadWithContinue(o.URL, o.Output, o.ContinueAt, -1, 0, o.ShowProgress)

cmd/install.go

@@ -35,7 +35,7 @@ Cannot find your desired package? Please run command: hd fetch --reset, then try
 
 	flags := cmd.Flags()
 	opt.addFlags(flags)
-	flags.StringVarP(&opt.Category, "category", "", "",
+	flags.StringVarP(&opt.Category, "category", "c", "",
 		"The category of the potentials packages")
 	flags.BoolVarP(&opt.ShowProgress, "show-progress", "", true, "If show the progress of download")
 	flags.BoolVarP(&opt.AcceptPreRelease, "accept-preRelease", "", false,
@@ -100,14 +100,20 @@ func (o *installOption) preRunE(cmd *cobra.Command, args []string) (err error) {
 
 	// try to find if it's a native package
 	o.nativePackage = os.HasPackage(o.tool)
-	if !o.nativePackage && o.Category == "" {
-		err = o.downloadOption.preRunE(cmd, args)
-
-		// try to find the real tool name
-		if o.downloadOption.Package.TargetBinary != "" {
-			o.tool = o.downloadOption.Package.TargetBinary
-		} else if o.downloadOption.Package.Binary != "" {
-			o.tool = o.downloadOption.Package.Binary
+	if !o.nativePackage {
+		if o.Category == "" {
+			err = o.downloadOption.preRunE(cmd, args)
+
+			// try to find the real tool name
+			if o.downloadOption.Package.TargetBinary != "" {
+				o.tool = o.downloadOption.Package.TargetBinary
+			} else if o.downloadOption.Package.Binary != "" {
+				o.tool = o.downloadOption.Package.Binary
+			} else {
+				o.tool = o.downloadOption.Package.Repo
+			}
+		} else {
+			err = o.downloadOption.fetch()
 		}
 	}
 	return
@@ -195,7 +201,6 @@ func (o *installOption) runE(cmd *cobra.Command, args []string) (err error) {
 		}
 
 		for _, item := range choose {
-			o.tool = item
 			if err = o.downloadOption.preRunE(cmd, []string{item}); err != nil {
 				return
 			}
@@ -205,6 +210,8 @@ func (o *installOption) runE(cmd *cobra.Command, args []string) (err error) {
 				o.tool = o.downloadOption.Package.TargetBinary
 			} else if o.downloadOption.Package.Binary != "" {
 				o.tool = o.downloadOption.Package.Binary
+			} else {
+				o.tool = o.downloadOption.Package.Repo
 			}
 
 			if err = o.install(cmd, []string{item}); err != nil {

codecov.yml

@@ -0,0 +1,12 @@
+# https://docs.codecov.com/docs/commit-status
+# it's hard to have a coverage for some code lines
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+        threshold: 0.1%
+    patch:
+      default:
+        target: auto
+        threshold: 0%

pkg/compress/bzip2.go

@@ -41,7 +41,7 @@ func (x *Bzip2) ExtractFiles(sourceFile, targetName string) (err error) {
 
 	var targetFile *os.File
 	if targetFile, err = os.OpenFile(fmt.Sprintf("%s/%s", filepath.Dir(sourceFile), targetName),
-		os.O_CREATE|os.O_RDWR, 0744); err != nil {
+		os.O_CREATE|os.O_RDWR, 0600); err != nil {
 		return
 	}
 	if _, err = io.Copy(targetFile, r); err != nil {

pkg/installer/check.go

@@ -141,14 +141,6 @@ func (o *Installer) GetVersion(path string) (version string, err error) {
 // ProviderURLParse parse the URL
 func (o *Installer) ProviderURLParse(path string, acceptPreRelease bool) (packageURL string, err error) {
 	packageURL = path
-	if o.Fetch {
-		// fetch the latest config
-		fmt.Println("start to fetch the config")
-		if err = FetchLatestRepo(o.Provider, ConfigBranch, sysos.Stdout); err != nil {
-			err = fmt.Errorf("unable to fetch the latest config, error: %v", err)
-			return
-		}
-	}
 
 	version, err := o.GetVersion(packageURL)
 	if err != nil {
@@ -185,6 +177,8 @@ func (o *Installer) ProviderURLParse(path string, acceptPreRelease bool) (packag
 					AdditionBinaries: cfg.AdditionBinaries,
 					VersionNum:       strings.TrimPrefix(version, "v"),
 				}
+				cfg.Org = o.Org
+				cfg.Repo = o.Repo
 				o.Package = &cfg
 				o.AdditionBinaries = cfg.AdditionBinaries
 				o.Tar = cfg.Tar != "false"
@@ -394,6 +388,31 @@ func hasPackageSuffix(packageURL string) bool {
 	return compress.IsSupport(path.Ext(packageURL))
 }
 
+// FindCategories returns the whole supported categories
+func FindCategories() (result []string) {
+	categories := make(map[string]string, 0)
+	configDir := sysos.ExpandEnv("$HOME/.config/hd-home/config/")
+	_ = filepath.Walk(configDir, func(basepath string, info fs.FileInfo, err error) error {
+		if !strings.HasSuffix(basepath, ".yml") {
+			return nil
+		}
+
+		if data, err := ioutil.ReadFile(basepath); err == nil {
+			hdCfg := &HDConfig{}
+			if err := yaml.Unmarshal(data, hdCfg); err == nil {
+				for _, category := range hdCfg.Categories {
+					categories[category] = ""
+				}
+			}
+		}
+		return nil
+	})
+	for key := range categories {
+		result = append(result, key)
+	}
+	return
+}
+
 // FindPackagesByCategory returns the HDConfigs by category
 func FindPackagesByCategory(category string) (result []HDConfig) {
 	configDir := sysos.ExpandEnv("$HOME/.config/hd-home/config/")