pass by command line args

Author: davideme

cmd/goa/gen.go

@@ -40,11 +40,12 @@ type Generator struct {
 	tmpDir string
 
 	// hasVendorDirectory is a flag to indicate whether the project uses vendoring
-	hasVendorDirectory bool
+	hasVendorDirectory   bool
+	disableVersionString bool
 }
 
 // NewGenerator creates a Generator.
-func NewGenerator(cmd string, path, output string) *Generator {
+func NewGenerator(cmd string, path, output string, disableVersionString bool) *Generator {
 	bin := "goa"
 	if runtime.GOOS == "windows" {
 		bin += ".exe"
@@ -88,12 +89,13 @@ func NewGenerator(cmd string, path, output string) *Generator {
 	}
 
 	return &Generator{
-		Command:            cmd,
-		DesignPath:         path,
-		Output:             output,
-		DesignVersion:      version,
-		hasVendorDirectory: hasVendorDirectory,
-		bin:                bin,
+		Command:              cmd,
+		DesignPath:           path,
+		Output:               output,
+		DesignVersion:        version,
+		hasVendorDirectory:   hasVendorDirectory,
+		bin:                  bin,
+		disableVersionString: disableVersionString,
 	}
 }
 
@@ -139,7 +141,7 @@ func (g *Generator) Write(_ bool) error {
 			codegen.NewImport("_", g.DesignPath),
 		}
 		sections = []*codegen.SectionTemplate{
-			codegen.Header("Code Generator", "main", imports, false),
+			codegen.Header("Code Generator", "main", imports, g.disableVersionString),
 			{
 				Name:   "main",
 				Source: mainT,

cmd/goa/main.go

@@ -39,8 +39,9 @@ func main() {
 	}
 
 	var (
-		output = "."
-		debug  bool
+		output               = "."
+		debug                bool
+		disableVersionString bool
 	)
 	if len(os.Args) > offset+1 {
 		var (
@@ -49,6 +50,7 @@ func main() {
 			out  = fset.String("output", output, "output `directory`")
 		)
 		fset.BoolVar(&debug, "debug", false, "Print debug information")
+		fset.BoolVar(&disableVersionString, "disableVersionString", false, "Disable goa version string in generated code")
 
 		fset.Usage = usage
 		if err := fset.Parse(os.Args[offset+1:]); err != nil {
@@ -62,7 +64,7 @@ func main() {
 		}
 	}
 
-	if err := gen(cmd, path, output, debug); err != nil {
+	if err := gen(cmd, path, output, debug, disableVersionString); err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)
 	}
@@ -74,7 +76,7 @@ var (
 	gen   = generate
 )
 
-func generate(cmd, path, output string, debug bool) error {
+func generate(cmd, path, output string, debug bool, disableVersionString bool) error {
 	var (
 		files []string
 		err   error
@@ -85,7 +87,7 @@ func generate(cmd, path, output string, debug bool) error {
 		goto fail
 	}
 
-	tmp = NewGenerator(cmd, path, output)
+	tmp = NewGenerator(cmd, path, output, disableVersionString)
 
 	if err = tmp.Write(debug); err != nil {
 		goto fail

cmd/goa/main_test.go

@@ -12,37 +12,44 @@ func TestCmdLine(t *testing.T) {
 		testOutput = "testOutput"
 	)
 	var (
-		usageCalled  bool
-		cmd          string
-		path, output string
-		debug        bool
+		usageCalled          bool
+		cmd                  string
+		path, output         string
+		debug                bool
+		disableVersionString bool
 	)
 
 	usage = func() { usageCalled = true }
-	gen = func(c string, p, o string, d bool) error { cmd, path, output, debug = c, p, o, d; return nil }
+	gen = func(c string, p, o string, d bool, v bool) error {
+		cmd, path, output, debug, disableVersionString = c, p, o, d, v
+		return nil
+	}
 	defer func() {
 		usage = help
 		gen = generate
 	}()
 
 	cases := map[string]struct {
-		CmdLine         string
-		ExpectedUsage   bool
-		ExpectedCommand string
-		ExpectedPath    string
-		ExpectedOutput  string
-		ExpectedDebug   bool
+		CmdLine                      string
+		ExpectedUsage                bool
+		ExpectedCommand              string
+		ExpectedPath                 string
+		ExpectedOutput               string
+		ExpectedDebug                bool
+		ExpectedDisableVersionString bool
 	}{
-		"gen": {"gen " + testPkg, false, "gen", testPkg, ".", false},
+		"gen": {"gen " + testPkg, false, "gen", testPkg, ".", false, false},
+
+		"invalid":     {"invalid " + testPkg, true, "", "", ".", false, false},
+		"empty":       {"", true, "", "", ".", false, false},
+		"invalid gen": {"invalid gen" + testPkg, true, "", "", ".", false, false},
 
-		"invalid":     {"invalid " + testPkg, true, "", "", ".", false},
-		"empty":       {"", true, "", "", ".", false},
-		"invalid gen": {"invalid gen" + testPkg, true, "", "", ".", false},
+		"output":       {"gen " + testPkg + " -output " + testOutput, false, "gen", testPkg, testOutput, false, false},
+		"output short": {"gen " + testPkg + " -o " + testOutput, false, "gen", testPkg, testOutput, false, false},
 
-		"output":       {"gen " + testPkg + " -output " + testOutput, false, "gen", testPkg, testOutput, false},
-		"output short": {"gen " + testPkg + " -o " + testOutput, false, "gen", testPkg, testOutput, false},
+		"debug": {"gen " + testPkg + " -debug", false, "gen", testPkg, ".", true, false},
 
-		"debug": {"gen " + testPkg + " -debug", false, "gen", testPkg, ".", true},
+		"disable version": {"gen " + testPkg + " -disableVersionString", false, "gen", testPkg, ".", false, true},
 	}
 
 	for k, c := range cases {
@@ -73,5 +80,8 @@ func TestCmdLine(t *testing.T) {
 		if debug != c.ExpectedDebug {
 			t.Errorf("%s: Expected debug to be %v but got %v", k, c.ExpectedDebug, debug)
 		}
+		if disableVersionString != c.ExpectedDisableVersionString {
+			t.Errorf("%s: Expected disableVersionString to be %v but got %v", k, c.ExpectedDisableVersionString, disableVersionString)
+		}
 	}
 }