refactor(*): rename conform directory to pkg (#30)

siderolabs · Jul 23, 2017 · bd3404a · bd3404a
1 parent daa39f3
commit bd3404a
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 32 deletions.
diff --git a/.conform.yaml b/.conform.yaml
@@ -91,9 +91,9 @@ tasks:
       WORKDIR $GOPATH/src/github.com/{{ .Repository }}
       COPY ./ ./
       {{ if and .Git.IsClean .Git.IsTag }}
-      RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /conform -ldflags "-X \"github.com/{{ .Repository }}/conform/version.Tag={{ trimAll "v" .Git.Tag }}\" -X \"github.com/{{ .Repository }}/conform/version.SHA={{ .Git.SHA }}\" -X \"github.com/{{ .Repository }}/conform/version.Built={{ .Built }}\""
+      RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /conform -ldflags "-X \"github.com/{{ .Repository }}/pkg/version.Tag={{ trimAll "v" .Git.Tag }}\" -X \"github.com/{{ .Repository }}/pkg/version.SHA={{ .Git.SHA }}\" -X \"github.com/{{ .Repository }}/pkg/version.Built={{ .Built }}\""
       {{ else if .Git.IsClean }}
-      RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /conform -ldflags "-X \"github.com/{{ .Repository }}/conform/version.SHA={{ .Git.SHA }}\" -X \"github.com/{{ .Repository }}/conform/version.Built={{ .Built }}\""
+      RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /conform -ldflags "-X \"github.com/{{ .Repository }}/pkg/version.SHA={{ .Git.SHA }}\" -X \"github.com/{{ .Repository }}/pkg/version.Built={{ .Built }}\""
       {{ else }}
       RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /conform
       {{ end }}

diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,7 @@
 *
 !cmd
-!conform
 !Gopkg*
 !main.go
+!pkg
 !scripts
 !vendor
diff --git a/cmd/enforce.go b/cmd/enforce.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/Masterminds/semver"
-	"github.com/autonomy/conform/conform"
+	conform "github.com/autonomy/conform/pkg"
 	"github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/version.go b/cmd/version.go
@@ -14,7 +14,7 @@
 package cmd
 
 import (
-	"github.com/autonomy/conform/conform/version"
+	"github.com/autonomy/conform/pkg/version"
 	"github.com/spf13/cobra"
 )
 

diff --git a/conform/conform.go → pkg/conform.go b/conform/conform.go → pkg/conform.go
@@ -5,13 +5,13 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/pipeline"
-	"github.com/autonomy/conform/conform/policy"
-	"github.com/autonomy/conform/conform/policy/conventionalcommit"
-	"github.com/autonomy/conform/conform/script"
-	"github.com/autonomy/conform/conform/stage"
-	"github.com/autonomy/conform/conform/task"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/pipeline"
+	"github.com/autonomy/conform/pkg/policy"
+	"github.com/autonomy/conform/pkg/policy/conventionalcommit"
+	"github.com/autonomy/conform/pkg/script"
+	"github.com/autonomy/conform/pkg/stage"
+	"github.com/autonomy/conform/pkg/task"
 	"github.com/mitchellh/mapstructure"
 
 	yaml "gopkg.in/yaml.v2"

diff --git a/conform/git/git.go → pkg/git/git.go b/conform/git/git.go → pkg/git/git.go
diff --git a/conform/metadata/metadata.go → pkg/metadata/metadata.go b/conform/metadata/metadata.go → pkg/metadata/metadata.go
@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
-	"github.com/autonomy/conform/conform/git"
-	"github.com/autonomy/conform/conform/utilities"
+	"github.com/autonomy/conform/pkg/git"
+	"github.com/autonomy/conform/pkg/utilities"
 )
 
 // Metadata contains metadata.

diff --git a/conform/pipeline/pipeline.go → pkg/pipeline/pipeline.go b/conform/pipeline/pipeline.go → pkg/pipeline/pipeline.go
@@ -7,9 +7,9 @@ import (
 	"path"
 	"strings"
 
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/stage"
-	"github.com/autonomy/conform/conform/task"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/stage"
+	"github.com/autonomy/conform/pkg/task"
 )
 
 // Pipeline defines the stages and artifacts.

diff --git a/.../conventionalcommit/conventionalcommit.go → .../conventionalcommit/conventionalcommit.go b/.../conventionalcommit/conventionalcommit.go → .../conventionalcommit/conventionalcommit.go
@@ -5,10 +5,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/pipeline"
-	"github.com/autonomy/conform/conform/policy"
-	"github.com/autonomy/conform/conform/task"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/pipeline"
+	"github.com/autonomy/conform/pkg/policy"
+	"github.com/autonomy/conform/pkg/task"
 )
 
 // Conventional implements the policy.Policy interface and enforces commit

diff --git a/...entionalcommit/conventionalcommit_test.go → ...entionalcommit/conventionalcommit_test.go b/...entionalcommit/conventionalcommit_test.go → ...entionalcommit/conventionalcommit_test.go
@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/autonomy/conform/conform/git"
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/policy"
+	"github.com/autonomy/conform/pkg/git"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/policy"
 )
 
 func RemoveAll(dir string) {

diff --git a/conform/policy/policy.go → pkg/policy/policy.go b/conform/policy/policy.go → pkg/policy/policy.go
@@ -1,9 +1,9 @@
 package policy
 
 import (
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/pipeline"
-	"github.com/autonomy/conform/conform/task"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/pipeline"
+	"github.com/autonomy/conform/pkg/task"
 )
 
 // Option is a functional option used to pass in arguments to a Policy.

diff --git a/conform/policy/version/version.go → pkg/policy/version/version.go b/conform/policy/version/version.go → pkg/policy/version/version.go
diff --git a/conform/renderer/renderer.go → pkg/renderer/renderer.go b/conform/renderer/renderer.go → pkg/renderer/renderer.go
@@ -5,7 +5,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"github.com/autonomy/conform/conform/metadata"
+	"github.com/autonomy/conform/pkg/metadata"
 )
 
 // Renderer renders all pipeline templates.

diff --git a/conform/script/script.go → pkg/script/script.go b/conform/script/script.go → pkg/script/script.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/renderer"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/renderer"
 )
 
 // Script defines a template that can be executed.

diff --git a/conform/stage/stage.go → pkg/stage/stage.go b/conform/stage/stage.go → pkg/stage/stage.go
diff --git a/conform/task/task.go → pkg/task/task.go b/conform/task/task.go → pkg/task/task.go
@@ -1,8 +1,8 @@
 package task
 
 import (
-	"github.com/autonomy/conform/conform/metadata"
-	"github.com/autonomy/conform/conform/renderer"
+	"github.com/autonomy/conform/pkg/metadata"
+	"github.com/autonomy/conform/pkg/renderer"
 )
 
 // Task defines a stage that can be used within a pipeline.

diff --git a/conform/utilities/utilities.go → pkg/utilities/utilities.go b/conform/utilities/utilities.go → pkg/utilities/utilities.go
diff --git a/conform/version/version.go → pkg/version/version.go b/conform/version/version.go → pkg/version/version.go