Added tests for lib install with flags

Author: vinay-lanka

arduino/libraries/librariesmanager/install.go

@@ -98,19 +98,10 @@ func (lm *LibrariesManager) InstallZipLib(libPath string) error {
 	if libsDir == nil {
 		return fmt.Errorf("User directory not set")
 	}
-	err := Unzip(libPath, libsDir.String())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-//Unzip takes the ZipLibPath and Extracts it to LibsDir
-func Unzip(src string, dest string) error {
 
 	var filenames []string
 
-	r, err := zip.OpenReader(src)
+	r, err := zip.OpenReader(libPath)
 	if err != nil {
 		return err
 	}
@@ -119,10 +110,10 @@ func Unzip(src string, dest string) error {
 	for _, f := range r.File {
 
 		// Store filename/path for returning and using later on
-		fpath := filepath.Join(dest, f.Name)
+		fpath := filepath.Join(libsDir.String(), f.Name)
 
-		// Check for ZipSlip. More Info: http://bit.ly/2MsjAWE
-		if !strings.HasPrefix(fpath, filepath.Clean(dest)+string(os.PathSeparator)) {
+		// Check for ZipSlip.
+		if !strings.HasPrefix(fpath, filepath.Clean(libsDir.String())+string(os.PathSeparator)) {
 			return fmt.Errorf("%s: illegal file path", fpath)
 		}
 
@@ -163,24 +154,18 @@ func Unzip(src string, dest string) error {
 }
 
 //InstallGitLib  installs a library hosted on a git repository on the specified path.
-func (lm *LibrariesManager) InstallGitLib(Name string, gitURL string) error {
+func (lm *LibrariesManager) InstallGitLib(url string) error {
 	libsDir := lm.getUserLibrariesDir()
 	if libsDir == nil {
 		return fmt.Errorf("User directory not set")
 	}
-	err := Fetch(Name, gitURL, libsDir.String())
-	if err != nil {
-		return err
-	}
-	return nil
-}
+	i := strings.LastIndex(url, "/")
+	folder := strings.TrimRight(url[i+1:], ".git")
+	path := libsDir.String() + "/" + folder
 
-//Fetch Clones the repository to LibsDir
-func Fetch(name string, url string, dest string) error {
-	directory := dest + "/" + name
-	_, err := git.PlainClone(directory, false, &git.CloneOptions{
-		URL:               url,
-		RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
+	_, err := git.PlainClone(path, false, &git.CloneOptions{
+		URL:      url,
+		Progress: os.Stdout,
 	})
 	if err != nil {
 		return err

cli/lib/install.go

@@ -36,7 +36,7 @@ func initInstallCommand() *cobra.Command {
 		Example: "" +
 			"  " + os.Args[0] + " lib install AudioZero       # for the latest version.\n" +
 			"  " + os.Args[0] + " lib install AudioZero@1.0.0 # for the specific version.",
-		Args: cobra.MinimumNArgs(1),
+		Args: cobra.MinimumNArgs(0),
 		Run:  runInstallCommand,
 	}
 	installCommand.Flags().BoolVar(&installFlags.noDeps, "no-deps", false, "Do not install dependencies.")
@@ -54,27 +54,30 @@ var installFlags struct {
 func runInstallCommand(cmd *cobra.Command, args []string) {
 	instance := instance.CreateInstanceIgnorePlatformIndexErrors()
 	if installFlags.zipPath != "" {
-		ZiplibraryInstallReq := &rpc.ZipLibraryInstallReq{
+		ziplibraryInstallReq := &rpc.ZipLibraryInstallReq{
 			Instance: instance,
 			Path:     installFlags.zipPath,
 		}
-		_, err := lib.ZipLibraryInstall(context.Background(), ZiplibraryInstallReq)
+		_, err := lib.ZipLibraryInstall(context.Background(), ziplibraryInstallReq)
 		if err != nil {
 			feedback.Errorf("Error installing Zip Library %v", err)
 			os.Exit(errorcodes.ErrGeneric)
 		}
 	} else if installFlags.gitURL != "" {
-		GitlibraryInstallReq := &rpc.GitLibraryInstallReq{
+		gitlibraryInstallReq := &rpc.GitLibraryInstallReq{
 			Instance: instance,
-			Name:     args[0],
 			Url:      installFlags.gitURL,
 		}
-		_, err := lib.GitLibraryInstall(context.Background(), GitlibraryInstallReq)
+		_, err := lib.GitLibraryInstall(context.Background(), gitlibraryInstallReq)
 		if err != nil {
 			feedback.Errorf("Error installing Git Library %v", err)
 			os.Exit(errorcodes.ErrGeneric)
 		}
 	} else {
+		if len(args) == 0 {
+			cmd.Help()
+			os.Exit(errorcodes.ErrGeneric)
+		}
 		libRefs, err := ParseLibraryReferenceArgsAndAdjustCase(instance, args)
 		if err != nil {
 			feedback.Errorf("Arguments error: %v", err)

commands/lib/install.go

@@ -80,39 +80,24 @@ func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *libraries
 func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallReq) (*rpc.ZipLibraryInstallResp, error) {
 	res := &rpc.ZipLibraryInstallResp{}
 	lm := commands.GetLibraryManager(req.GetInstance().GetId())
-	Path := req.GetPath()
-	if err := installZipLibrary(lm, Path); err != nil {
+	libPath := req.GetPath()
+	if err := lm.InstallZipLib(libPath); err != nil {
 		res.Status = "Error installing Zip Library"
 		return res, err
 	}
 	res.Status = "Success! Installed Zip Library"
 	return res, nil
 }
 
-func installZipLibrary(lm *librariesmanager.LibrariesManager, libPath string) error {
-	if err := lm.InstallZipLib(libPath); err != nil {
-		return err
-	}
-	return nil
-}
-
 //GitLibraryInstall FIXMEDOC
 func GitLibraryInstall(ctx context.Context, req *rpc.GitLibraryInstallReq) (*rpc.GitLibraryInstallResp, error) {
 	res := &rpc.GitLibraryInstallResp{}
 	lm := commands.GetLibraryManager(req.GetInstance().GetId())
-	URL := req.GetUrl()
-	Name := req.GetName()
-	if err := installGitLibrary(lm, Name, URL); err != nil {
+	url := req.GetUrl()
+	if err := lm.InstallGitLib(url); err != nil {
 		res.Status = "Error installing Git Library"
 		return res, err
 	}
 	res.Status = "Success! Installed Git Library"
 	return res, nil
 }
-
-func installGitLibrary(lm *librariesmanager.LibrariesManager, Name string, gitURL string) error {
-	if err := lm.InstallGitLib(Name, gitURL); err != nil {
-		return err
-	}
-	return nil
-}

go.mod

@@ -20,11 +20,10 @@ require (
 	github.com/h2non/filetype v1.0.8 // indirect
 	github.com/imjasonmiller/godice v0.1.2
 	github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
-	github.com/leonelquinteros/gotext v1.4.0
-	github.com/marcinbor85/gohex v0.0.0-20200531163658-baab2527a9a2
-	github.com/juju/testing v0.0.0-20190429233213-dfc56b8c09fc // indirect
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
+	github.com/leonelquinteros/gotext v1.4.0
+	github.com/marcinbor85/gohex v0.0.0-20200531163658-baab2527a9a2
 	github.com/mattn/go-colorable v0.1.2
 	github.com/mattn/go-isatty v0.0.8
 	github.com/mattn/go-runewidth v0.0.9 // indirect
@@ -47,17 +46,13 @@ require (
 	go.bug.st/relaxed-semver v0.0.0-20190922224835-391e10178d18
 	go.bug.st/serial v1.1.1
 	go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 // indirect
-	golang.org/x/crypto v0.0.0-20200406173513-056763e48d71 // indirect
+	golang.org/x/crypto v0.0.0-20200406173513-056763e48d71
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
-	golang.org/x/sys v0.0.0-20200408040146-ea54a3c99b9b // indirect
 	golang.org/x/text v0.3.2
 	google.golang.org/grpc v1.27.0
 	google.golang.org/protobuf v1.25.0
-	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
-	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v2 v2.2.4
+	gopkg.in/yaml.v2 v2.3.0
 )