add version file along with build/install Makefile targets

also moved the gherkinfmt command into ./cmd/ subfolder

.gitignore

@@ -1,2 +1,2 @@
 *.out
-gherkinfmt/gherkinfmt
+cmd/gherkinfmt/gherkinfmt

Makefile

@@ -1,7 +1,9 @@
 
-default: gherkin.peg.go
+default: build
 
-.PHONY: default clean test integration get-deps
+GIT_VERSION=$(shell git describe HEAD 2>/dev/null || git describe --tags HEAD)
+
+.PHONY: default version clean build test install integration get-deps
 
 peg=$(shell which peg \
 	|| ([ -x $(GOPATH)/bin/peg ] && echo $(GOPATH)/bin/peg) \
@@ -34,10 +36,23 @@ gherkin.peg.go: gherkin.peg
 	  > $@
 	rm gherkin.peg.pp gherkin.peg.pp.go
 
-test: gherkin.peg.go
-	go test ./ ./*/
+version: 
+	@echo "version: $(GIT_VERSION)" >&2
+	@cat version.go | sed -e 's/\(VERSION = "\)[^\"]*\("\)/\1'$(GIT_VERSION)'\2/' > version.go.tmp
+	@diff version.go.tmp version.go || (cat version.go.tmp > version.go)
+	@rm version.go.tmp
+
+build: version gherkin.peg.go
+	go build ./ ./formater ./cmd/gherkinfmt
+
+install: version gherkin.peg.go
+	go install ./cmd/gherkinfmt
+
+test: version gherkin.peg.go
+	go test ./ ./formater ./cmd/gherkinfmt
 
 integration: get-deps clean test
+	@echo "done: $(GIT_VERSION)" >&2
 
 clean:
 	- rm gherkin.peg.go

README.md

@@ -12,12 +12,29 @@ Read the [Documentation][godoc] over at [godoc.org][godoc].
 
 Install
 -------
+
+### Via Go Get
+
 ```bash
-make get-deps
-make
-make test
+$ go get github.com/muhqu/go-gherkin
+...
+$ go install github.com/muhqu/go-gherkin/cmd/gherkinfmt
+...
+$ gherkinfmt -version # verify install
 ```
 
+### Via GNU Make
+
+```bash
+$ git clone https://github.com/muhqu/go-gherkin
+...
+$ cd go-gherkin/
+$ make get-deps build test install
+...
+$ gherkinfmt -version # verify install
+```
+
+
 Usage Example
 -------------
 ```go

gherkinfmt/gherkinfmt.go → cmd/gherkinfmt/gherkinfmt.go

@@ -18,6 +18,10 @@ Usage
 	  -in PATH                   path to input file, defaults to stdin
 	  -out PATH                  path to output file, defaults to stdout
 
+	Misc Options
+	  -version                   version: ...
+	  -help                      this help
+
 Examples
 
 	$ gherkinfmt -in path/to/some.feature
@@ -32,6 +36,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"os"
 	"path"
 
@@ -50,12 +55,13 @@ var skipComments bool
 var noCommentAlign bool
 var commentAlignMinIndent int
 var verbose bool
+var runVersion bool
 var inputPath string
 var inputReader io.Reader
 var outputPath string
 var outputWriter io.Writer
 
-func initFlags() {
+func init() {
 	flag.Usage = func() {
 		self := path.Base(os.Args[0])
 		fmt.Fprintf(os.Stderr, `Usage: %[1]s OPTIONS
@@ -73,13 +79,17 @@ IO Options
   -out PATH                  path to output file, defaults to stdout
   -v                         more verbose error messages
 
+Misc Options
+  -version                   version: %[2]s
+  -help                      this help
+
 Examples:
   
   $ %[1]s -in path/to/some.feature
 
   $ cat path/to/some.feature | %[1]s -centersteps
 
-`, self)
+`, self, gherkin.VERSION)
 	}
 	flag.BoolVar(&colorsYes, "color", false, "explicitly enable colors")
 	flag.BoolVar(&colorsNo, "nocolor", false, "explicitly disable colors")
@@ -91,7 +101,13 @@ Examples:
 	flag.BoolVar(&verbose, "v", false, "more verbose error messages")
 	flag.StringVar(&inputPath, "in", "", "path to input file")
 	flag.StringVar(&outputPath, "out", "", "path to output file")
+	flag.BoolVar(&runVersion, "version", false, "version: "+gherkin.VERSION)
 	flag.Parse()
+
+	if !verbose {
+		log.SetOutput(ioutil.Discard)
+	}
+	log.Print("Initialized")
 }
 
 func usageErr(err error) {
@@ -107,8 +123,10 @@ func usageErrWithVerboseHint(err error) {
 }
 
 func main() {
-	initFlags()
-
+	if runVersion {
+		fmt.Fprintf(os.Stdout, "%s\n", gherkin.VERSION)
+		return
+	}
 	if inputPath != "" {
 		inputReader, err = os.Open(inputPath)
 		if err != nil {
@@ -149,11 +167,16 @@ func main() {
 	}
 
 	fmtr := &formater.GherkinPrettyFormater{
-		AnsiColors:  colors,
-		CenterSteps: centerSteps,
-		SkipSteps:   skipSteps,
+		AnsiColors:             colors,
+		CenterSteps:            centerSteps,
+		SkipSteps:              skipSteps,
+		SkipComments:           skipComments,
+		NoAlignComments:        noCommentAlign,
+		AlignCommentsMinIndent: commentAlignMinIndent,
 	}
 
+	log.Printf("Formater Settings: %+v", fmtr)
+
 	bytes, _ := ioutil.ReadAll(inputReader)
 	content := string(bytes)
 	gp := gherkin.NewGherkinDOMParser(content)

version.go

@@ -0,0 +1,3 @@
+package gherkin
+
+const VERSION = "v0.1.0"