fix a number of hof mod tests

Signed-off-by: Tony Worm <tony@hofstadter.io>
hofstadter-io · Aug 3, 2021 · f98d436 · f98d436
1 parent 7e12c32
commit f98d436
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 19 deletions.
diff --git a/cue.mods b/cue.mods
@@ -3,6 +3,7 @@ module github.com/hofstadter-io/hof
 cue master
 
 require (
+  github.com/hofstadter-io/ghacue v0.0.0
   github.com/hofstadter-io/hofmod-cli v0.6.3
   github.com/hofstadter-io/hofmod-cuefig v0.0.3
 )

diff --git a/lib/mod/cache/fetch.go b/lib/mod/cache/fetch.go
@@ -121,6 +121,7 @@ func fetchGitHubBranch(FS billy.Filesystem, lang, owner, repo, branch string) er
 		if err != nil {
 			return err
 		}
+		branch = *r.DefaultBranch
 
 		fmt.Printf("%#+v\n", *r)
 	}
@@ -129,7 +130,7 @@ func fetchGitHubBranch(FS billy.Filesystem, lang, owner, repo, branch string) er
 
 	zReader, err := github.FetchBranchZip(client, branch)
 	if err != nil {
-		return fmt.Errorf("While fetching branch zipfile\n%w\n", err)
+		return fmt.Errorf("While fetching branch zipfile for %s/%s@%s\n%w\n", owner, repo, branch, err)
 	}
 
 	err = yagu.BillyLoadFromZip(zReader, FS, true)

diff --git a/lib/mod/langs/cue.go b/lib/mod/langs/cue.go
@@ -12,6 +12,7 @@ langs: cue: {
 	InitTemplates: {
 		"cue.mod/module.cue": """
 		module: "{{ .Module }}"
+
 		"""
 	}
 	VendorExcludeGlobs: [

diff --git a/lib/mod/testdata/init__module_initd.txt b/lib/mod/testdata/init__module_initd.txt
@@ -6,6 +6,6 @@ stdout '^cue.mods already exists\n$'
 -- cue.mods --
 module github.com/test/existsmod
 
-cue v0.2.0
+cue v0.4.0
 -- dummy-end --
 
diff --git a/lib/mod/testdata/init__new_module.txt b/lib/mod/testdata/init__new_module.txt
@@ -11,7 +11,7 @@ cmp cue.mod/module.cue match/cue.mod/module.cue
 -- match/cue.mods --
 module github.com/test/mod
 
-cue v0.2.0
+cue v0.4.0
 -- match/cue.mod/module.cue --
 module: "github.com/test/mod"
 -- dummy_end --

diff --git a/lib/mod/testdata/vendor__local_replace_no_require.txt b/lib/mod/testdata/vendor__local_replace_no_require.txt
@@ -6,23 +6,23 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/mod
 
-cue v0.2.0
+cue v0.4.0
 
 replace github.com/hofstadter-io/hof => ./simhof
 
 -- cue.mod/module.cue --
 module: "github.com/test/mod"
+
 -- dummy_end --
 
 
 -- simhof/cue.mods --
 module github.com/hofstadter-io/hof
 
-cue v0.2.0
+cue v0.4.0
 
 -- simhof/cue.mod/module.cue --
 module: "github.com/hofstadter-io/hof"
 
-
 -- dummy_end --
 
diff --git a/lib/mod/testdata/vendor__local_replace_with_require.txt b/lib/mod/testdata/vendor__local_replace_with_require.txt
@@ -6,7 +6,7 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/mod
 
-cue v0.2.0
+cue v0.4.0
 
 require (
     github.com/hofstadter-io/hof v0.0.0
@@ -16,17 +16,17 @@ replace github.com/hofstadter-io/hof => ./simhof
 
 -- cue.mod/module.cue --
 module: "github.com/test/mod"
+
 -- dummy_end --
 
 
 -- simhof/cue.mods --
 module github.com/hofstadter-io/hof
 
-cue v0.2.0
+cue v0.4.0
 
 -- simhof/cue.mod/module.cue --
 module: "github.com/hofstadter-io/hof"
 
-
 -- dummy_end --
 
diff --git a/lib/mod/testdata/vendor__mod_file_errs.txt b/lib/mod/testdata/vendor__mod_file_errs.txt
@@ -11,5 +11,5 @@ require (
     github.com/hofstadter-io/hof v0.5.4
 )
 
-cue v0.2.0
+cue v0.4.0
 -- dummy-end --
diff --git a/lib/mod/testdata/vendor__new_module.txt b/lib/mod/testdata/vendor__new_module.txt
@@ -17,7 +17,7 @@ cmp cue.mod/module.cue match/cue.mod/module.cue
 -- match/cue.mods --
 module github.com/test/mod
 
-cue v0.2.0
+cue v0.4.0
 -- match/cue.sums --
 -- match/cue.mod/module.cue --
 module: "github.com/test/mod"

diff --git a/lib/mod/testdata/vendor__with_deps.txt b/lib/mod/testdata/vendor__with_deps.txt
@@ -4,13 +4,14 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/withsolo
 
-cue v0.2.0
+cue v0.4.0
 
 require (
-    github.com/hofstadter-io/hof v0.5.4
+    github.com/hofstadter-io/hof v0.5.16
 )
 -- cue.mod/module.cue --
 module: "github.com/test/withsolo"
+
 -- dummy_end --
 
 
@@ -21,14 +22,15 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/withmulti
 
-cue v0.2.0
+cue v0.4.0
 
 require (
-    github.com/hofstadter-io/hof v0.5.4
-    github.com/hofstadter-io/hofmod-cli v0.5.9
+    github.com/hofstadter-io/hof v0.5.16
+    github.com/hofstadter-io/hofmod-cli v0.7.2
 )
 -- cue.mod/module.cue --
 module: "github.com/test/withmulti"
+
 -- dummy_end --
 
 
@@ -38,13 +40,14 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/mod-v000-a
 
-cue v0.2.0
+cue v0.4.0
 
 require (
-    github.com/hofstadter-io/hofmod-cuefig v0.0.0
+    github.com/hofstadter-io/hof v0.0.0
 )
 -- cue.mod/module.cue --
 module: "github.com/test/mod-v000-a"
+
 -- dummy_end --
 
 # hof mod vendor - BUG require v0.0.0 - B
@@ -53,13 +56,14 @@ exec hof mod vendor
 -- cue.mods --
 module github.com/test/mod-v000-b
 
-cue v0.2.0
+cue v0.4.0
 
 require (
     github.com/hofstadter-io/hofmod-cuefig v0.0.0
     github.com/hofstadter-io/hof v0.0.0
 )
 -- cue.mod/module.cue --
 module: "github.com/test/mod-v000-b"
+
 -- dummy_end --
 
diff --git a/lib/yagu/repos/github/client.go b/lib/yagu/repos/github/client.go
@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"fmt"
 	"os"
 
 	"golang.org/x/oauth2"
@@ -22,6 +23,7 @@ func NewClient() (client *github.Client, err error) {
 		client = github.NewClient(tc)
 
 	} else {
+		fmt.Println("Got Here GitHub")
 		client = github.NewClient(nil)
 	}