rework hof/dm cmds a bit

Signed-off-by: Tony Worm <tony@hofstadter.io>
hofstadter-io · Dec 28, 2021 · 3e5c27a · 3e5c27a
1 parent 2606792
commit 3e5c27a
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 210 deletions.
diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel.go b/.hof/shadow/Cli/cmd/hof/cmd/datamodel.go
@@ -70,11 +70,10 @@ func init() {
 	DatamodelCmd.SetHelpFunc(help)
 	DatamodelCmd.SetUsageFunc(usage)
 
-	DatamodelCmd.AddCommand(cmddatamodel.GetCmd)
+	DatamodelCmd.AddCommand(cmddatamodel.ListCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.StatusCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.DiffCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.HistoryCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.CheckpointCmd)
-	DatamodelCmd.AddCommand(cmddatamodel.ApplyCmd)
 
 }
diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel/apply.go b/.hof/shadow/Cli/cmd/hof/cmd/datamodel/apply.go
diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel/history.go b/.hof/shadow/Cli/cmd/hof/cmd/datamodel/history.go
@@ -24,8 +24,6 @@ var HistoryCmd = &cobra.Command{
 	Aliases: []string{
 		"hist",
 		"h",
-		"log",
-		"l",
 	},
 
 	Short: "show the history for a data model",

diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel/get.go → .../shadow/Cli/cmd/hof/cmd/datamodel/list.go b/.hof/shadow/Cli/cmd/hof/cmd/datamodel/get.go → .../shadow/Cli/cmd/hof/cmd/datamodel/list.go
@@ -7,27 +7,27 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var getLong = `find and display data models`
+var listLong = `find and display data models`
 
-func GetRun(args []string) (err error) {
+func ListRun(args []string) (err error) {
 
 	// you can safely comment this print out
 	fmt.Println("not implemented")
 
 	return err
 }
 
-var GetCmd = &cobra.Command{
+var ListCmd = &cobra.Command{
 
-	Use: "get",
+	Use: "list",
 
 	Aliases: []string{
-		"g",
+		"l",
 	},
 
 	Short: "find and display data models",
 
-	Long: getLong,
+	Long: listLong,
 
 	PreRun: func(cmd *cobra.Command, args []string) {
 
@@ -38,7 +38,7 @@ var GetCmd = &cobra.Command{
 
 		// Argument Parsing
 
-		err = GetRun(args)
+		err = ListRun(args)
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
@@ -52,8 +52,8 @@ func init() {
 		return false
 	}
 
-	ohelp := GetCmd.HelpFunc()
-	ousage := GetCmd.UsageFunc()
+	ohelp := ListCmd.HelpFunc()
+	ousage := ListCmd.UsageFunc()
 	help := func(cmd *cobra.Command, args []string) {
 		if extra(cmd) {
 			return
@@ -67,7 +67,7 @@ func init() {
 		return ousage(cmd)
 	}
 
-	GetCmd.SetHelpFunc(help)
-	GetCmd.SetUsageFunc(usage)
+	ListCmd.SetHelpFunc(help)
+	ListCmd.SetUsageFunc(usage)
 
 }
diff --git a/.hof/shadow/Cli/cmd/hof/cmd/datamodel/status.go b/.hof/shadow/Cli/cmd/hof/cmd/datamodel/status.go
@@ -22,7 +22,7 @@ var StatusCmd = &cobra.Command{
 	Use: "status",
 
 	Aliases: []string{
-		"st",
+		"s",
 	},
 
 	Short: "print the data model status",

diff --git a/cmd/hof/cmd/datamodel.go b/cmd/hof/cmd/datamodel.go
@@ -70,11 +70,10 @@ func init() {
 	DatamodelCmd.SetHelpFunc(help)
 	DatamodelCmd.SetUsageFunc(usage)
 
-	DatamodelCmd.AddCommand(cmddatamodel.GetCmd)
+	DatamodelCmd.AddCommand(cmddatamodel.ListCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.StatusCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.DiffCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.HistoryCmd)
 	DatamodelCmd.AddCommand(cmddatamodel.CheckpointCmd)
-	DatamodelCmd.AddCommand(cmddatamodel.ApplyCmd)
 
 }
diff --git a/cmd/hof/cmd/datamodel/apply.go b/cmd/hof/cmd/datamodel/apply.go
diff --git a/cmd/hof/cmd/datamodel/history.go b/cmd/hof/cmd/datamodel/history.go
@@ -28,8 +28,6 @@ var HistoryCmd = &cobra.Command{
 	Aliases: []string{
 		"hist",
 		"h",
-		"log",
-		"l",
 	},
 
 	Short: "show the history for a data model",
@@ -77,4 +75,4 @@ func init() {
 	HistoryCmd.SetHelpFunc(help)
 	HistoryCmd.SetUsageFunc(usage)
 
-}
+}
diff --git a/cmd/hof/cmd/datamodel/get.go → cmd/hof/cmd/datamodel/list.go b/cmd/hof/cmd/datamodel/get.go → cmd/hof/cmd/datamodel/list.go
@@ -7,33 +7,32 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/flags"
-
 	"github.com/hofstadter-io/hof/lib/datamodel"
 )
 
-var getLong = `find and display data models`
+var listLong = `find and display data models`
 
-func GetRun(args []string) (err error) {
+func ListRun(args []string) (err error) {
 
 	// you can safely comment this print out
 	// fmt.Println("not implemented")
 
-	err = datamodel.RunGetFromArgs(args, flags.DatamodelPflags)
+	err = datamodel.RunListFromArgs(args, flags.DatamodelPflags)
 
 	return err
 }
 
-var GetCmd = &cobra.Command{
+var ListCmd = &cobra.Command{
 
-	Use: "get",
+	Use: "list",
 
 	Aliases: []string{
-		"g",
+		"l",
 	},
 
 	Short: "find and display data models",
 
-	Long: getLong,
+	Long: listLong,
 
 	PreRun: func(cmd *cobra.Command, args []string) {
 
@@ -44,7 +43,7 @@ var GetCmd = &cobra.Command{
 
 		// Argument Parsing
 
-		err = GetRun(args)
+		err = ListRun(args)
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
@@ -58,8 +57,8 @@ func init() {
 		return false
 	}
 
-	ohelp := GetCmd.HelpFunc()
-	ousage := GetCmd.UsageFunc()
+	ohelp := ListCmd.HelpFunc()
+	ousage := ListCmd.UsageFunc()
 	help := func(cmd *cobra.Command, args []string) {
 		if extra(cmd) {
 			return
@@ -73,7 +72,7 @@ func init() {
 		return ousage(cmd)
 	}
 
-	GetCmd.SetHelpFunc(help)
-	GetCmd.SetUsageFunc(usage)
+	ListCmd.SetHelpFunc(help)
+	ListCmd.SetUsageFunc(usage)
 
 }
diff --git a/cmd/hof/cmd/datamodel/status.go b/cmd/hof/cmd/datamodel/status.go
@@ -26,7 +26,7 @@ var StatusCmd = &cobra.Command{
 	Use: "status",
 
 	Aliases: []string{
-		"st",
+		"s",
 	},
 
 	Short: "print the data model status",
@@ -74,4 +74,4 @@ func init() {
 	StatusCmd.SetHelpFunc(help)
 	StatusCmd.SetUsageFunc(usage)
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,8 +24,6 @@ var HistoryCmd = &cobra.Command{ @@
     	Aliases: []string{
     		"hist",
     		"h",
-    		"log",
-    		"l",
     	},
     	Short: "show the history for a data model",
@@ Expand Down @@