feat: adding command line flag for commit msg

This allows someone to use `conform enforce` for commit-msg git hooks.

fix: removing commented code

fix: adding a check for ioutil reading the commit msg file

cmd/build.go

@@ -44,7 +44,7 @@ var buildCmd = &cobra.Command{
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		e, err := enforcer.New()
+		e, err := enforcer.New(cmd.Flags())
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)

cmd/enforce.go

@@ -33,7 +33,7 @@ var enforceCmd = &cobra.Command{
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		e, err := enforcer.New()
+		e, err := enforcer.New(cmd.Flags())
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
@@ -46,5 +46,6 @@ var enforceCmd = &cobra.Command{
 }
 
 func init() {
+	enforceCmd.Flags().String("commit-msg-file", "", "the path to the temporary commit message file")
 	RootCmd.AddCommand(enforceCmd)
 }

pkg/enforcer/enforcer.go

@@ -13,6 +13,7 @@ import (
 	"github.com/autonomy/conform/pkg/stage"
 	"github.com/autonomy/conform/pkg/task"
 	"github.com/mitchellh/mapstructure"
+	flag "github.com/spf13/pflag"
 
 	yaml "gopkg.in/yaml.v2"
 )
@@ -41,7 +42,7 @@ var policyMap = map[string]policy.Policy{
 }
 
 // New loads the conform.yaml file and unmarshals it into a Conform struct.
-func New() (*Conform, error) {
+func New(flags *flag.FlagSet) (*Conform, error) {
 	configBytes, err := ioutil.ReadFile(".conform.yaml")
 	if err != nil {
 		return nil, err
@@ -52,6 +53,8 @@ func New() (*Conform, error) {
 		return nil, err
 	}
 
+	c.Metadata.Flags = flags
+
 	return c, nil
 }
 

pkg/metadata/metadata.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/Masterminds/semver"
 	"github.com/autonomy/conform/pkg/git"
+	flag "github.com/spf13/pflag"
 )
 
 // Metadata contains metadata.
@@ -14,6 +15,7 @@ type Metadata struct {
 	Git        *Git
 	Version    *Version
 	Variables  VariablesMap `yaml:"variables"`
+	Flags      *flag.FlagSet
 	Built      string
 }
 

pkg/policy/conventionalcommit/conventionalcommit.go

@@ -2,9 +2,11 @@ package conventionalcommit
 
 import (
 	"fmt"
+	"io/ioutil"
 	"regexp"
 	"strings"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/autonomy/conform/pkg/metadata"
 	"github.com/autonomy/conform/pkg/pipeline"
 	"github.com/autonomy/conform/pkg/policy"
@@ -37,12 +39,21 @@ const TypeFix = "fix"
 // Compliance implements the policy.Policy.Compliance function.
 func (c *Conventional) Compliance(metadata *metadata.Metadata, options ...policy.Option) (report policy.Report) {
 	report = policy.Report{}
-	if !metadata.Git.IsClean {
-		return
+	var commitMsgFile string
+	if metadata.Flags != nil {
+		commitMsgFile = metadata.Flags.Lookup("commit-msg-file").Value.String()
+	}
+	msg := metadata.Git.Message // start with last commit message in log
+	if commitMsgFile != "" {
+		contents, err := ioutil.ReadFile(commitMsgFile)
+		if err != nil {
+			log.Fatal(err)
+		}
+		msg = string(contents)
 	}
-	groups := parseHeader(metadata.Git.Message)
+	groups := parseHeader(msg)
 	if len(groups) != 6 {
-		report.Errors = append(report.Errors, fmt.Errorf("Invalid commit format: %s", metadata.Git.Message))
+		report.Errors = append(report.Errors, fmt.Errorf("Invalid commit format: %s", msg))
 		return
 	}
 	ValidateHeaderLength(&report, groups)