refactor(*): add enforcer package (#33)

cmd/enforce.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/Masterminds/semver"
-	conform "github.com/autonomy/conform/pkg"
+	"github.com/autonomy/conform/pkg/enforcer"
 	"github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )
@@ -37,11 +37,11 @@ var enforceCmd = &cobra.Command{
 		if err := checkDockerVersion(); err != nil {
 			return err
 		}
-		c, err := conform.New()
+		e, err := enforcer.New()
 		if err != nil {
 			return err
 		}
-		if err = c.Enforce(); err != nil {
+		if err = e.Enforce(); err != nil {
 			return err
 		}
 

cmd/version.go

@@ -14,24 +14,52 @@
 package cmd
 
 import (
-	"github.com/autonomy/conform/pkg/version"
+	"bytes"
+	"fmt"
+	"html/template"
+	"runtime"
+
 	"github.com/spf13/cobra"
 )
 
 var (
 	shortVersion bool
+	// Tag is set at build time.
+	Tag string
+	// SHA is set at build time.
+	SHA string
+	// Built is set at build time.
+	Built string
 )
 
+const versionTemplate = `Devise:
+	Tag:         {{ .Tag }}
+	SHA:         {{ .SHA }}
+	Built:       {{ .Built }}
+	Go version:  {{ .GoVersion }}
+	OS/Arch:     {{ .Os }}/{{ .Arch }}
+`
+
+// Version contains verbose version information.
+type Version struct {
+	Tag       string
+	SHA       string
+	Built     string
+	GoVersion string
+	Os        string
+	Arch      string
+}
+
 // versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Prints the version",
 	Long:  ``,
 	Run: func(cmd *cobra.Command, args []string) {
 		if shortVersion {
-			version.PrintShortVersion()
+			PrintShortVersion()
 		} else {
-			version.PrintLongVersion()
+			PrintLongVersion()
 		}
 	},
 }
@@ -40,3 +68,33 @@ func init() {
 	versionCmd.Flags().BoolVar(&shortVersion, "short", false, "Print the short version")
 	RootCmd.AddCommand(versionCmd)
 }
+
+// PrintLongVersion prints verbose version information.
+func PrintLongVersion() {
+	v := Version{
+		Tag:       Tag,
+		SHA:       SHA,
+		GoVersion: runtime.Version(),
+		Os:        runtime.GOOS,
+		Arch:      runtime.GOARCH,
+		Built:     Built,
+	}
+
+	var wr bytes.Buffer
+	tmpl, err := template.New("version").Parse(versionTemplate)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	err = tmpl.Execute(&wr, v)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	fmt.Println(wr.String())
+}
+
+// PrintShortVersion prints the tag and sha.
+func PrintShortVersion() {
+	fmt.Println(fmt.Sprintf("Devise %s-%s", Tag, SHA))
+}

pkg/conform.go → pkg/enforcer/enforcer.go

@@ -1,4 +1,4 @@
-package conform
+package enforcer
 
 import (
 	"fmt"