Move most code into a 'common' package

The 'cli' and the 'daemon' will need to share this code.

author.go → common/author.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"errors"

autosync.go → common/autosync.go

@@ -1,8 +1,8 @@
-package main
+package common
 
 import "github.com/ztrue/tracerr"
 
-func autoSync(repoPath string) error {
+func AutoSync(repoPath string) error {
 	var err error
 	err = ensureGitAuthor(repoPath)
 	if err != nil {

commit.go → common/commit.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"bytes"

commit_test.go → common/commit_test.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"io/ioutil"

config.go → common/config.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"encoding/json"

fetch.go → common/fetch.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/ztrue/tracerr"

fetch_test.go → common/fetch_test.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"bytes"

ignore.go → common/ignore.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"path/filepath"

ignore_test.go → common/ignore_test.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"testing"

push.go → common/push.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"github.com/ztrue/tracerr"

rebase.go → common/rebase.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"errors"

rebase_test.go → common/rebase_test.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"testing"

watch.go → common/watch.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"fmt"

daemon.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/GitJournal/git-auto-sync/common"
 	cli "github.com/urfave/cli/v2"
 	"github.com/ztrue/tracerr"
 	git "gopkg.in/src-d/go-git.v4"
@@ -19,7 +20,7 @@ func daemonStatus(ctx *cli.Context) error {
 }
 
 func daemonList(ctx *cli.Context) error {
-	config, err := ReadConfig()
+	config, err := common.ReadConfig()
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
@@ -46,13 +47,13 @@ func daemonAdd(ctx *cli.Context) error {
 		return tracerr.Wrap(err)
 	}
 
-	config, err := ReadConfig()
+	config, err := common.ReadConfig()
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
 
 	config.Repos = append(config.Repos, repoPath)
-	err = WriteConfig(config)
+	err = common.WriteConfig(config)
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
@@ -89,7 +90,7 @@ func daemonRm(ctx *cli.Context) error {
 		repoPath = filepath.Join(cwd, repoPath)
 	}
 
-	config, err := ReadConfig()
+	config, err := common.ReadConfig()
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
@@ -108,7 +109,7 @@ func daemonRm(ctx *cli.Context) error {
 	}
 
 	config.Repos = remove(config.Repos, pos)
-	err = WriteConfig(config)
+	err = common.WriteConfig(config)
 	if err != nil {
 		return tracerr.Wrap(err)
 	}

main.go

@@ -7,6 +7,8 @@ import (
 	"github.com/gen2brain/beeep"
 	cli "github.com/urfave/cli/v2"
 	"github.com/ztrue/tracerr"
+
+	"github.com/GitJournal/git-auto-sync/common"
 )
 
 func main() {
@@ -23,7 +25,7 @@ func main() {
 						return tracerr.Wrap(err)
 					}
 
-					return WatchForChanges(repoPath)
+					return common.WatchForChanges(repoPath)
 				},
 			},
 			{
@@ -35,7 +37,7 @@ func main() {
 						return tracerr.Wrap(err)
 					}
 
-					err = autoSync(repoPath)
+					err = common.AutoSync(repoPath)
 					if err != nil {
 						return tracerr.Wrap(err)
 					}