pass-through optional args to get(); just use stderr instead of buffers

Author: clipperhouse

execute.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"errors"
 	"io"
 	"io/ioutil"
 	"os"
@@ -70,21 +69,13 @@ func executeCustom(src io.Reader, imports []string, body string) error {
 		return err
 	}
 
-	var stderr bytes.Buffer
-
 	// call `go run` on these files & send back output/err
 	cmd := exec.Command("go", "run", main.Name(), imps.Name())
 	cmd.Stdout = out
-	cmd.Stderr = &stderr
-
-	cmderr := cmd.Run()
+	cmd.Stderr = os.Stderr
 
-	if s := trimBuffer(stderr); len(s) > 0 {
-		return errors.New(s)
-	}
-
-	if cmderr != nil {
-		return cmderr
+	if err := cmd.Run(); err != nil {
+		return err
 	}
 
 	return nil

get.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"bytes"
-	"errors"
 	"go/parser"
 	"go/token"
 	"os"
@@ -11,29 +9,23 @@ import (
 )
 
 // get runs `go get` for required typewriters, either default or specified in _gen.go
-func get() error {
+func get(args []string) error {
 	imports, err := getTypewriterImports()
 
 	if err != nil {
 		return err
 	}
 
 	get := []string{"get"}
-
+	get = append(get, args...)
 	get = append(get, imports...)
 
-	var outerr bytes.Buffer
-
 	cmd := exec.Command("go", get...)
 	cmd.Stdout = out
-	cmd.Stderr = &outerr
+	cmd.Stderr = os.Stderr
 
 	if err := cmd.Run(); err != nil {
-		return err
-	}
-
-	if outerr.Len() > 0 {
-		return errors.New(outerr.String())
+		return nil
 	}
 
 	return nil

get_test.go

@@ -6,6 +6,17 @@ import (
 )
 
 func TestGet(t *testing.T) {
+	// just run it; not a great test but at least covers the code
+	if err := get([]string{}); err != nil {
+		t.Error(err)
+	}
+
+	if err := get([]string{"-d"}); err != nil {
+		t.Error(err)
+	}
+}
+
+func TestGetImports(t *testing.T) {
 	// use custom name so test won't interfere with a real _gen.go
 	setCustomName("_gen_test.go")
 	defer revertCustomName()

help.go

@@ -21,11 +21,14 @@ type helpInfo struct {
 
 var helpTmpl = template.Must(template.New("help").Parse(`
 Usage:
-  {{.Name}}           Generate files for types marked with +gen
-  {{.Name}} get       Download and install typewriters (standard or custom)
-  {{.Name}} list      List available typewriters (standard or custom)
-  {{.Name}} custom    Create a standard {{.CustomName}} file for importing custom typewriters
-  {{.Name}} help      Print usage
+  {{.Name}}           Generate files for types marked with +gen.
+  {{.Name}} get       Download and install typewriters (standard or custom). 
+                Optional flags from go get: [-d] [-fix] [-t] [-u].
+  {{.Name}} list      List available typewriters (standard or custom).
+  {{.Name}} custom    Create a standard {{.CustomName}} file for importing
+                custom typewriters.
+  {{.Name}} help      Print usage.
 
 Further details are available at http://clipperhouse.github.io/gen
+
 `))

main.go

@@ -19,8 +19,11 @@ func main() {
 	case "custom":
 		err = custom()
 	case "get":
-		err = get()
-		// TODO: pass subsequent flags (such as -u) to get
+		var tail []string
+		if len(args) > 2 {
+			tail = args[2:]
+		}
+		err = get(tail)
 	case "help":
 		err = help()
 	case "list":