Merge pull request #30 from bootun/win_support

support windows

cmd/root.go

@@ -10,10 +10,13 @@ import (
 	"github.com/spf13/viper"
 )
 
+const version = "v1.1.2"
+
 // RootCmd is the root command of kit
 var RootCmd = &cobra.Command{
-	Use:   "kit",
-	Short: "Go-Kit CLI",
+	Use:     "kit",
+	Short:   "Go-Kit CLI",
+	Version: version,
 	Run: func(cmd *cobra.Command, args []string) {
 		cmd.Help()
 	},
@@ -46,8 +49,8 @@ func checkProtoc() bool {
 				`Install proto3.
 https://github.com/google/protobuf/releases
 Update protoc Go bindings via
-> go get -u github.com/golang/protobuf/proto
-> go get -u github.com/golang/protobuf/protoc-gen-go
+> go install google.golang.org/protobuf/cmd/[email protected]
+> go install google.golang.org/grpc/cmd/protoc-gen-go[email protected]
 
 See also
 https://github.com/grpc/grpc-go/tree/master/examples`,
@@ -60,7 +63,8 @@ https://github.com/grpc/grpc-go/tree/master/examples`,
 > ./autogen.sh ; ./configure ; make ; make install
 
 Update protoc Go bindings via
-> go get -u github.com/golang/protobuf/{proto,protoc-gen-go}
+> go install google.golang.org/protobuf/cmd/[email protected]
+> go install google.golang.org/grpc/cmd/[email protected]
 
 See also
 https://github.com/grpc/grpc-go/tree/master/examples`,

generator/add_transport.go

@@ -2,24 +2,21 @@ package generator
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
-	"path"
-	"strings"
-
-	"os/exec"
-
 	"os"
-
+	"os/exec"
+	"path"
 	"runtime"
+	"strings"
 
-	"errors"
-
-	"github.com/dave/jennifer/jen"
-	"github.com/emicklei/proto"
-	"github.com/emicklei/proto-contrib/pkg/protofmt"
 	"github.com/GrantZheng/kit/fs"
+	grpcTemplate "github.com/GrantZheng/kit/generator/template/grpc"
 	"github.com/GrantZheng/kit/parser"
 	"github.com/GrantZheng/kit/utils"
+	"github.com/dave/jennifer/jen"
+	"github.com/emicklei/proto"
+	"github.com/emicklei/proto-contrib/pkg/protofmt"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
@@ -756,65 +753,20 @@ func (g *generateGRPCTransportProto) Generate() (err error) {
 	if runtime.GOOS == "windows" {
 		return g.fs.WriteFile(
 			g.compileFilePath,
-			fmt.Sprintf(`:: Install proto3.
-:: https://github.com/google/protobuf/releases
-:: Update protoc Go bindings via
-::  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-::  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-::
-:: See also
-::  https://github.com/grpc/grpc-go/tree/master/examples
-
-protoc --go_out=. --go_opt=paths=source_relative \
-		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`, g.name),
+			grpcTemplate.WindowsScriptText(g.name),
 			false,
 		)
 	}
 	if runtime.GOOS == "darwin" {
 		return g.fs.WriteFile(
 			g.compileFilePath,
-			fmt.Sprintf(`#!/usr/bin/env sh
-
-# Install proto3 from source macOS only.
-#  brew install autoconf automake libtool
-#  git clone https://github.com/google/protobuf
-#  ./autogen.sh ; ./configure ; make ; make install
-#
-# Update protoc Go bindings via
-#  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-#  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-# See also
-#  https://github.com/grpc/grpc-go/tree/master/examples
-
-protoc --go_out=. --go_opt=paths=source_relative \
-		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`, g.name),
+			grpcTemplate.DarwinScriptText(g.name),
 			false,
 		)
 	}
 	return g.fs.WriteFile(
 		g.compileFilePath,
-		fmt.Sprintf(`#!/usr/bin/env sh
-
-# Install proto3
-# sudo apt-get install -y git autoconf automake libtool curl make g++ unzip
-# git clone https://github.com/google/protobuf.git
-# cd protobuf/
-# ./autogen.sh
-# ./configure
-# make
-# make check
-# sudo make install
-# sudo ldconfig # refresh shared library cache.
-#
-# Update protoc Go bindings via
-#  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-#  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-#
-# See also
-#  https://github.com/grpc/grpc-go/tree/master/examples
-
-protoc --go_out=. --go_opt=paths=source_relative \
-		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`, g.name),
+		grpcTemplate.ScriptText(g.name),
 		false,
 	)
 }

generator/new_service.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"os/exec"
 	"path"
+	"runtime"
 	"strings"
 
-	"github.com/dave/jennifer/jen"
 	"github.com/GrantZheng/kit/fs"
 	"github.com/GrantZheng/kit/utils"
+	"github.com/dave/jennifer/jen"
 	"github.com/spf13/viper"
 )
 
@@ -78,14 +79,22 @@ func (g *NewService) genModule() error {
 		moduleName = strings.Join(moduleNameSlice, "/")
 	}
 	cmdStr := "cd " + prjName + " && go mod init " + moduleName
-	cmd := exec.Command("sh", "-c", cmdStr)
+	var cmd *exec.Cmd
+	if runtime.GOOS == "windows" {
+		cmd = exec.Command("cmd", "/C", cmdStr)
+	} else {
+		cmd = exec.Command("sh", "-c", cmdStr)
+	}
 
 	var stderr bytes.Buffer
 	cmd.Stderr = &stderr
 
 	_, err := cmd.Output()
 	// return cmd.Stderr to debug (err here provides nothing useful, only `exit status 1`)
 	if err != nil {
+		if runtime.GOOS == "windows" {
+			return fmt.Errorf("genModule: cmd /C %s => err:%v", cmdStr, err.Error()+" , "+stderr.String())
+		}
 		return fmt.Errorf("genModule: sh -c %s => err:%v", cmdStr, err.Error()+" , "+stderr.String())
 	}
 	return nil

generator/template/grpc/script.go

@@ -0,0 +1,74 @@
+package grpc
+
+import "fmt"
+
+const (
+	scriptTemplate = `#!/usr/bin/env sh
+
+# Install proto3
+# sudo apt-get install -y git autoconf automake libtool curl make g++ unzip
+# git clone https://github.com/google/protobuf.git
+# cd protobuf/
+# ./autogen.sh
+# ./configure
+# make
+# make check
+# sudo make install
+# sudo ldconfig # refresh shared library cache.
+#
+# Update protoc Go bindings via
+#  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+#  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+#
+# See also
+#  https://github.com/grpc/grpc-go/tree/master/examples
+
+protoc --go_out=. --go_opt=paths=source_relative \
+		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`
+
+	windowsScriptTemplate = `:: Install proto3.
+:: https://github.com/google/protobuf/releases
+:: Update protoc Go bindings via
+::  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+::  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+::
+:: See also
+::  https://github.com/grpc/grpc-go/tree/master/examples
+
+protoc --go_out=. --go_opt=paths=source_relative \
+		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`
+
+	darwinScriptText = `#!/usr/bin/env sh
+
+# Install proto3 from source macOS only.
+#  brew install autoconf automake libtool
+#  git clone https://github.com/google/protobuf
+#  ./autogen.sh ; ./configure ; make ; make install
+#
+# Update protoc Go bindings via
+#  go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+#  go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+# See also
+#  https://github.com/grpc/grpc-go/tree/master/examples
+
+protoc --go_out=. --go_opt=paths=source_relative \
+		--go-grpc_out=. --go-grpc_opt=paths=source_relative %s`
+)
+
+// WindowsScriptText return gRPC compile script text for windows,
+// it uses the syntax of windows batch
+func WindowsScriptText(name string) string {
+	return fmt.Sprintf(windowsScriptTemplate, name)
+}
+
+// DarwinScriptText return gRPC compile script text for macOS, it
+// uses the syntax of shell script
+func DarwinScriptText(name string) string {
+	return fmt.Sprintf(darwinScriptText, name)
+}
+
+// ScriptText return gRPC compile script text, it uses the syntax
+// of shell script
+func ScriptText(name string) string {
+	return fmt.Sprintf(scriptTemplate, name)
+}