update gokit

joonas-fi · joonas-fi · commit 85062076fd47 · 2020-09-10T15:40:02.000+03:00
diff --git a/cmd/bob/baseimageconf.go b/cmd/bob/baseimageconf.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/jsonfile"
+	"github.com/function61/gokit/encoding/jsonfile"
+	"github.com/function61/gokit/os/osutil"
 )
 
 const (
@@ -22,7 +22,7 @@ type BaseImageConfig struct {
 // base image conf is optional. if it doesn't exist, an empty (but valid) conf will be
 // returned without error
 func loadBaseImageConf() (*BaseImageConfig, error) {
-	exists, err := fileexists.Exists(baseImageJsonLocation)
+	exists, err := osutil.Exists(baseImageJsonLocation)
 	if err != nil {
 		return nil, fmt.Errorf("loadBaseImageConf: %w", err)
 	}
diff --git a/cmd/bob/bobfile.go b/cmd/bob/bobfile.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/function61/gokit/jsonfile"
+	"github.com/function61/gokit/encoding/jsonfile"
 	"github.com/function61/turbobob/pkg/versioncontrol"
 )
 
diff --git a/cmd/bob/build.go b/cmd/bob/build.go
@@ -6,9 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/function61/gokit/envvar"
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/function61/turbobob/pkg/versioncontrol"
 	"github.com/spf13/cobra"
 )
@@ -145,7 +143,7 @@ func buildAndPushOneDockerImage(dockerImage DockerImageSpec, buildCtx *BuildCont
 
 func cloneToWorkdir(buildCtx *BuildContext) error {
 	rootForProject := projectSpecificDir(buildCtx.Bobfile.ProjectName, "")
-	rootForProjectExists, rootForProjectExistsErr := fileexists.Exists(rootForProject)
+	rootForProjectExists, rootForProjectExistsErr := osutil.Exists(rootForProject)
 	if rootForProjectExistsErr != nil {
 		return rootForProjectExistsErr
 	}
@@ -158,7 +156,7 @@ func cloneToWorkdir(buildCtx *BuildContext) error {
 		}
 	}
 
-	workspaceDirExists, workspaceDirExistsErr := fileexists.Exists(buildCtx.WorkspaceDir)
+	workspaceDirExists, workspaceDirExistsErr := osutil.Exists(buildCtx.WorkspaceDir)
 	if workspaceDirExistsErr != nil {
 		return workspaceDirExistsErr
 	}
@@ -414,7 +412,7 @@ func buildInside(fastBuild bool) error {
 
 	// pass almost all of our environment variables
 	for _, envSerialized := range os.Environ() {
-		if key, _ := envvar.Parse(envSerialized); key == "FASTBUILD" {
+		if key, _ := osutil.Parse(envSerialized); key == "FASTBUILD" {
 			// since we have explicit interface from here on, ignore setting any previous
 			// value so we can control whether we set this or not
 			continue
diff --git a/cmd/bob/checks.go b/cmd/bob/checks.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/function61/gokit/fileexists"
+	"github.com/function61/gokit/os/osutil"
 )
 
 func RunChecks(buildCtx *BuildContext) ([]CheckResult, error) {
@@ -31,7 +31,7 @@ func RunChecks(buildCtx *BuildContext) ([]CheckResult, error) {
 func licensePresent(ctx *CheckContext) error {
 	licenseCheck := ctx.NewCheck("License present")
 
-	exists, errChecking := fileexists.Exists("LICENSE")
+	exists, errChecking := osutil.Exists("LICENSE")
 	if errChecking != nil {
 		return errChecking
 	}
@@ -48,7 +48,7 @@ func licensePresent(ctx *CheckContext) error {
 func readmePresent(ctx *CheckContext) error {
 	readmeCheck := ctx.NewCheck("Readme present")
 
-	exists, errChecking := fileexists.Exists("README.md")
+	exists, errChecking := osutil.Exists("README.md")
 	if errChecking != nil {
 		return errChecking
 	}
diff --git a/cmd/bob/dev.go b/cmd/bob/dev.go
@@ -9,8 +9,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/function61/gokit/jsonfile"
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/encoding/jsonfile"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/function61/turbobob/pkg/versioncontrol"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/bob/devshim.go b/cmd/bob/devshim.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/jsonfile"
+	"github.com/function61/gokit/encoding/jsonfile"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/spf13/cobra"
 )
 
@@ -67,7 +67,7 @@ func devShimEntry() *cobra.Command {
 
 func shimSetup() error {
 	// some things must not be done again
-	alreadyDone, err := fileexists.Exists(shimSetupDoneFlagPath())
+	alreadyDone, err := osutil.Exists(shimSetupDoneFlagPath())
 	if err != nil {
 		return err
 	}
@@ -204,7 +204,7 @@ func shimExitIfErr(prefix string, err error) {
 // make various dirs symlinks to a bind mount from host, so cache can be shared between
 // multiple container instances
 func makeCacheDir(dir string) error {
-	exists, err := fileexists.Exists(dir)
+	exists, err := osutil.Exists(dir)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/bob/info.go b/cmd/bob/info.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/scylladb/termtables"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/bob/init.go b/cmd/bob/init.go
@@ -9,8 +9,7 @@ import (
 	"strings"
 
 	"github.com/function61/gokit/dynversion"
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +19,7 @@ const (
 )
 
 func writeTravisBoilerplate() error {
-	exists, errExistsCheck := fileexists.Exists(travisFilePath)
+	exists, errExistsCheck := osutil.Exists(travisFilePath)
 	if errExistsCheck != nil {
 		return errExistsCheck
 	}
@@ -46,7 +45,7 @@ script:
 }
 
 func writeGitLabBoilerplate() error {
-	exists, errExistsCheck := fileexists.Exists(gitlabFilePath)
+	exists, errExistsCheck := osutil.Exists(gitlabFilePath)
 	if errExistsCheck != nil {
 		return errExistsCheck
 	}
@@ -76,7 +75,7 @@ build:
 }
 
 func writeDefaultBobfile(producesDockerImage bool) error {
-	exists, errExistsCheck := fileexists.Exists(bobfileName)
+	exists, errExistsCheck := osutil.Exists(bobfileName)
 	if errExistsCheck != nil {
 		return errExistsCheck
 	}
diff --git a/cmd/bob/main.go b/cmd/bob/main.go
@@ -5,8 +5,7 @@ import (
 	"os"
 
 	"github.com/function61/gokit/dynversion"
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/function61/turbobob/pkg/powerline"
 	"github.com/spf13/cobra"
 )
@@ -65,5 +64,5 @@ func main() {
 }
 
 func insideDevContainer() (bool, error) {
-	return fileexists.Exists(shimDataDirContainer)
+	return osutil.Exists(shimDataDirContainer)
 }
diff --git a/cmd/bob/subrepo.go b/cmd/bob/subrepo.go
@@ -3,12 +3,12 @@ package main
 import (
 	"fmt"
 
-	"github.com/function61/gokit/fileexists"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/function61/turbobob/pkg/versioncontrol"
 )
 
 func ensureSubrepoCloned(destination string, subrepo SubrepoSpec) error {
-	exists, err := fileexists.Exists(destination)
+	exists, err := osutil.Exists(destination)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/bob/tips.go b/cmd/bob/tips.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/function61/gokit/osutil"
+	"github.com/function61/gokit/os/osutil"
 	"github.com/scylladb/termtables"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/bob/userconfig.go b/cmd/bob/userconfig.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/function61/gokit/fileexists"
-	"github.com/function61/gokit/jsonfile"
+	"github.com/function61/gokit/encoding/jsonfile"
+	"github.com/function61/gokit/os/osutil"
 )
 
 type UserconfigFile struct {
@@ -37,7 +37,7 @@ func loadUserconfigFile() (*UserconfigFile, error) {
 
 	confFilePath := filepath.Join(userHomedir, "turbobob-userconfig.json")
 
-	exists, err := fileexists.Exists(confFilePath)
+	exists, err := osutil.Exists(confFilePath)
 	if err != nil {
 		return nil, fmt.Errorf("loadUserconfigFile: %w", err)
 	}
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/aws/aws-sdk-go v1.16.15
-	github.com/function61/gokit v0.0.0-20200608105953-12235c68c38b
+	github.com/function61/gokit v0.0.0-20200909085654-5a779b46e59c
 	github.com/go-ini/ini v1.38.2 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/mattn/go-runewidth v0.0.3 // indirect
diff --git a/go.sum b/go.sum
@@ -22,6 +22,8 @@ github.com/function61/gokit v0.0.0-20190125134104-ef6fdbd9fbda h1:i9UuP2X+OLMqxb
 github.com/function61/gokit v0.0.0-20190125134104-ef6fdbd9fbda/go.mod h1:c0ezL3socqedTMy8NUpc6e/fgW+PGdma7DpXVPG1qF4=
 github.com/function61/gokit v0.0.0-20200608105953-12235c68c38b h1:oSy6OCp5pk+hObohgNR7MT2Yj1A3f61fAuVnT/D0lJE=
 github.com/function61/gokit v0.0.0-20200608105953-12235c68c38b/go.mod h1:qkZftFp+nvc6BitjWRb9GXS4A1tQ2BuASctzscHa9Io=
+github.com/function61/gokit v0.0.0-20200909085654-5a779b46e59c h1:w81rrtgyE+kseDH9o1eBnAOiwhTz0lsTVgqaAQHXeew=
+github.com/function61/gokit v0.0.0-20200909085654-5a779b46e59c/go.mod h1:9nT4wyoyrlvYOlvTovXSmUGIx6klsr+cgqkGTw7XNgs=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-ini/ini v1.38.2 h1:6Hl/z3p3iFkA0dlDfzYxuFuUGD+kaweypF6btsR2/Q4=
 github.com/go-ini/ini v1.38.2/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
diff --git a/pkg/versioncontrol/versioncontrol.go b/pkg/versioncontrol/versioncontrol.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/function61/gokit/fileexists"
+	"github.com/function61/gokit/os/osutil"
 )
 
 func CurrentRevisionId(vc Interface, onlyCommitted bool) (*RevisionId, error) {
@@ -44,7 +44,7 @@ func ForDir(dir string, kind Kind) (Interface, error) {
 }
 
 func DetectForDirectory(dir string) (Interface, error) {
-	isHg, err := fileexists.Exists(filepath.Join(dir, ".hg"))
+	isHg, err := osutil.Exists(filepath.Join(dir, ".hg"))
 	if err != nil {
 		return nil, err
 	}
@@ -53,7 +53,7 @@ func DetectForDirectory(dir string) (Interface, error) {
 		return NewMercurial(dir), nil
 	}
 
-	isGit, err := fileexists.Exists(filepath.Join(dir, ".git"))
+	isGit, err := osutil.Exists(filepath.Join(dir, ".git"))
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"os"`
`6`	`6`
`7`		`- "github.com/function61/gokit/jsonfile"`
	`7`	`+ "github.com/function61/gokit/encoding/jsonfile"`
`8`	`8`	`"github.com/function61/turbobob/pkg/versioncontrol"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"strings"`
`6`	`6`
`7`		`- "github.com/function61/gokit/osutil"`
	`7`	`+ "github.com/function61/gokit/os/osutil"`
`8`	`8`	`"github.com/scylladb/termtables"`
`9`	`9`	`"github.com/spf13/cobra"`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`
`11`	`11`	`"github.com/function61/gokit/dynversion"`
`12`		`- "github.com/function61/gokit/fileexists"`
`13`		`- "github.com/function61/gokit/osutil"`
	`12`	`+ "github.com/function61/gokit/os/osutil"`
`14`	`13`	`"github.com/spf13/cobra"`
`15`	`14`	`)`
`16`	`15`
`@@ -20,7 +19,7 @@ const (`
`20`	`19`	`)`
`21`	`20`
`22`	`21`	`func writeTravisBoilerplate() error {`
`23`		`- exists, errExistsCheck := fileexists.Exists(travisFilePath)`
	`22`	`+ exists, errExistsCheck := osutil.Exists(travisFilePath)`
`24`	`23`	`if errExistsCheck != nil {`
`25`	`24`	`return errExistsCheck`
`26`	`25`	`}`
`@@ -46,7 +45,7 @@ script:`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`func writeGitLabBoilerplate() error {`
`49`		`- exists, errExistsCheck := fileexists.Exists(gitlabFilePath)`
	`48`	`+ exists, errExistsCheck := osutil.Exists(gitlabFilePath)`
`50`	`49`	`if errExistsCheck != nil {`
`51`	`50`	`return errExistsCheck`
`52`	`51`	`}`
`@@ -76,7 +75,7 @@ build:`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`func writeDefaultBobfile(producesDockerImage bool) error {`
`79`		`- exists, errExistsCheck := fileexists.Exists(bobfileName)`
	`78`	`+ exists, errExistsCheck := osutil.Exists(bobfileName)`
`80`	`79`	`if errExistsCheck != nil {`
`81`	`80`	`return errExistsCheck`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`"github.com/function61/gokit/dynversion"`
`8`		`- "github.com/function61/gokit/fileexists"`
`9`		`- "github.com/function61/gokit/osutil"`
	`8`	`+ "github.com/function61/gokit/os/osutil"`
`10`	`9`	`"github.com/function61/turbobob/pkg/powerline"`
`11`	`10`	`"github.com/spf13/cobra"`
`12`	`11`	`)`
`@@ -65,5 +64,5 @@ func main() {`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`func insideDevContainer() (bool, error) {`
`68`		`- return fileexists.Exists(shimDataDirContainer)`
	`67`	`+ return osutil.Exists(shimDataDirContainer)`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/function61/gokit/fileexists"`
	`6`	`+ "github.com/function61/gokit/os/osutil"`
`7`	`7`	`"github.com/function61/turbobob/pkg/versioncontrol"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func ensureSubrepoCloned(destination string, subrepo SubrepoSpec) error {`
`11`		`- exists, err := fileexists.Exists(destination)`
	`11`	`+ exists, err := osutil.Exists(destination)`
`12`	`12`	`if err != nil {`
`13`	`13`	`return err`
`14`	`14`	`}`