clone cmd implemented, merge utl/yagu, bugfixes, some other minor adds

hofstadter-io · May 24, 2020 · 6512e9c · 6512e9c
1 parent 472129b
commit 6512e9c
Show file tree

Hide file tree

Showing 45 changed files with 206 additions and 1,247 deletions.
diff --git a/.hof/shadow/Config/gen/cuefig/config.go b/.hof/shadow/Config/gen/cuefig/config.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadConfigConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Config file: %q", fpath)
 	}

diff --git a/.hof/shadow/Context/gen/cuefig/context.go b/.hof/shadow/Context/gen/cuefig/context.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadContextConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Context file: %q", fpath)
 	}

diff --git a/.hof/shadow/Secret/gen/cuefig/secret.go b/.hof/shadow/Secret/gen/cuefig/secret.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadSecretConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Secret file: %q", fpath)
 	}

diff --git a/.hof/shadow/UserConfig/gen/cuefig/hofcfg.go b/.hof/shadow/UserConfig/gen/cuefig/hofcfg.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofcfgConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofcfg file: %q", fpath)
 	}

diff --git a/.hof/shadow/UserContext/gen/cuefig/hofctx.go b/.hof/shadow/UserContext/gen/cuefig/hofctx.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofctxConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofctx file: %q", fpath)
 	}

diff --git a/.hof/shadow/UserSecret/gen/cuefig/hofshh.go b/.hof/shadow/UserSecret/gen/cuefig/hofshh.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofshhConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofshh file: %q", fpath)
 	}

diff --git a/gen/cuefig/config.go b/gen/cuefig/config.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadConfigConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Config file: %q", fpath)
 	}

diff --git a/gen/cuefig/context.go b/gen/cuefig/context.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadContextConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Context file: %q", fpath)
 	}

diff --git a/gen/cuefig/hofcfg.go b/gen/cuefig/hofcfg.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofcfgConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofcfg file: %q", fpath)
 	}

diff --git a/gen/cuefig/hofctx.go b/gen/cuefig/hofctx.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofctxConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofctx file: %q", fpath)
 	}

diff --git a/gen/cuefig/hofshh.go b/gen/cuefig/hofshh.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadHofshhConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Hofshh file: %q", fpath)
 	}

diff --git a/gen/cuefig/secret.go b/gen/cuefig/secret.go
@@ -16,7 +16,6 @@ import (
 	"cuelang.org/go/cue/load"
 	"github.com/kirsle/configdir"
 
-	"github.com/hofstadter-io/hof/lib/util"
 	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
@@ -146,7 +145,7 @@ func LoadSecretConfig(workpath, entrypoint string) (val cue.Value, err error) {
 
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return val, fmt.Errorf("Errors while reading Secret file: %q", fpath)
 	}

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
 	github.com/kr/pretty v0.1.0
 	github.com/mattn/go-zglob v0.0.1
-	github.com/mholt/archiver v3.1.1+incompatible
+	github.com/mholt/archiver v3.1.1+incompatible // indirect
 	github.com/naoina/toml v0.1.1
 	github.com/parnurzeal/gorequest v0.2.16
 	github.com/sergi/go-diff v1.1.0
@@ -34,7 +34,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sys v0.0.0-20200428200454-593003d681fa // indirect
 	golang.org/x/text v0.3.2
-	gopkg.in/src-d/go-git.v4 v4.13.1
+	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
 	gopkg.in/yaml.v2 v2.2.8 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
 )

