Merge pull request #13 from fabiorphp/feature/folder-structure

Change the folder structure and build
mre · Oct 11, 2018 · cc09409 · cc09409
2 parents e91b2be + 5c4e42d
commit cc09409
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,8 @@
 .glide/
 dist/
 
-riffraff
-
 # Coverage files
 cover*
+
+# Build folder
+build/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,8 +1,17 @@
+# This is an example goreleaser.yaml file with some sane defaults.
+# Make sure to check the documentation at http://goreleaser.com
+project_name: riffraff
+dist: ./build
+before:
+  hooks:
+    - make clean
+    - make configure
 builds:
-  - binary: riffraff
+  - main: ./cmd/riffraff/main.go
+    binary: riffraff
     goos:
-      - windows
       - darwin
       - linux
+      - windows
     goarch:
-      - amd64
+      - amd64
diff --git a/Makefile b/Makefile
@@ -2,14 +2,19 @@
 
 # Build app
 build:
-	go build
+	@go build -v -o ./build/riffraff github.com/mre/riffraff/cmd/riffraff
 .PHONY: build
 
 # Clean up
 clean:
-	@rm -fR ./cover*
+	@rm -fR ./build/ ./cover*
 .PHONY: clean
 
+# Creates folders
+configure:
+	@mkdir -p ./build
+.PHONY: configure
+
 # Run tests and generates html coverage file
 cover: test
 	@go tool cover -html=./coverage.text -o ./coverage.html

diff --git a/main.go → cmd/riffraff/main.go b/main.go → cmd/riffraff/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/bndr/gojenkins"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
-	"github.com/mre/riffraff/commands"
+	"github.com/mre/riffraff/internal/commands"
 )
 
 var (

diff --git a/commands/build.go → internal/commands/build.go b/commands/build.go → internal/commands/build.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/bndr/gojenkins"
-	"github.com/mre/riffraff/job"
+	"github.com/mre/riffraff/internal/job"
 )
 
 type Build struct {

diff --git a/commands/diff.go → internal/commands/diff.go b/commands/diff.go → internal/commands/diff.go
diff --git a/commands/logs.go → internal/commands/logs.go b/commands/logs.go → internal/commands/logs.go
diff --git a/commands/nodes.go → internal/commands/nodes.go b/commands/nodes.go → internal/commands/nodes.go
diff --git a/commands/open.go → internal/commands/open.go b/commands/open.go → internal/commands/open.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"log"
 
-	"github.com/mre/riffraff/job"
+	"github.com/mre/riffraff/internal/job"
 
 	"github.com/bndr/gojenkins"
 	"github.com/skratchdot/open-golang/open"

diff --git a/commands/queue.go → internal/commands/queue.go b/commands/queue.go → internal/commands/queue.go
diff --git a/commands/status.go → internal/commands/status.go b/commands/status.go → internal/commands/status.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/bndr/gojenkins"
 	"github.com/fatih/color"
-	"github.com/mre/riffraff/job"
+	"github.com/mre/riffraff/internal/job"
 )
 
 type Status struct {

diff --git a/job/find.go → internal/job/find.go b/job/find.go → internal/job/find.go