Renamed commands to their new names. Fixed checking of jq version in check command

Author: bmonkman

cmd/apply.go

@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"github.com/commitdev/zero/configs"
+	"github.com/spf13/cobra"
+)
+
+var applyConfigPath string
+
+func init() {
+	applyCmd.PersistentFlags().StringVarP(&applyConfigPath, "config", "c", configs.CommitYml, "config path")
+
+	rootCmd.AddCommand(applyCmd)
+}
+
+var applyCmd = &cobra.Command{
+	Use:   "apply",
+	Short: "Execute modules to create projects, infrastructure, etc.",
+	Run: func(cmd *cobra.Command, args []string) {
+
+	},
+}

cmd/check.go

@@ -73,6 +73,12 @@ func getSemver(req requirement, out []byte) (*semver.Version, error) {
 			fmt.Sprintf("Try running %s %s locally and checking it works.", req.command, strings.Join(req.args, " ")),
 		}
 	}
+
+	// Default patch version number to 0 if it doesn't exist
+	if v[3] == "" {
+		v[3] = "0"
+	}
+
 	versionString := fmt.Sprintf("%s.%s.%s", v[1], v[2], v[3])
 	version, err := semver.NewVersion(versionString)
 	if err != nil {
@@ -125,7 +131,7 @@ var checkCmd = &cobra.Command{
 				name:       "jq\t\t",
 				command:    "jq",
 				args:       []string{"--version"},
-				regexStr:   `jq-(0|[1-9]\d*)\.(0|[1-9]\d*)-(0|[1-9]\d*)`,
+				regexStr:   `jq-(0|[1-9]\d*)\.(0|[1-9]\d*)\-?(0|[1-9]\d*)?`,
 				minVersion: "1.5.0",
 				docsURL:    "https://stedolan.github.io/jq/download/",
 			},

cmd/create.go

@@ -1,27 +1,27 @@
 package cmd
 
 import (
+	"github.com/commitdev/zero/configs"
 	"github.com/commitdev/zero/internal/config"
-	"github.com/commitdev/zero/internal/context"
-	"github.com/commitdev/zero/pkg/util/exit"
+	"github.com/commitdev/zero/internal/generate"
 	"github.com/spf13/cobra"
 )
 
+var createConfigPath string
+
 func init() {
+	createCmd.PersistentFlags().StringVarP(&createConfigPath, "config", "c", configs.CommitYml, "config path")
+
 	rootCmd.AddCommand(createCmd)
 }
 
 var createCmd = &cobra.Command{
 	Use:   "create",
-	Short: "Create new project with provided name.",
+	Short: "Create directories and render templates based on included modules.",
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) < 1 {
-			exit.Fatal("Project name cannot be empty!")
-		}
 
-		projectName := args[0]
-		context.Create(projectName, "./")
+		cfg := config.LoadGeneratorConfig(createConfigPath)
 
-		config.CreateExample(projectName)
+		generate.GenerateModules(cfg)
 	},
 }

cmd/generate.go

@@ -0,0 +1,27 @@
+package cmd
+
+import (
+	"github.com/commitdev/zero/internal/config"
+	"github.com/commitdev/zero/internal/context"
+	"github.com/commitdev/zero/pkg/util/exit"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(initCmd)
+}
+
+var initCmd = &cobra.Command{
+	Use:   "init",
+	Short: "Create new project with provided name and initialize configuration based on user input.",
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) < 1 {
+			exit.Fatal("Project name cannot be empty!")
+		}
+
+		projectName := args[0]
+		context.Create(projectName, "./")
+
+		config.CreateExample(projectName)
+	},
+}

cmd/init.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestCreateWorks(t *testing.T) {
+func TestInitWorks(t *testing.T) {
 	// @TODO : Figure out a way to test this
 	// tmpdir, err := ioutil.TempDir("", "commit0-")
 	// if err != nil {

cmd/create_test.go cmd/init_test.gocmd/create_test.go renamed to cmd/init_test.go

@@ -5,10 +5,8 @@ go 1.12
 require (
 	github.com/aws/aws-sdk-go v1.25.33
 	github.com/commitdev/commit0 v0.0.0-20200515235753-f146c26933bd
-	github.com/chzyer/logex v1.1.10 // indirect
-	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
-	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/coreos/go-semver v0.2.0
+	github.com/gobuffalo/packr/v2 v2.8.0 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.3
@@ -17,6 +15,6 @@ require (
 	github.com/kyokomi/emoji v2.1.0+incompatible
 	github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434
 	github.com/manifoldco/promptui v0.3.0
-	github.com/spf13/cobra v0.0.5
+	github.com/spf13/cobra v0.0.6
 	gopkg.in/yaml.v2 v2.2.5
 )