adding makefile, adding vendor

gaggl · Mar 6, 2017 · 0d299f7 · 0d299f7
1 parent 1da1fb0
commit 0d299f7
Show file tree

Hide file tree

Showing 71 changed files with 7,656 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-vendor/
+release/
 marten
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,5 @@
+language: go
+go:
+  - 1.7
+  - 1.8
+script: make test
diff --git a/Makefile b/Makefile
@@ -0,0 +1,23 @@
+VERSION=$(shell git describe --tags)
+GODEP_PATH=$(shell pwd)/vendor
+ORIGINAL_PATH=$(shell echo $(GOPATH))
+COMBINED_GOPATH=$(GODEP_PATH):$(ORIGINAL_PATH)
+
+.PHONY: build clean test package release 
+
+build:
+	GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version=$(VERSION)" -o marten ./cmd
+
+clean: 
+	rm -rf release/
+	rm -rf marten
+
+test:
+	echo "Testing with" `go version`
+	GOMAXPROCS=4 GOPATH=$(COMBINED_GOPATH) go test -cover ./toxics
+
+package:
+	mkdir -p release
+	GOOS=linux GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -ldflags="-X github.com/Shopify/toxiproxy.Version=$(VERSION)" -o "release/marten_linux_amd64" ./cmd 
+
+release: clean package
diff --git a/main.go → cmd/main.go b/main.go → cmd/main.go
diff --git a/response.go → toxics/response.go b/response.go → toxics/response.go
@@ -1,4 +1,4 @@
-package main
+package toxics 
 
 import (
 	"bufio"

diff --git a/toxics/response_test.go b/toxics/response_test.go
@@ -0,0 +1,14 @@
+package toxics_test
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSomething(t *testing.T) {
+
+	var a string = "Hello"
+	var b string = "Hello"
+
+	assert.Equal(t, a, b, "The two words should be the same.")
+}
diff --git a/vendor/github.com/Shopify/toxiproxy/.gitignore b/vendor/github.com/Shopify/toxiproxy/.gitignore
diff --git a/vendor/github.com/Shopify/toxiproxy/CHANGELOG.md b/vendor/github.com/Shopify/toxiproxy/CHANGELOG.md
diff --git a/vendor/github.com/Shopify/toxiproxy/CREATING_TOXICS.md b/vendor/github.com/Shopify/toxiproxy/CREATING_TOXICS.md
diff --git a/vendor/github.com/Shopify/toxiproxy/Dockerfile b/vendor/github.com/Shopify/toxiproxy/Dockerfile
diff --git a/vendor/github.com/Shopify/toxiproxy/LICENSE b/vendor/github.com/Shopify/toxiproxy/LICENSE