Move formatters into their own directory/package

formatter.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/justbuchanan/stylize/formatters"
 	"github.com/pmezard/go-difflib/difflib"
 )
 
@@ -132,12 +133,12 @@ var (
 	// If multiple formatters apply to the same file type, their order here
 	// determines precedence. Lower index = higher priority.
 	FormatterRegistry = []Formatter{
-		&ClangFormatter{},
-		&UncrustifyFormatter{},
-		&PrettierFormatter{},
-		&YapfFormatter{},
-		&GofmtFormatter{},
-		&BuildifierFormatter{},
-		&RustfmtFormatter{},
+		&formatters.ClangFormatter{},
+		&formatters.UncrustifyFormatter{},
+		&formatters.PrettierFormatter{},
+		&formatters.YapfFormatter{},
+		&formatters.GofmtFormatter{},
+		&formatters.BuildifierFormatter{},
+		&formatters.RustfmtFormatter{},
 	}
 )

buildifier_formatter.go → formatters/buildifier.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

clang_formatter.go → formatters/clang.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

gofmt_formatter.go → formatters/gofmt.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

prettier_formatter.go → formatters/prettier.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 // https://github.com/prettier/prettier
 

rustfmt_formatter.go → formatters/rustfmt.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

uncrustify_formatter.go → formatters/uncrustify.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

formatters/util.go

@@ -0,0 +1,27 @@
+package formatters
+
+import (
+	"bytes"
+	"io"
+	"log"
+	"os/exec"
+	"strings"
+
+	"github.com/pkg/errors"
+)
+
+// Helper method that wraps exec.Command
+func runIOCommand(args []string, in io.Reader, out io.Writer) error {
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Stdin = in
+	cmd.Stdout = out
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
+	err := cmd.Run()
+	if err != nil {
+		log.Print("Error running command: ", strings.Join(args, " "))
+		return errors.Wrap(err, stderr.String())
+	}
+
+	return nil
+}

yapf_formatter.go → formatters/yapf.go

@@ -1,4 +1,4 @@
-package main
+package formatters
 
 import (
 	"io"

readme.md

@@ -41,7 +41,7 @@ Stylize currently has support for:
 -   [uncrustify](https://github.com/uncrustify/uncrustify)
 -   [rustfmt](https://github.com/rust-lang-nursery/rustfmt)
 
-Other formatters can easily be added. See the \*\_formatter.go files as examples.
+Other formatters can easily be added. See the files in the 'formatters' directory as examples.
 
 ## Python version
 

util.go

@@ -2,31 +2,13 @@ package main
 
 import (
 	"bytes"
-	"io"
-	"log"
 	"os/exec"
 	"strings"
 
 	"github.com/danwakefield/fnmatch"
 	"github.com/pkg/errors"
 )
 
-// Helper method that wraps exec.Command
-func runIOCommand(args []string, in io.Reader, out io.Writer) error {
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Stdin = in
-	cmd.Stdout = out
-	var stderr bytes.Buffer
-	cmd.Stderr = &stderr
-	err := cmd.Run()
-	if err != nil {
-		log.Print("Error running command: ", strings.Join(args, " "))
-		return errors.Wrap(err, stderr.String())
-	}
-
-	return nil
-}
-
 // Returns a list of files that have changed since the given git diffbase. These
 // file paths are relative to the root of the git repo, not necessarily the
 // given rootDir.