feat(main): add --package

Author: lvan100

gen/gen.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/go-spring/gs-gen/gen/generator"
-	"github.com/go-spring/gs-gen/gen/generator/golang"
-	"github.com/go-spring/gs-gen/lib/parser"
+	"github.com/go-spring/gs-http-gen/gen/generator"
+	"github.com/go-spring/gs-http-gen/gen/generator/golang"
+	"github.com/go-spring/gs-http-gen/lib/parser"
 )
 
 func init() {
@@ -20,7 +20,7 @@ func Gen(language string, config *generator.Config) error {
 	if !ok {
 		return fmt.Errorf("unsupported language: %s", language)
 	}
-	files, meta, err := parse(config.ProjectDir)
+	files, meta, err := parse(config.IDLDir)
 	if err != nil {
 		return err
 	}

gen/gen_test.go

@@ -2,13 +2,11 @@ package gen
 
 import (
 	"encoding/json"
-	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"testing"
 
-	"github.com/go-spring/gs-gen/gen/generator"
+	"github.com/go-spring/gs-http-gen/gen/generator"
 )
 
 func TestGen(t *testing.T) {
@@ -42,36 +40,19 @@ func testProject(t *testing.T, dir string) {
 
 	idlDir := filepath.Join(dir, "idl")
 	for lang, c := range m {
-		projectDir := filepath.Join(dir, lang)
-		dstDir := filepath.Join(projectDir, "server")
-		copyFiles(t, idlDir, dstDir)
+		outDir := filepath.Join(dir, lang, "proto")
+		os.RemoveAll(outDir)
+		os.Mkdir(outDir, os.ModePerm)
 		config := &generator.Config{
-			ProjectDir: dstDir,
-			Version:    "v0.0.0",
-			Server:     c.Server,
-			Client:     c.Client,
+			IDLDir:  idlDir,
+			OutDir:  outDir,
+			Version: "v0.0.0",
+			Server:  c.Server,
+			Client:  c.Client,
+			PkgName: "proto",
 		}
 		if err = Gen(lang, config); err != nil {
 			t.Fatal(err)
 		}
 	}
 }
-
-func copyFiles(t *testing.T, srcDir, dstDir string) {
-	srcDir, err := filepath.Abs(srcDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dstDir, err = filepath.Abs(dstDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	srcDir = filepath.Join(srcDir, "*")
-
-	script := fmt.Sprintf("cp %s %s", srcDir, dstDir)
-	cmd := exec.Command("/bin/bash", "-c", script)
-	b, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("%s: %s", err, b)
-	}
-}

gen/generator/generator.go

@@ -4,14 +4,16 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-spring/gs-gen/lib/parser"
+	"github.com/go-spring/gs-http-gen/lib/parser"
 )
 
 type Config struct {
-	ProjectDir string
-	Version    string
-	Server     bool
-	Client     bool
+	IDLDir  string
+	OutDir  string
+	Version string
+	Server  bool
+	Client  bool
+	PkgName string
 }
 
 var generators = map[string]Generator{}

gen/generator/golang/client.go

@@ -1,7 +1,7 @@
 package golang
 
 import (
-	"github.com/go-spring/gs-gen/lib/parser"
+	"github.com/go-spring/gs-http-gen/lib/parser"
 )
 
 func (g *Generator) genClient(ctx Context, rpcs []*parser.RPC) error {

gen/generator/golang/main.go

@@ -3,8 +3,8 @@ package golang
 import (
 	"sort"
 
-	"github.com/go-spring/gs-gen/gen/generator"
-	"github.com/go-spring/gs-gen/lib/parser"
+	"github.com/go-spring/gs-http-gen/gen/generator"
+	"github.com/go-spring/gs-http-gen/lib/parser"
 )
 
 type Context struct {

gen/generator/golang/meta.go

@@ -1,7 +1,7 @@
 package golang
 
 import (
-	"github.com/go-spring/gs-gen/lib/parser"
+	"github.com/go-spring/gs-http-gen/lib/parser"
 )
 
 func (g *Generator) genMeta(meta *parser.MetaInfo) error {

gen/generator/golang/server.go

@@ -1,4 +1,4 @@
-package proto
+package go_test
 
 import (
 	"context"
@@ -7,21 +7,23 @@ import (
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/go-spring/gs-http-gen/gen/testdata/manager/go/proto"
 )
 
 type MyManagerServer struct{}
 
-func (m *MyManagerServer) GetManager(ctx context.Context, req *ManagerReq) *ResponseManager {
-	res := NewResponseManager()
-	res.SetData(&Manager{
+func (m *MyManagerServer) GetManager(ctx context.Context, req *proto.ManagerReq) *proto.ResponseManager {
+	res := proto.NewResponseManager()
+	res.SetData(&proto.Manager{
 		Name: "Jim",
 	})
 	return res
 }
 
 func TestManager(t *testing.T) {
 	mux := http.NewServeMux()
-	InitRouter(mux, &MyManagerServer{})
+	proto.InitRouter(mux, &MyManagerServer{})
 	go func() {
 		fmt.Println(http.ListenAndServe(":9191", mux))
 	}()