diff --git a/lib/extern/import.go b/lib/extern/import.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hofstadter-io/hof/lib/util"
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 func ImportAddBundle(bundle string) (string, error) {
@@ -25,24 +25,24 @@ func ImportAddBundle(bundle string) (string, error) {
 }
 
 func cloneAndRenderImport(srcUrl, srcVer, srcPath string) error {
-	_, appname := util.GetAcctAndName()
+	_, appname := yagu.GetAcctAndName()
 	data := map[string]interface{}{
 		"AppName": appname,
 	}
 
-	dir, err := util.CloneRepo(srcUrl, srcVer)
+	dir, err := yagu.CloneRepo(srcUrl, srcVer)
 	if err != nil {
 		return err
 	}
 
-	err = util.RenderDir(filepath.Join(dir, srcPath, "design"), "design-vendor", data)
+	err = yagu.RenderDir(filepath.Join(dir, srcPath, "design"), "design-vendor", data)
 	if err != nil {
 		return err
 	}
 
 	if _, err := os.Stat(filepath.Join(dir, srcPath, "design-vendor")); !os.IsNotExist(err) {
 		// path exists
-		err = util.RenderDir(filepath.Join(dir, srcPath, "design-vendor"), "design-vendor", data)
+		err = yagu.RenderDir(filepath.Join(dir, srcPath, "design-vendor"), "design-vendor", data)
 		if err != nil {
 			return err
 		}

diff --git a/lib/extern/new.go b/lib/extern/new.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hofstadter-io/data-utils/io"
 
-	"github.com/hofstadter-io/hof/lib/util"
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 func NewEntry(what, name, template, strData string) (string, error) {
@@ -59,7 +59,7 @@ func NewEntry(what, name, template, strData string) (string, error) {
 	}
 
 	// Prep contextual data
-	_, appname := util.GetAcctAndName()
+	_, appname := yagu.GetAcctAndName()
 	data["AppName"] = appname
 
 	// A bit hacky
@@ -128,7 +128,7 @@ func cloneAndRenderNewThing(srcUrl, srcVer, srcSubpath, destBasePath, name strin
 	var dir string
 
 	if strings.HasPrefix(srcUrl, "https") {
-		dir, err = util.CloneRepo(srcUrl, srcVer)
+		dir, err = yagu.CloneRepo(srcUrl, srcVer)
 		if err != nil {
 			return err
 		}
@@ -137,13 +137,13 @@ func cloneAndRenderNewThing(srcUrl, srcVer, srcSubpath, destBasePath, name strin
 		dir = srcUrl
 	}
 
-	err = util.RenderDirNameSub(filepath.Join(dir, srcSubpath, "design"), destBasePath, data)
+	err = yagu.RenderDirNameSub(filepath.Join(dir, srcSubpath, "design"), destBasePath, data)
 	if err != nil {
 		return err
 	}
 	if _, err := os.Stat(filepath.Join(dir, srcSubpath, "design-vendor")); !os.IsNotExist(err) {
 		// path exists
-		err = util.RenderDirNameSub(filepath.Join(dir, srcSubpath, "design-vendor"), destBasePath, data)
+		err = yagu.RenderDirNameSub(filepath.Join(dir, srcSubpath, "design-vendor"), destBasePath, data)
 		if err != nil {
 			return err
 		}

diff --git a/lib/gen.go b/lib/gen.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hofstadter-io/hof/lib/util"
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 func Gen(entrypoints, expressions []string, mode string) (error) {
@@ -17,15 +17,15 @@ func Gen(entrypoints, expressions []string, mode string) (error) {
 	errs = R.LoadCue()
 	if len(errs) > 0 {
 		for _, e := range errs {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return fmt.Errorf("\nErrors while loading cue files\n")
 	}
 
 	errsL := R.LoadGenerators()
 	if len(errsL) > 0 {
 		for _, e := range errsL {
-			util.PrintCueError(e)
+			yagu.PrintCueError(e)
 		}
 		return fmt.Errorf("\nErrors while loading generators\n")
 	}

diff --git a/lib/gen/write.go b/lib/gen/write.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"path"
 
-	"github.com/hofstadter-io/hof/lib/util"
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 func (F *File) WriteOutput() error {
@@ -13,7 +13,7 @@ func (F *File) WriteOutput() error {
 	// fmt.Println("WriteFile:", F.Filepath)
 	// fmt.Printf("%#+v\n\n", F)
 
-	err = util.Mkdir(path.Join(F.Filepath))
+	err = yagu.Mkdir(path.Join(F.Filepath))
 	if err != nil {
 		return err
 	}
@@ -33,7 +33,7 @@ func (F *File) WriteShadow(basedir string) error {
 
 	fn := path.Join(basedir, F.Filepath)
 
-	err = util.Mkdir(fn)
+	err = yagu.Mkdir(fn)
 	if err != nil {
 		return err
 	}

diff --git a/lib/runtime.go b/lib/runtime.go
@@ -15,7 +15,7 @@ import (
 	"github.com/mattn/go-zglob"
 
 	"github.com/hofstadter-io/hof/lib/gen"
-	"github.com/hofstadter-io/hof/lib/util"
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 type Runtime struct {
@@ -245,15 +245,15 @@ func (R *Runtime) WriteOutput() []error {
 				// TODO, make comparison and decide to write or not
 
 				// normal location
-				err := util.CopyFile(src, dst)
+				err := yagu.CopyFile(src, dst)
 				if err != nil {
 					err = fmt.Errorf("while copying static real file %q\n%w\n", match, err)
 					errs = append(errs, err)
 					continue
 				}
 
 				// shadow location
-				err = util.CopyFile(src, path.Join(".hof", G.Name, dst))
+				err = yagu.CopyFile(src, path.Join(".hof", G.Name, dst))
 				if err != nil {
 					err = fmt.Errorf("while copying static shadow file %q\n%w\n", match, err)
 					errs = append(errs, err)