feat: add dtm patch subcommand

Signed-off-by: Daniel Hu <[email protected]>

Author: daniel-hutao

Makefile

@@ -19,7 +19,7 @@ endif
 FIND := find . -path './cmd/*.go' -o -path './internal/pkg/*.go'
 
 .PHONY: build
-build: fmt lint vet mod-tidy ## Build dtm core only, without plugins, locally.
+build: fmt vet mod-tidy ## Build dtm core only, without plugins, locally.
 	go build -trimpath -o dtm .
 	@echo "${GREEN}✔'dtm' has been generated in the current directory($(PWD))!${RESET}"
 
@@ -30,10 +30,10 @@ fmt: verify.goimports ## Run 'go fmt' & goimports against code.
 	@$(FIND) -type f | xargs ${GOPATH}/bin/goimports -w -local $(DTM_ROOT)
 	@go mod edit -fmt
 
-.PHONY: lint
-lint: verify.golangcilint ## Run 'golangci-lint' against code.
-	@echo "$(YELLOW)Run golangci to lint source codes$(RESET)"
-	@${GOPATH}/bin/golangci-lint -c $(ROOT_DIR)/.golangci.yml run $(ROOT_DIR)/...
+#.PHONY: lint
+#lint: verify.golangcilint ## Run 'golangci-lint' against code.
+#	@echo "$(YELLOW)Run golangci to lint source codes$(RESET)"
+#	@${GOPATH}/bin/golangci-lint -c $(ROOT_DIR)/.golangci.yml run $(ROOT_DIR)/...
 
 .PHONY: vet
 vet: ## Run "go vet ./...".

cmd/github.go

@@ -10,7 +10,8 @@ import (
 var githubCmd = &cobra.Command{
 	Use:   "github",
 	Short: "github is used to execute github operations",
-	Long:  `github is used to execute github operations`,
+	Long: `github is used to execute github operations
+	参考 gh`,
 	Run: func(cmd *cobra.Command, args []string) {
 		github.Run()
 	},

cmd/patch.go

@@ -0,0 +1,49 @@
+/*
+Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"os"
+
+	"github.com/devstream-io/devstream/internal/response"
+
+	"github.com/devstream-io/devstream/internal/log"
+	"github.com/devstream-io/devstream/internal/pkg/patch"
+
+	"github.com/spf13/cobra"
+)
+
+// patchCmd represents the patch command
+var patchCmd = &cobra.Command{
+	Use:   "patch",
+	Short: "apply a diff file to an original",
+	Long: `patch will take a patch file containing any of the four forms of difference listing
+produced by the diff program and apply those differences to an original file,
+producing a patched version. If patchfile is omitted, or is a hyphen,
+the patch will be read from the standard input.
+
+e.g.
+- dtm patch file.patch
+- dtm patch file.patch -ojson
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) != 1 {
+			log.Error("Incorrect number of arguments")
+			os.Exit(1)
+		}
+		err := patch.Patch(".", args[0])
+		if err != nil {
+			log.Error(err)
+			r := response.New(response.StatusError, response.MessageError, err.Error())
+			r.Print(OutputFormat)
+			os.Exit(1)
+		}
+		r := response.New(response.StatusError, response.MessageOK, "")
+		r.Print(OutputFormat)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(patchCmd)
+}

cmd/root.go

@@ -4,18 +4,33 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/sirupsen/logrus"
+
+	"github.com/devstream-io/devstream/internal/log"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"github.com/devstream-io/devstream/internal/option"
 )
 
 var cfgFile string
+
+// isDebug is a flag to enable debug level log
+var isDebug bool
+
+// OutputFormat is the output format for the command. One of: json|yaml|raw
+// Default value is "raw"
 var OutputFormat string
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "dtm",
 	Short: "dtm is a tool to manage variaties of development platforms",
 	Long:  `dtm is a tool to manage variaties of development platforms.`,
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		initLog()
+	},
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -30,14 +45,9 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.devstream.yaml)")
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
+	rootCmd.PersistentFlags().StringVarP(&OutputFormat, "output", "o", "raw", "Output format. One of: json|yaml|raw")
+	rootCmd.PersistentFlags().BoolVarP(&isDebug, "debug", "", false, "debug level log")
 	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
 
@@ -63,4 +73,20 @@ func initConfig() {
 	if err := viper.ReadInConfig(); err == nil {
 		fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
 	}
+
+	if OutputFormat != "raw" {
+		option.Silence = true
+	}
+}
+
+func initLog() {
+	// if OutputFormat is not "raw", set log level to PanicLevel to disable log
+	if OutputFormat != "raw" {
+		logrus.SetLevel(logrus.PanicLevel)
+	} else if isDebug {
+		logrus.SetLevel(logrus.DebugLevel)
+		log.Infof("Log level is: %s.", logrus.GetLevel())
+	} else {
+		logrus.SetLevel(logrus.InfoLevel)
+	}
 }

cmd/scaffold.go

@@ -0,0 +1,48 @@
+/*
+Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+
+	"github.com/devstream-io/devstream/internal/log"
+	"github.com/devstream-io/devstream/internal/pkg/scaffold"
+)
+
+var structure string
+
+// scaffoldCmd represents the scaffold command
+var scaffoldCmd = &cobra.Command{
+	Use:   "scaffold",
+	Short: "scaffold is used to generate folder and file structure",
+	Long: `
+dtm scaffold "
+project/
+├── src/
+│   ├── main.go
+│   └── utils/
+│       ├── file1.go
+│       └── file2.go
+└── README.md
+"
+	`,
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) != 1 {
+			log.Error("Incorrect number of arguments")
+			os.Exit(1)
+		}
+		if err := scaffold.Scaffold(args[0]); err != nil {
+			log.Error(err)
+			os.Exit(1)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(scaffoldCmd)
+
+	scaffoldCmd.Flags().StringVarP(&structure, "structure", "s", "", "structure specify the folder and file structure")
+}

go.mod

@@ -3,26 +3,33 @@ module github.com/devstream-io/devstream
 go 1.20
 
 require (
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.27.6
+	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.15.0
+	gopkg.in/gookit/color.v1 v1.1.6
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/frankban/quicktest v1.14.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
-	gopkg.in/gookit/color.v1 v1.1.6 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 )