Merge pull request #1 from yuya-takeyama/options

Add command-line options: -h (--help) and -v (--version)

Author: yuya-takeyama

README.md

@@ -5,7 +5,7 @@ Command to execute command N times
 ## Usage
 
 ```
-$ ntimes 3 echo foo bar baz
+$ ntimes 3 -- echo foo bar baz
 foo bar baz
 foo bar baz
 foo bar baz

main.go

@@ -1,18 +1,43 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"os/exec"
 	"strconv"
+
+	flags "github.com/jessevdk/go-flags"
 )
 
 const AppName = "ntimes"
 
+type Options struct {
+	ShowVersion bool `short:"v" long:"version" description:"Show version"`
+}
+
+var opts Options
+
 func main() {
-	cnt, err := strconv.Atoi(os.Args[1])
-	cmdName := os.Args[2]
-	cmdArgs := os.Args[3:]
+	parser := flags.NewParser(&opts, flags.Default^flags.PrintErrors)
+	parser.Name = AppName
+	parser.Usage = "[OPTIONS] -- COMMAND"
+
+	args, err := parser.Parse()
+
+	if err != nil {
+		fmt.Fprint(os.Stderr, err)
+		return
+	}
+
+	if opts.ShowVersion {
+		io.WriteString(os.Stdout, fmt.Sprintf("%s v%s, build %s\n", AppName, Version, GitCommit))
+		return
+	}
+
+	cnt, err := strconv.Atoi(args[0])
+	cmdName := args[1]
+	cmdArgs := args[2:]
 
 	if err != nil {
 		panic(err)

wercker.yml

@@ -1,14 +1,11 @@
-box: wercker/golang
-services:
-  - wercker/mysql
+box: tcnksm/gox
 build:
   steps:
     - setup-go-workspace
+    - wercker/golint
     - script:
         name: go get
         code: |
-          cd $WERCKER_SOURCE_DIR
-          go version
           go get -t ./...
     - script:
         name: go build
@@ -17,9 +14,4 @@ build:
     - script:
         name: go test
         code: |
-          export DB2YAML_MYSQL_HOST=$WERCKER_MYSQL_HOST
-          export DB2YAML_MYSQL_PORT=$WERCKER_MYSQL_PORT
-          export DB2YAML_MYSQL_USERNAME=$WERCKER_MYSQL_USERNAME
-          export DB2YAML_MYSQL_PASSWORD=$WERCKER_MYSQL_PASSWORD
-          export DB2YAML_MYSQL_DATABASE=$WERCKER_MYSQL_DATABASE
           go test ./...