diff --git a/README.md b/README.md index 89a3b23..0450e0a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Goguik (name TBD) +# Gouik (name TBD) Only tested on Linux diff --git a/cmd/init.go b/cmd/init.go index 093cdcf..cb67206 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -55,45 +55,31 @@ func runInitAction(cmd *cobra.Command, args []string) { log.Debugf("Working in directory: %s", currentPath) - // Check if we are in goguik directory - log.Debug("Checking if we are in the same directory as Goguik") + // Check if we are in gouik directory + log.Debug("Checking if we are in the same directory as Gouik") - isGoguikDir, err := helpers.IsGoguikDirectory(currentPath) + isGouikDir, err := helpers.IsGouikDirectory(currentPath) if err != nil { - log.Errorf("Fail to check if we are in goguik directory. The following error happen: %s", err.Error()) + log.Errorf("Fail to check if we are in gouik directory. The following error happen: %s", err.Error()) return } - if isGoguikDir { - log.Error("You cannot initialize a new project in the same dir than goguik\nGoguik should be added to your path") + if isGouikDir { + log.Error("You cannot initialize a new project in the same dir than gouik\nGouik should be added to your path") return } - // Check if we are in a go project - log.Debug("Checking if we are in a golang project") + // Check if we are in a gouik project + log.Debug("Checking if we are in a gouik project") - isGoProject, err := helpers.IsGoProject(currentPath) + isGouikProject, err := helpers.IsGouikProject(currentPath) if err != nil { - log.Errorf("Fail to check if we are in a go project. The following error happen: %s", err.Error()) + log.Errorf("Fail to check if we are in a gouik project. The following error happen: %s", err.Error()) return } - if isGoProject { - log.Error("You cannot initialize a new project in an already golang project") - return - } - - // Check if we are in a goguik project - log.Debug("Checking if we are in a goguik project") - - isGoguikProject, err := helpers.IsGoguikProject(currentPath) - if err != nil { - log.Errorf("Fail to check if we are in a goguik project. The following error happen: %s", err.Error()) - return - } - - if isGoguikProject { - log.Error("You cannot initialize a new project in an already goguik project") + if isGouikProject { + log.Error("You cannot initialize a new project in an already gouik project") return } @@ -102,7 +88,7 @@ func runInitAction(cmd *cobra.Command, args []string) { // Create directory // Move to dir // git init - // create .goguik + // create .gouik // move templated file // if isGoProject, err := helpers.IsGoProject(); err != nil { diff --git a/cmd/upgrade.go b/cmd/upgrade.go index 63eb2b7..a981dd3 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -50,7 +50,7 @@ func runUpgradeAction(cmd *cobra.Command, args []string) { log.Infof("Your %s is not supported.", dependency.GetName()) if !dependency.CanBeInstalled() { - log.Warnf("%s cannot be installed by Goguik. Please install it by yourself !", dependency.GetName()) + log.Warnf("%s cannot be installed by Gouik. Please install it by yourself !", dependency.GetName()) continue } diff --git a/cmd/version.go b/cmd/version.go index 6a70275..58c210f 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -13,7 +13,7 @@ import ( // versionCmd represents the version command var versionCmd = &cobra.Command{ Use: "version", - Short: "Show goguik version", + Short: "Show gouik version", Run: runVersion, } diff --git a/helpers/constant.go b/helpers/constant.go index 68e6a72..00b2a58 100644 --- a/helpers/constant.go +++ b/helpers/constant.go @@ -1,3 +1,3 @@ package helpers -const configFile = ".goguik.yaml" +const configFile = ".gouik.yaml" diff --git a/helpers/dependencies/golang.go b/helpers/dependencies/golang.go index bfb9009..05ef650 100644 --- a/helpers/dependencies/golang.go +++ b/helpers/dependencies/golang.go @@ -208,7 +208,7 @@ You will have to reopen a new terminal to apply the changes or execute the follo func (g Golang) PostInstall(path string) error { lineBashRc := []string{ - "# Golang - Added by goguik", + "# Golang - Added by gouik", } gopath := os.Getenv("GOPATH") diff --git a/helpers/dependencies/swagger.go b/helpers/dependencies/swagger.go index 8ace917..94eddd3 100644 --- a/helpers/dependencies/swagger.go +++ b/helpers/dependencies/swagger.go @@ -204,7 +204,7 @@ You will have to reopen a new terminal to apply the changes or execute the follo func (s Swagger) PostInstall(path string) error { lineBashRc := []string{ - "# Swagger - Added by goguik", + "# Swagger - Added by gouik", } // checking if swagger binary is found after installation diff --git a/helpers/file.go b/helpers/file.go index 82d0274..56acf5a 100644 --- a/helpers/file.go +++ b/helpers/file.go @@ -11,23 +11,23 @@ import ( log "github.com/sirupsen/logrus" ) -func IsGoguikDirectory(path string) (bool, error) { +func IsGouikDirectory(path string) (bool, error) { binPath, err := os.Executable() if err != nil { return false, errors.Trace(err) } - goguikPath := filepath.Dir(binPath) + gouikPath := filepath.Dir(binPath) - if goguikPath != path { + if gouikPath != path { return false, nil } return true, nil } -func IsGoguikProject(path string) (bool, error) { +func IsGouikProject(path string) (bool, error) { exist, err := fileExists(filepath.Join(path, configFile)) if err != nil {