Reorganize packages and import gitdir as an example

cmd/sample-app/main.go

@@ -4,12 +4,14 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/labstack/echo"
 	"github.com/sirupsen/logrus"
 	"github.com/weaveworks/gitops-toolkit/cmd/sample-app/apis/sample/scheme"
 	"github.com/weaveworks/gitops-toolkit/cmd/sample-app/client"
 	"github.com/weaveworks/gitops-toolkit/pkg/filter"
+	"github.com/weaveworks/gitops-toolkit/pkg/git/gitdir"
 	"github.com/weaveworks/gitops-toolkit/pkg/logs"
 	"github.com/weaveworks/gitops-toolkit/pkg/runtime"
 	"github.com/weaveworks/gitops-toolkit/pkg/storage/cache"
@@ -26,6 +28,12 @@ func main() {
 }
 
 func run() error {
+	// Construct the GitDirectory implementation which backs the storage
+	gitDir := gitdir.NewGitDirectory("https://github.com/luxas/ignite-gitops", "master", nil, 10*time.Second)
+
+	// Wait for the repo to be cloned
+	gitDir.WaitForClone()
+
 	ms, err := manifest.NewManifestStorage(ManifestDir, scheme.Serializer)
 	if err != nil {
 		return err

pkg/gitops/gitdir/gitdir.go → pkg/git/gitdir/gitdir.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/weaveworks/gitops-toolkit/git"
+	"github.com/weaveworks/gitops-toolkit/pkg/git"
 	"github.com/weaveworks/gitops-toolkit/pkg/util"
 )
 

pkg/util/fs.go

@@ -1,8 +1,6 @@
 package util
 
 import (
-	"fmt"
-	"io"
 	"os"
 )
 
@@ -23,38 +21,3 @@ func FileExists(filename string) bool {
 
 	return !info.IsDir()
 }
-
-func DirExists(dirname string) bool {
-	exists, info := PathExists(dirname)
-	if !exists {
-		return false
-	}
-
-	return info.IsDir()
-}
-
-func CopyFile(src string, dst string) error {
-	sourceFileStat, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-
-	if !sourceFileStat.Mode().IsRegular() {
-		return fmt.Errorf("%s is not a regular file", src)
-	}
-
-	source, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer source.Close()
-
-	destination, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer destination.Close()
-
-	_, err = io.Copy(destination, source)
-	return err
-}

pkg/util/util.go

@@ -1,9 +1,22 @@
 package util
 
 import (
+	"bytes"
+	"fmt"
+	"os/exec"
 	"strings"
 )
 
+func ExecuteCommand(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return "", fmt.Errorf("command %q exited with %q: %v", cmd.Args, out, err)
+	}
+
+	return string(bytes.TrimSpace(out)), nil
+}
+
 func MatchPrefix(prefix string, fields ...string) ([]string, bool) {
 	var prefixMatches, exactMatches []string