Don't export internal package

twpayne · Oct 8, 2019 · 9e2ceb7 · 9e2ceb7
1 parent c79de4c
commit 9e2ceb7
Show file tree

Hide file tree

Showing 44 changed files with 17 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -23,9 +23,9 @@ completions/chezmoi.zsh:
 
 .PHONY: coverage.out
 coverage.out:
-	go test -cover -covermode=count -coverprofile=cmd-coverage.out -coverpkg=github.com/twpayne/chezmoi/cmd,github.com/twpayne/chezmoi/lib/chezmoi ./cmd
-	go test -cover -covermode=count -coverprofile=lib-chezmoi-coverage.out ./lib/chezmoi
-	gocovmerge cmd-coverage.out lib-chezmoi-coverage.out > $@ || ( rm -f $@ ; false )
+	go test -cover -covermode=count -coverprofile=cmd-coverage.out -coverpkg=github.com/twpayne/chezmoi/cmd,github.com/twpayne/chezmoi/internal/chezmoi ./cmd
+	go test -cover -covermode=count -coverprofile=internal-chezmoi-coverage.out ./internal/chezmoi
+	gocovmerge cmd-coverage.out internal-chezmoi-coverage.out > $@ || ( rm -f $@ ; false )
 
 .PHONY: format
 format:

diff --git a/cmd/add.go b/cmd/add.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/add_test.go b/cmd/add_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	"github.com/twpayne/go-vfs/vfst"
 )
 

diff --git a/cmd/cat.go b/cmd/cat.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/chattr.go b/cmd/chattr.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/config.go b/cmd/config.go
@@ -18,7 +18,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 	xdg "github.com/twpayne/go-xdg/v3"
 	bolt "go.etcd.io/bbolt"

diff --git a/cmd/diff.go b/cmd/diff.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 	bolt "go.etcd.io/bbolt"
 )

diff --git a/cmd/edit.go b/cmd/edit.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/renameio"
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/import.go b/cmd/import.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/init.go b/cmd/init.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/init_test.go b/cmd/init_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	"github.com/twpayne/go-vfs/vfst"
 	xdg "github.com/twpayne/go-xdg/v3"
 )

diff --git a/cmd/merge.go b/cmd/merge.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 )
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -10,7 +10,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 	xdg "github.com/twpayne/go-xdg/v3"
 )

diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -26,7 +26,7 @@ import (
 	"github.com/coreos/go-semver/semver"
 	"github.com/google/go-github/v26/github"
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 	"golang.org/x/oauth2"
 )

diff --git a/cmd/verify.go b/cmd/verify.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/twpayne/chezmoi/lib/chezmoi"
+	"github.com/twpayne/chezmoi/internal/chezmoi"
 	vfs "github.com/twpayne/go-vfs"
 	bolt "go.etcd.io/bbolt"
 )

