linting

Author: yazgazan

.travis.yml

@@ -3,11 +3,13 @@ go:
     - 1.8
 
 before_install:
-    - go get golang.org/x/tools/cmd/cover
-    - go get github.com/mattn/goveralls
+    - go get -u golang.org/x/tools/cmd/cover
+    - go get -u github.com/mattn/goveralls
+    - go get -u github.com/alecthomas/gometalinter
 
 script:
     - go build
+    - gometalinter
     - go test -v ./...
     - go test -v -covermode=count -coverprofile=coverage.out ./diff
     - $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN

config.go

@@ -9,16 +9,16 @@ import (
 )
 
 type config struct {
-	Output
-	Ignore       Patterns `long:"ignore" short:"i" description:"paths to ignore (glob)"`
-	OutputReport bool     `long:"report" short:"r" description:"output report format"`
-	Files        struct {
+	Files struct {
 		LHS string `positional-arg-name:"FILE_1"`
 		RHS string `positional-arg-name:"FILE_2"`
 	} `positional-args:"yes" required:"yes"`
+	Ignore ignorePatterns `long:"ignore" short:"i" description:"paths to ignore (glob)"`
+	output
+	OutputReport bool `long:"report" short:"r" description:"output report format"`
 }
 
-type Output struct {
+type output struct {
 	Indent    string `long:"indent" description:"indent string" default:"\t"`
 	ShowTypes bool   `long:"show-types" short:"t" description:"show types"`
 	Colorized bool
@@ -33,10 +33,10 @@ func readConfig() config {
 			os.Exit(0)
 		}
 		fmt.Fprintf(os.Stderr, "Failed to parse arguments. See %s --help\n", os.Args[0])
-		os.Exit(2)
+		os.Exit(statusUsage)
 	}
 
-	c.Output.Colorized = terminal.IsTerminal(int(os.Stdout.Fd()))
+	c.output.Colorized = terminal.IsTerminal(int(os.Stdout.Fd()))
 
 	return c
 }

diff/diff_test.go

@@ -428,7 +428,7 @@ func TestReport(t *testing.T) {
 	}
 	ss, err := Report(d, testOutput)
 	if err != nil {
-		t.Errorf("Report(Diff(...), %+v): unexpected error: %s", err, testOutput)
+		t.Errorf("Report(Diff(...), %+v): unexpected error: %s", testOutput, err)
 		return
 	}
 

main.go

@@ -10,10 +10,11 @@ import (
 )
 
 const (
-	StatusDiffMismatch   = 1
-	StatusReadError      = 3
-	StatusUnmarshalError = 4
-	StatusDiffError      = 5
+	statusDiffMismatch   = 1
+	statusUsage          = 2
+	statusReadError      = 3
+	statusUnmarshalError = 4
+	statusDiffError      = 5
 )
 
 func main() {
@@ -26,29 +27,33 @@ func main() {
 	d, err := diff.Diff(lhs, rhs)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: diff failed: %s", err)
-		os.Exit(StatusDiffError)
+		os.Exit(statusDiffError)
 	}
 
 	d, err = pruneIgnore(d, conf.Ignore)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error: ignoring failed: %s", err)
+		os.Exit(statusDiffError)
+	}
 
 	if conf.OutputReport {
-		ss, err := diff.Report(d, diff.Output(conf.Output))
+		ss, err := diff.Report(d, diff.Output(conf.output))
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error: Failed to generate report: %s", err)
-			os.Exit(StatusDiffError)
+			os.Exit(statusDiffError)
 		}
 		for _, s := range ss {
 			fmt.Println(s)
 		}
 	} else {
-		fmt.Println(d.StringIndent("", "", diff.Output(conf.Output)))
+		fmt.Println(d.StringIndent("", "", diff.Output(conf.output)))
 	}
 	if d.Diff() != diff.Identical {
-		os.Exit(StatusDiffMismatch)
+		os.Exit(statusDiffMismatch)
 	}
 }
 
-func pruneIgnore(d diff.Differ, ignore Patterns) (diff.Differ, error) {
+func pruneIgnore(d diff.Differ, ignore ignorePatterns) (diff.Differ, error) {
 	return diff.Walk(d, func(parent diff.Differ, d diff.Differ, path string) (diff.Differ, error) {
 		if ignore.Match(path) {
 			return diff.Ignore()
@@ -64,12 +69,12 @@ func parseFile(fname string) interface{} {
 	b, err := ioutil.ReadFile(fname)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: cannot read %s\n", fname)
-		os.Exit(StatusReadError)
+		os.Exit(statusReadError)
 	}
 	err = json.Unmarshal(b, &val)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: cannot parse %s: %s\n", fname, err)
-		os.Exit(StatusUnmarshalError)
+		os.Exit(statusUnmarshalError)
 	}
 
 	return val

patterns.go

@@ -6,14 +6,14 @@ import (
 	"github.com/gobwas/glob"
 )
 
-type Pattern struct {
+type ignorePattern struct {
 	glob.Glob
 	s string
 }
 
-type Patterns []Pattern
+type ignorePatterns []ignorePattern
 
-func (p Patterns) String() string {
+func (p ignorePatterns) String() string {
 	var ss []string
 
 	for _, pattern := range p {
@@ -23,20 +23,20 @@ func (p Patterns) String() string {
 	return strings.Join(ss, ",")
 }
 
-func (p *Patterns) Set(s string) error {
+func (p *ignorePatterns) Set(s string) error {
 	pattern, err := glob.Compile(s)
 	if err != nil {
 		return err
 	}
-	*p = append(*p, Pattern{
+	*p = append(*p, ignorePattern{
 		s:    s,
 		Glob: pattern,
 	})
 
 	return nil
 }
 
-func (p Patterns) Match(s string) bool {
+func (p ignorePatterns) Match(s string) bool {
 	for _, pattern := range p {
 		if pattern.Match(s) {
 			return true