Rename configuration item package to importpath。 close #9

cmd/init.go

@@ -52,7 +52,7 @@ It only covers the most common items, and tries to guess sensible defaults.`)
 	}
 
 	// optional
-	c.Package = gatherOne("package", "main")
+	c.Importpath = gatherOne("importpath", "main")
 	for {
 		c.Variables = append(c.Variables, *gatherOneVar())
 

config/config.go

@@ -7,11 +7,11 @@ import (
 
 // Config 配置结构体
 type Config struct {
-	Version   string     `json:"version"`             // 版本号
-	Tool      string     `json:"tool"`                // 编译工具：go、gb...
-	Package   string     `json:"package,omitempty"`   // 待替换的变量所在包导入路径，如github.com/voidint/gbb/build
-	Variables []Variable `json:"variables,omitempty"` // 待替换变量集合
-	Debug     bool       `json:"-"`
+	Version    string     `json:"version"`              // 版本号
+	Tool       string     `json:"tool"`                 // 编译工具：go、gb...
+	Importpath string     `json:"importpath,omitempty"` // 待替换的变量所在包导入路径，如github.com/voidint/gbb/build
+	Variables  []Variable `json:"variables,omitempty"`  // 待替换变量集合
+	Debug      bool       `json:"-"`
 }
 
 // Variable 变量结构体

config/config_test.go

@@ -20,9 +20,9 @@ func TestLoad(t *testing.T) {
 		Convey("预期配置文件存在，实际文件存在", func() {
 			Convey("配置文件内容为合法JSON", func() {
 				c := Config{
-					Version: "0.1.1",
-					Tool:    "go install",
-					Package: "github.com/voidint/gbb/build",
+					Version:    "0.1.1",
+					Tool:       "go install",
+					Importpath: "github.com/voidint/gbb/build",
 					Variables: []Variable{
 						{Variable: "Date", Value: "{{.Date}}"},
 						{Variable: "Commit", Value: "{{.GitCommit}}"},
@@ -37,7 +37,7 @@ func TestLoad(t *testing.T) {
 				So(loadC, ShouldNotBeNil)
 				So(loadC.Version, ShouldEqual, c.Version)
 				So(loadC.Tool, ShouldEqual, c.Tool)
-				So(loadC.Package, ShouldEqual, c.Package)
+				So(loadC.Importpath, ShouldEqual, c.Importpath)
 				So(len(loadC.Variables), ShouldEqual, len(c.Variables))
 				So(loadC.Variables[0].Variable, ShouldEqual, c.Variables[0].Variable)
 				So(loadC.Variables[0].Value, ShouldEqual, c.Variables[0].Value)
@@ -78,9 +78,9 @@ func TestSave(t *testing.T) {
 		filename := filepath.Join(os.TempDir(), "gbb.json")
 		Convey("配置对象和磁盘文件都合法", func() {
 			c := Config{
-				Version: "0.1.1",
-				Tool:    "go install",
-				Package: "github.com/voidint/gbb/build",
+				Version:    "0.1.1",
+				Tool:       "go install",
+				Importpath: "github.com/voidint/gbb/build",
 				Variables: []Variable{
 					{Variable: "Date", Value: "{{.Date}}"},
 					{Variable: "Commit", Value: "{{.GitCommit}}"},
@@ -94,7 +94,7 @@ func TestSave(t *testing.T) {
 			So(loadC, ShouldNotBeNil)
 			So(loadC.Version, ShouldEqual, c.Version)
 			So(loadC.Tool, ShouldEqual, c.Tool)
-			So(loadC.Package, ShouldEqual, c.Package)
+			So(loadC.Importpath, ShouldEqual, c.Importpath)
 			So(len(loadC.Variables), ShouldEqual, len(c.Variables))
 			So(loadC.Variables[0].Variable, ShouldEqual, c.Variables[0].Variable)
 			So(loadC.Variables[0].Value, ShouldEqual, c.Variables[0].Value)

tool/builder.go

@@ -65,7 +65,7 @@ func buildDir(conf *config.Config, dir string) (err error) {
 		if conf.Debug {
 			fmt.Println(val)
 		}
-		buf.WriteString(fmt.Sprintf(`-X "%s.%s=%s"`, conf.Package, varName, val))
+		buf.WriteString(fmt.Sprintf(`-X "%s.%s=%s"`, conf.Importpath, varName, val))
 		if i < len(conf.Variables)-1 {
 			buf.WriteByte(' ')
 		}

tool/builder_test.go

@@ -20,10 +20,10 @@ func TestBuild(t *testing.T) {
 	Convey("调用gb build编译", t, func() {
 		Convey("包含变量表达式", func() {
 			c := &config.Config{
-				Version: "0.3.0",
-				Tool:    "gb build",
-				Package: "github.com/voidint/gbb/build",
-				Debug:   true,
+				Version:    "0.3.0",
+				Tool:       "gb build",
+				Importpath: "github.com/voidint/gbb/build",
+				Debug:      true,
 			}
 
 			Convey("包含非法变量表达式", func() {
@@ -58,9 +58,9 @@ func TestBuild(t *testing.T) {
 
 	Convey("调用go build编译", t, func() {
 		c := &config.Config{
-			Version: "0.3.0",
-			Tool:    "go build",
-			Package: "github.com/voidint/gbb/build",
+			Version:    "0.3.0",
+			Tool:       "go build",
+			Importpath: "github.com/voidint/gbb/build",
 			Variables: []config.Variable{
 				{Variable: "Date", Value: "{{.Date}}"},
 			},