diff --git a/lib/chezmoi/anymutator.go → internal/chezmoi/anymutator.go b/lib/chezmoi/anymutator.go → internal/chezmoi/anymutator.go
diff --git a/lib/chezmoi/autotemplate.go → internal/chezmoi/autotemplate.go b/lib/chezmoi/autotemplate.go → internal/chezmoi/autotemplate.go
diff --git a/lib/chezmoi/autotemplate_test.go → internal/chezmoi/autotemplate_test.go b/lib/chezmoi/autotemplate_test.go → internal/chezmoi/autotemplate_test.go
diff --git a/lib/chezmoi/boltpersistentstate.go → internal/chezmoi/boltpersistentstate.go b/lib/chezmoi/boltpersistentstate.go → internal/chezmoi/boltpersistentstate.go
diff --git a/lib/chezmoi/boltpersistentstate_test.go → internal/chezmoi/boltpersistentstate_test.go b/lib/chezmoi/boltpersistentstate_test.go → internal/chezmoi/boltpersistentstate_test.go
diff --git a/lib/chezmoi/chezmoi.go → internal/chezmoi/chezmoi.go b/lib/chezmoi/chezmoi.go → internal/chezmoi/chezmoi.go
diff --git a/lib/chezmoi/chezmoi_test.go → internal/chezmoi/chezmoi_test.go b/lib/chezmoi/chezmoi_test.go → internal/chezmoi/chezmoi_test.go
diff --git a/lib/chezmoi/dir.go → internal/chezmoi/dir.go b/lib/chezmoi/dir.go → internal/chezmoi/dir.go
diff --git a/lib/chezmoi/dir_test.go → internal/chezmoi/dir_test.go b/lib/chezmoi/dir_test.go → internal/chezmoi/dir_test.go
diff --git a/lib/chezmoi/file.go → internal/chezmoi/file.go b/lib/chezmoi/file.go → internal/chezmoi/file.go
diff --git a/lib/chezmoi/file_test.go → internal/chezmoi/file_test.go b/lib/chezmoi/file_test.go → internal/chezmoi/file_test.go
diff --git a/lib/chezmoi/fsmutator.go → internal/chezmoi/fsmutator.go b/lib/chezmoi/fsmutator.go → internal/chezmoi/fsmutator.go
diff --git a/lib/chezmoi/fsmutator_posix.go → internal/chezmoi/fsmutator_posix.go b/lib/chezmoi/fsmutator_posix.go → internal/chezmoi/fsmutator_posix.go
diff --git a/lib/chezmoi/fsmutator_windows.go → internal/chezmoi/fsmutator_windows.go b/lib/chezmoi/fsmutator_windows.go → internal/chezmoi/fsmutator_windows.go
diff --git a/lib/chezmoi/gpg.go → internal/chezmoi/gpg.go b/lib/chezmoi/gpg.go → internal/chezmoi/gpg.go
diff --git a/lib/chezmoi/loggingmutator.go → internal/chezmoi/loggingmutator.go b/lib/chezmoi/loggingmutator.go → internal/chezmoi/loggingmutator.go
diff --git a/lib/chezmoi/mutator.go → internal/chezmoi/mutator.go b/lib/chezmoi/mutator.go → internal/chezmoi/mutator.go
diff --git a/lib/chezmoi/nullmutator.go → internal/chezmoi/nullmutator.go b/lib/chezmoi/nullmutator.go → internal/chezmoi/nullmutator.go
diff --git a/lib/chezmoi/patternset.go → internal/chezmoi/patternset.go b/lib/chezmoi/patternset.go → internal/chezmoi/patternset.go
diff --git a/lib/chezmoi/patternset_test.go → internal/chezmoi/patternset_test.go b/lib/chezmoi/patternset_test.go → internal/chezmoi/patternset_test.go
diff --git a/lib/chezmoi/private.go → internal/chezmoi/private.go b/lib/chezmoi/private.go → internal/chezmoi/private.go
diff --git a/lib/chezmoi/private_posix.go → internal/chezmoi/private_posix.go b/lib/chezmoi/private_posix.go → internal/chezmoi/private_posix.go
diff --git a/lib/chezmoi/private_windows.go → internal/chezmoi/private_windows.go b/lib/chezmoi/private_windows.go → internal/chezmoi/private_windows.go
diff --git a/lib/chezmoi/script.go → internal/chezmoi/script.go b/lib/chezmoi/script.go → internal/chezmoi/script.go
diff --git a/lib/chezmoi/symlink.go → internal/chezmoi/symlink.go b/lib/chezmoi/symlink.go → internal/chezmoi/symlink.go
diff --git a/lib/chezmoi/targetstate.go → internal/chezmoi/targetstate.go b/lib/chezmoi/targetstate.go → internal/chezmoi/targetstate.go
diff --git a/lib/chezmoi/targetstate_posix.go → internal/chezmoi/targetstate_posix.go b/lib/chezmoi/targetstate_posix.go → internal/chezmoi/targetstate_posix.go
diff --git a/lib/chezmoi/targetstate_test.go → internal/chezmoi/targetstate_test.go b/lib/chezmoi/targetstate_test.go → internal/chezmoi/targetstate_test.go
diff --git a/lib/chezmoi/targetstate_windows.go → internal/chezmoi/targetstate_windows.go b/lib/chezmoi/targetstate_windows.go → internal/chezmoi/targetstate_windows.go