Use utility.Paths instead of the CWD

Author: Tch1b0

pkg/commands/install.go

@@ -3,8 +3,6 @@ package commands
 import (
 	"errors"
 	"fmt"
-	"os"
-	"path/filepath"
 
 	"github.com/Glow-Project/ppm/pkg/utility"
 	"github.com/fatih/color"
@@ -17,20 +15,12 @@ func install(ctx *cli.Context) error {
 		return err
 	}
 
-	config, err := utility.ParsePpmConfig(filepath.Join(paths.Root, "ppm.json"))
+	config, err := utility.ParsePpmConfig(paths.ConfigFile)
 	if err != nil {
 		return errors.New("could not find ppm.json file - try to run: ppm init")
 	}
 
-	if !config.IsPlugin {
-		pathExists, _ := utility.DoesPathExist(paths.Addons)
-		if !pathExists {
-			err := os.Mkdir(paths.Addons, 0755)
-			if err != nil {
-				return err
-			}
-		}
-	}
+	utility.CheckOrCreateDir(paths.Addons)
 
 	dependencies := ctx.Args()
 	if dependencies.Len() > 0 {

pkg/commands/show.go

@@ -2,21 +2,18 @@ package commands
 
 import (
 	"errors"
-	"os"
-	"path/filepath"
 
 	"github.com/Glow-Project/ppm/pkg/utility"
 	"github.com/urfave/cli/v2"
 )
 
 func showConfig(ctx *cli.Context) error {
-	// currentPath is the root directory of the project
-	currentPath, err := os.Getwd()
+	paths, err := utility.CreatePathsFromCwd()
 	if err != nil {
 		return err
 	}
 
-	config, err := utility.ParsePpmConfig(filepath.Join(currentPath, "ppm.json"))
+	config, err := utility.ParsePpmConfig(paths.ConfigFile)
 	if err != nil {
 		return errors.New("could not find ppm.json file - try to run: ppm init")
 	}

pkg/commands/uninstall.go

@@ -5,21 +5,19 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"path/filepath"
 
 	"github.com/Glow-Project/ppm/pkg/utility"
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 )
 
 func uninstall(ctx *cli.Context) error {
-	// currentPath is the root directory of the project
-	currentPath, err := os.Getwd()
+	paths, err := utility.CreatePathsFromCwd()
 	if err != nil {
 		return err
 	}
 
-	config, err := utility.ParsePpmConfig(filepath.Join(currentPath, "ppm.json"))
+	config, err := utility.ParsePpmConfig(paths.ConfigFile)
 	if err != nil {
 		return errors.New("could not find ppm.json file - try to run: ppm init")
 	}
@@ -31,24 +29,24 @@ func uninstall(ctx *cli.Context) error {
 			if !config.HasDependency(dep) && !config.HasSubDependency(dep) {
 				fmt.Println(color.RedString("the plugin"), color.YellowString(dep), color.RedString("is not installed"))
 			} else {
-				uninstallDependency(&config, currentPath, dep, false)
+				uninstallDependency(&config, paths, dep, false)
 			}
 
 		}
 
 	} else {
-		uninstallAllDependencies(config, currentPath, ctx.Bool("hard"))
+		uninstallAllDependencies(config, paths, ctx.Bool("hard"))
 	}
 
 	return nil
 }
 
-func uninstallAllDependencies(config utility.PpmConfig, currentPath string, hard bool) error {
+func uninstallAllDependencies(config utility.PpmConfig, paths utility.Paths, hard bool) error {
 	loading := make(chan interface{}, 1)
 	go utility.PlayLoadingAnim(loading)
 
 	// path: root/addons
-	err := os.RemoveAll(path.Join(currentPath, "addons"))
+	err := os.RemoveAll(paths.Addons)
 	if err != nil {
 		return err
 	}
@@ -62,7 +60,7 @@ func uninstallAllDependencies(config utility.PpmConfig, currentPath string, hard
 	return nil
 }
 
-func uninstallDependency(config *utility.PpmConfig, currentPath string, dependency string, isSubDependency bool) error {
+func uninstallDependency(config *utility.PpmConfig, paths utility.Paths, dependency string, isSubDependency bool) error {
 	dep := utility.GetPluginName(dependency)
 	if !isSubDependency {
 		fmt.Println("\runinstalling", color.YellowString(dep))
@@ -72,18 +70,18 @@ func uninstallDependency(config *utility.PpmConfig, currentPath string, dependen
 	loading := make(chan interface{}, 1)
 	go utility.PlayLoadingAnim(loading)
 
-	subConfig, err := utility.GetPluginConfig(path.Join(currentPath, "addons"), dep)
+	subConfig, err := utility.GetPluginConfig(paths.Addons, dep)
 	if err == nil {
 		for i := 0; i < len(subConfig.Dependencies); i++ {
 			subDep := subConfig.Dependencies[i]
 			if !config.HasDependency(subDep) {
-				uninstallDependency(config, currentPath, subDep, true)
+				uninstallDependency(config, paths, subDep, true)
 			}
 		}
 	}
 
 	// path: root/addons/dependency
-	err = os.RemoveAll(path.Join(currentPath, "addons", dep))
+	err = os.RemoveAll(path.Join(paths.Addons, dep))
 	loading <- nil
 	if err != nil {
 		return err

pkg/commands/update.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"errors"
-	"os"
 	"path/filepath"
 
 	"github.com/Glow-Project/ppm/pkg/utility"
@@ -12,53 +11,36 @@ import (
 // The update method is called by the cli
 // It updates all dependencies
 func update(ctx *cli.Context) error {
-	currentPath, err := os.Getwd()
+	paths, err := utility.CreatePathsFromCwd()
 	if err != nil {
 		return err
 	}
 
-	config, err := utility.ParsePpmConfig(filepath.Join(currentPath, "ppm.json"))
+	config, err := utility.ParsePpmConfig(paths.ConfigFile)
 	if err != nil {
 		return errors.New("could not find ppm.json file - try to run: ppm init")
 	}
 
-	if config.IsPlugin {
-		os.Chdir(filepath.Dir(currentPath))
-	} else {
-		addonPath := filepath.Join(currentPath, "addons")
-		pathExists, _ := utility.DoesPathExist(addonPath)
-		if !pathExists {
-			err := os.Mkdir("addons", 0755)
-			if err != nil {
-				return err
-			}
-		}
-		os.Chdir(addonPath)
-	}
-
-	newPath, err := os.Getwd()
-	if err != nil {
-		return err
-	}
+	utility.CheckOrCreateDir(paths.Addons)
 
 	loading := make(chan interface{}, 1)
 	go utility.PlayLoadingAnim(loading)
-	updateAllDependencies(config, newPath)
+	updateAllDependencies(config, paths)
 	loading <- nil
 
 	utility.PrintDone()
 
 	return nil
 }
 
-func updateAllDependencies(config utility.PpmConfig, currentPath string) error {
+func updateAllDependencies(config utility.PpmConfig, paths utility.Paths) error {
 	for _, dependency := range config.Dependencies {
 		_, version := utility.GetVersionOrNot(dependency)
 		if len(version) > 0 {
 			continue
 		}
 
-		err := utility.Update(filepath.Join(currentPath, dependency))
+		err := utility.Update(filepath.Join(paths.Addons, dependency))
 		if err != nil {
 			return err
 		}