Merge pull request #55 from target/cmd

refactor: move main.go to /cmd/flottbot
target · Sep 17, 2018 · badca3f · badca3f
2 parents 8127df9 + 39324ae
commit badca3f
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,6 +57,7 @@ Temporary Items
 .env
 debug
 flottbot
+!flottbot/
 
 ### Git ###
 vendor
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,26 @@
 language: go
 go:
-- '1.11'
+  - "1.11"
 before_install:
-- go get github.com/mattn/goveralls
-- go get github.com/fzipp/gocyclo
-- go get github.com/golang/dep/cmd/dep
+  - go get github.com/mattn/goveralls
+  - go get github.com/fzipp/gocyclo
+  - go get github.com/golang/dep/cmd/dep
 before_script:
-- echo $TRAVIS_COMMIT
-- echo $TRAVIS_TAG
-- echo $TRAVIS_BRANCH
-- echo $TRAVIS_BUILD_NUMBER
-- echo $TRAVIS_REPO_SLUG
-- dep ensure
+  - echo $TRAVIS_COMMIT
+  - echo $TRAVIS_TAG
+  - echo $TRAVIS_BRANCH
+  - echo $TRAVIS_BUILD_NUMBER
+  - echo $TRAVIS_REPO_SLUG
+  - dep ensure
 script:
-- go vet $(go list ./... | grep -v vendor)
-- go test -v -race  -coverprofile=coverage.out -coverpkg=./... $(go list ./... | grep
-  -v vendor)
-- gocyclo -over 18 `find . -iname '*.go' | grep -v vendor | grep -v '_test.go'`
-- "$GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci"
+  - go vet $(go list ./... | grep -v vendor)
+  - go test -v -race  -coverprofile=coverage.out -coverpkg=./... $(go list ./... | grep -v vendor)
+  - gocyclo -over 18 `find . -iname '*.go' | grep -v vendor | grep -v '_test.go'`
+  - "$GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci"
 before_deploy:
-- go get github.com/mitchellh/gox
-- gox -ldflags "-X github.com/target/flottbot/version.Version=${TRAVIS_TAG} -X github.com/target/flottbot/version.GitHash=${TRAVIS_COMMIT}"
-  -os="linux darwin windows" -arch="amd64" -verbose ./...
-- "./tar-release.sh"
+  - go get github.com/mitchellh/gox
+  - gox -ldflags "-X github.com/target/flottbot/version.Version=${TRAVIS_TAG} -X github.com/target/flottbot/version.GitHash=${TRAVIS_COMMIT}" -os="linux darwin windows" -arch="amd64" -verbose ./...
+  - "./tar-release.sh"
 deploy:
   provider: releases
   api_key:

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,47 +1,45 @@
 {
     "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build-debug",
-            "type": "shell",
-            "command": "go",
-            "group": "build",
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared"
-            },
+    "tasks": [{
+        "label": "build-debug",
+        "type": "shell",
+        "command": "go",
+        "group": "build",
+        "presentation": {
+            "echo": true,
+            "reveal": "never",
+            "focus": false,
+            "panel": "shared"
+        },
+        "args": [
+            "build",
+            "-i",
+            "-gcflags",
+            "'-N -l'"
+        ],
+        "linux": {
             "args": [
-                "build",
-                "-i",
-                "-gcflags",
-                "'-N -l'"
-            ],
-            "linux": {
-                "args": [
-                    "-o",
-                    "debug",
-                    "${workspaceRoot}/main.go"
-                ]
-            },
-            "osx": {
-                "args": [
-                    "-o",
-                    "debug",
-                    "${workspaceRoot}/main.go"
-                ]
-            },
-            "windows": {
-                "args": [
-                    "-o",
-                    "debug.exe",
-                    "\"${workspaceRoot}\\main.go\""
-                ]
-            },
-            "problemMatcher": [
-                "$go"
+                "-o",
+                "debug",
+                "${workspaceRoot}/cmd/flottbot/main.go"
             ]
-        }
-    ]
+        },
+        "osx": {
+            "args": [
+                "-o",
+                "debug",
+                "${workspaceRoot}/cmd/flottbot/main.go"
+            ]
+        },
+        "windows": {
+            "args": [
+                "-o",
+                "debug.exe",
+                "\"${workspaceRoot}\\cmd\\flottbot\\main.go\""
+            ]
+        },
+        "problemMatcher": [
+            "$go"
+        ]
+    }]
 }
diff --git a/main.go → cmd/flottbot/main.go b/main.go → cmd/flottbot/main.go
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -8,7 +8,7 @@ COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
-    -o flottbot .
+    -o flottbot ./cmd/flottbot
 
 FROM alpine:3.8
 RUN apk --no-cache add ca-certificates

diff --git a/docker/Dockerfile.golang b/docker/Dockerfile.golang
@@ -8,7 +8,7 @@ COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
-    -o flottbot .
+    -o flottbot ./cmd/flottbot
 
 FROM golang:1.11-alpine
 RUN apk add --no-cache git

diff --git a/docker/Dockerfile.ruby b/docker/Dockerfile.ruby
@@ -8,7 +8,7 @@ COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
-    -o flottbot .
+    -o flottbot ./cmd/flottbot
 
 FROM ruby:2.5-alpine
 RUN apk add --no-cache ruby-dev build-base