Merge pull request #4 from abice/ci

Added CI

.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2
+jobs:
+  build:
+    working_directory: /go/src/github.com/abice/go-enum
+    docker:
+      - image: circleci/golang:1.8.1
+    steps:
+      - checkout
+      - run:
+          name: Install Go Deps
+          command: |
+            go get github.com/golang/dep/cmd/dep
+            go get -v github.com/jteeuwen/go-bindata/...
+            go get -v golang.org/x/tools/cmd/cover
+            go get -v github.com/mattn/goveralls
+            go get -v github.com/modocache/gover
+            dep ensure
+      - run:
+          name: Build
+          command: |
+            make build
+      - run:
+          name: Test
+          command: |
+            make cover
+            make coveralls
+      - persist_to_workspace:
+          root: .
+          paths: .
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build:

.gitignore

@@ -14,4 +14,5 @@
 .glide/
 
 /bin
-/coverage
+/coverage
+/vendor

Gopkg.toml

@@ -0,0 +1,34 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  name = "github.com/Masterminds/sprig"
+
+[[constraint]]
+  name = "github.com/mkideal/cli"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+
+[[constraint]]
+  name = "golang.org/x/tools"

Makefile

@@ -5,14 +5,22 @@ ifdef CIRCLE_ARTIFACTS
 	SERVICE=circle-ci
 endif
 
+PACKAGES='./generator' './example'
+
 .PHONY: all
 all: generate fmt build test example cover install 
 
 .PHONY: install-deps
 install-deps:
-	glide install
-
-build: generate
+	go get github.com/golang/dep/cmd/dep
+	go get -v github.com/jteeuwen/go-bindata/...
+	go get -v golang.org/x/tools/cmd/cover
+	go get -v github.com/mattn/goveralls
+	go get -v github.com/modocache/gover
+	dep ensure
+
+build:
+	go generate ./generator
 	if [ ! -d bin ]; then mkdir bin; fi
 	go build -v -o bin/go-enum .
 
@@ -23,24 +31,25 @@ test: generate gen-test
 	if [ ! -d coverage ]; then mkdir coverage; fi
 	go test -v ./generator -race -cover -coverprofile=$(COVERAGEDIR)/generator.coverprofile
 
-cover:
+cover: gen-test
 	go tool cover -html=$(COVERAGEDIR)/generator.coverprofile -o $(COVERAGEDIR)/generator.html
 
 tc: test cover
 coveralls:
 	gover $(COVERAGEDIR) $(COVERAGEDIR)/coveralls.coverprofile
 	goveralls -coverprofile=$(COVERAGEDIR)/coveralls.coverprofile -service=$(SERVICE) -repotoken=$(COVERALLS_TOKEN)
+
 clean:
 	go clean
 	rm -f bin/go-enum
 	rm -rf coverage/
 
 .PHONY: generate
 generate:
-	go generate $$(glide nv)
+	go generate $(PACKAGES)
 
 gen-test: build install
-	go generate $$(glide nv)
+	go generate $(PACKAGES)
 
 install:
 	go install

README.md

@@ -1,6 +1,10 @@
 # go-enum
+[![CircleCI](https://circleci.com/gh/abice/go-enum.svg?style=svg&circle-token=b44c10ce16bcef76e86da801d67811a5ff71fc72)](https://circleci.com/gh/abice/go-enum)
+[![Go Report Card](https://goreportcard.com/badge/github.com/abice/go-enum)](https://goreportcard.com/report/github.com/abice/go-enum)
+
 An enum generator for go
 
+
 ## How it works
 
 The goal of go-enum is to create an easy to use enum generator that will take a decorated type declaration like `type EnumName int` and create the associated constant values and funcs that will make life a little easier for adding new values.

generator/generator.go

@@ -33,13 +33,15 @@ type Generator struct {
 	marshal         bool
 }
 
+// Enum holds data for a discovered enum in the parsed source
 type Enum struct {
 	Name   string
 	Prefix string
 	Type   string
 	Values []EnumValue
 }
 
+// EnumValue holds the individual data for each enum value within the found enum.
 type EnumValue struct {
 	Name         string
 	PrefixedName string
@@ -143,7 +145,7 @@ func (g *Generator) Generate(f *ast.File) ([]byte, error) {
 			"marshal":   g.marshal,
 		}
 
-		err = g.t.ExecuteTemplate(vBuff, "enum", data)
+		g.t.ExecuteTemplate(vBuff, "enum", data)
 	}
 
 	formatted, err := imports.Process(pkg, vBuff.Bytes(), nil)

main.go

@@ -17,6 +17,7 @@ type rootT struct {
 	NoPrefix  bool     `cli:"noprefix" usage:"Prevents the constants generated from having the Enum as a prefix."`
 	Lowercase bool     `cli:"lower" usage:"Adds lowercase variants of the enum strings for lookup."`
 	Marshal   bool     `cli:"marshal" usage:"Adds text marshalling functions."`
+	Prefix    string   `cli:"prefix" usage:"Replaces the prefix with a user one."`
 }
 
 func main() {