Merge pull request #8 from hypnoglow/tests

Tests + refactoring

.gitignore

@@ -1,2 +1,3 @@
 /dotbro
 /go-carpet-coverage*
+/cover.out

cleaner.go

@@ -54,10 +54,10 @@ func cleanFiles(dirPath string, files []os.FileInfo) error {
 
 		if !removedAny {
 			removedAny = true
-			outInfo("Cleaning dead symlinks...")
+			outputer.OutInfo("Cleaning dead symlinks...")
 		}
 
-		outInfo("  ✓ %s has been removed (broken symlink)", filepath)
+		outputer.OutInfo("  ✓ %s has been removed (broken symlink)", filepath)
 	}
 
 	return nil

cleaner_test.go

@@ -1,9 +1,6 @@
 package main
 
-import (
-	"fmt"
-	"testing"
-)
+import "testing"
 
 func TestCleanDeadSymlinks(t *testing.T) {
 	var dirpath string
@@ -14,22 +11,22 @@ func TestCleanDeadSymlinks(t *testing.T) {
 	if err == nil {
 		t.Errorf("[FAIL] cleanDeadSymlinks(%q) -> should error\n", dirpath)
 	} else {
-		fmt.Printf("[OK] cleanDeadSymlinks(%q) -> errored with %q\n", dirpath, err)
+		t.Logf("[OK] cleanDeadSymlinks(%q) -> errored with %q\n", dirpath, err)
 	}
 
 	dirpath = "/home/hypnoglow/.vimrc"
 	err = cleanDeadSymlinks(dirpath)
 	if err == nil {
 		t.Errorf("[FAIL] cleanDeadSymlinks(%q) -> should error\n", dirpath)
 	} else {
-		fmt.Printf("[OK] cleanDeadSymlinks(%q) -> errored with %q\n", dirpath, err)
+		t.Logf("[OK] cleanDeadSymlinks(%q) -> errored with %q\n", dirpath, err)
 	}
 
 	dirpath = "/tmp"
 	err = cleanDeadSymlinks(dirpath)
 	if err != nil {
 		t.Errorf("[FAIL] cleanDeadSymlinks(%q) -> should not error, but errored: %q\n", dirpath, err)
 	} else {
-		fmt.Printf("[OK] cleanDeadSymlinks(%q) -> should not error\n", dirpath)
+		t.Logf("[OK] cleanDeadSymlinks(%q) -> should not error\n", dirpath)
 	}
 }

configuration.go

@@ -36,8 +36,6 @@ type Files struct {
 
 // NewConfiguration returns a new Configuration.
 func NewConfiguration(filename string) (conf *Configuration, err error) {
-	logger.msg("Parsing config file %s", filename)
-
 	switch filepath.Ext(filename) {
 	case ".toml":
 		conf, err = fromTOML(filename)

docopt.go

@@ -4,7 +4,8 @@ import "github.com/docopt/docopt-go"
 
 const version = "0.2.0"
 
-func parseArguments() (map[string]interface{}, error) {
+// ParseArguments parses arguments, that were passed to the dotbro, by docopt.
+func ParseArguments(argv []string) (map[string]interface{}, error) {
 	usage := `dotbro - simple yet effective dotfiles manager.
 
 Usage:
@@ -27,5 +28,5 @@ Other options:
   -V --version            Show version.
 `
 
-	return docopt.Parse(usage, nil, true, "dotbro "+version, false)
+	return docopt.Parse(usage, argv, true, "dotbro "+version, false)
 }

docopt_test.go

@@ -0,0 +1,10 @@
+package main
+
+import "testing"
+
+func TestParseArguments(t *testing.T) {
+	_, err := ParseArguments([]string{"--quiet"})
+	if err != nil {
+		t.Fatalf("Error parsing arguments: %v", err.Error())
+	}
+}

fileutils.go

@@ -3,13 +3,26 @@ package main
 import (
 	"fmt"
 	"io"
-	"os"
 	"path"
 )
 
+// IsExists reports whether path exists (path may be a file or a directory).
+func IsExists(osfs OS, path string) (bool, error) {
+	_, err := osfs.Stat(path)
+	if osfs.IsNotExist(err) {
+		return false, nil
+	}
+
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}
+
 // Copy copies a file from src to dst.
-func Copy(src, dst string) error {
-	sfi, err := os.Lstat(src)
+func Copy(osfs OS, src, dst string) error {
+	sfi, err := osfs.Lstat(src)
 	if err != nil {
 		return err
 	}
@@ -18,9 +31,9 @@ func Copy(src, dst string) error {
 		return fmt.Errorf("Non-regular source file %s (%q)", sfi.Name(), sfi.Mode().String())
 	}
 
-	dfi, err := os.Stat(dst)
+	dfi, err := osfs.Stat(dst)
 	if err != nil {
-		if !os.IsNotExist(err) {
+		if !osfs.IsNotExist(err) {
 			return err
 		}
 		// file not exists - do not do anything
@@ -31,16 +44,16 @@ func Copy(src, dst string) error {
 		}
 	}
 
-	err = copyFileContents(src, dst)
+	err = copyFileContents(osfs, src, dst)
 	return err
 }
 
 // copyFileContents copies the contents of the file named src to the file named
 // by dst. The file will be created if it does not already exist. If the
 // destination file exists, all it's contents will be replaced by the contents
 // of the source file.
-func copyFileContents(src, dst string) (err error) {
-	in, err := os.Open(src)
+func copyFileContents(osfs OS, src, dst string) (err error) {
+	in, err := osfs.Open(src)
 	if err != nil {
 		return
 	}
@@ -52,12 +65,12 @@ func copyFileContents(src, dst string) (err error) {
 		}
 	}()
 
-	err = os.MkdirAll(path.Dir(dst), 0700)
+	err = osfs.MkdirAll(path.Dir(dst), 0700)
 	if err != nil {
 		return err
 	}
 
-	out, err := os.Create(dst)
+	out, err := osfs.Create(dst)
 	if err != nil {
 		return
 	}