diff --git a/checksum/checksum.go b/internal/checksum/checksum.go similarity index 98% rename from checksum/checksum.go rename to internal/checksum/checksum.go index cebfb31b..e9d1c9e4 100644 --- a/checksum/checksum.go +++ b/internal/checksum/checksum.go @@ -9,8 +9,8 @@ import ( "path/filepath" "sort" - "github.com/lets-cli/lets/set" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/set" + "github.com/lets-cli/lets/internal/util" ) const ( diff --git a/checksum/checksum_test.go b/internal/checksum/checksum_test.go similarity index 98% rename from checksum/checksum_test.go rename to internal/checksum/checksum_test.go index 5085dc5f..d7a221ce 100644 --- a/checksum/checksum_test.go +++ b/internal/checksum/checksum_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/lets-cli/lets/test" + "github.com/lets-cli/lets/internal/test" ) // get filename without last 4 chars - to make tests more predictable. diff --git a/cmd/completion.go b/internal/cmd/completion.go similarity index 98% rename from cmd/completion.go rename to internal/cmd/completion.go index 5fd57233..95b96982 100644 --- a/cmd/completion.go +++ b/internal/cmd/completion.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - "github.com/lets-cli/lets/config/config" - "github.com/lets-cli/lets/docopt" + "github.com/lets-cli/lets/internal/config/config" + "github.com/lets-cli/lets/internal/docopt" "github.com/spf13/cobra" ) diff --git a/cmd/lsp.go b/internal/cmd/lsp.go similarity index 91% rename from cmd/lsp.go rename to internal/cmd/lsp.go index e5b7b87f..2a4eff06 100644 --- a/cmd/lsp.go +++ b/internal/cmd/lsp.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/lets-cli/lets/lsp" + "github.com/lets-cli/lets/internal/lsp" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/internal/cmd/root.go similarity index 99% rename from cmd/root.go rename to internal/cmd/root.go index f518c769..eaf7ae31 100644 --- a/cmd/root.go +++ b/internal/cmd/root.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/lets-cli/lets/set" + "github.com/lets-cli/lets/internal/set" "github.com/spf13/cobra" ) diff --git a/cmd/root_test.go b/internal/cmd/root_test.go similarity index 99% rename from cmd/root_test.go rename to internal/cmd/root_test.go index 180407d6..8b3112d9 100644 --- a/cmd/root_test.go +++ b/internal/cmd/root_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/lets-cli/lets/config/config" + "github.com/lets-cli/lets/internal/config/config" "github.com/spf13/cobra" ) diff --git a/cmd/self.go b/internal/cmd/self.go similarity index 100% rename from cmd/self.go rename to internal/cmd/self.go diff --git a/cmd/subcommand.go b/internal/cmd/subcommand.go similarity index 98% rename from cmd/subcommand.go rename to internal/cmd/subcommand.go index 759c03fa..199c35ad 100644 --- a/cmd/subcommand.go +++ b/internal/cmd/subcommand.go @@ -8,8 +8,8 @@ import ( "slices" "strings" - "github.com/lets-cli/lets/config/config" - "github.com/lets-cli/lets/executor" + "github.com/lets-cli/lets/internal/config/config" + "github.com/lets-cli/lets/internal/executor" "github.com/spf13/cobra" ) diff --git a/config/config/checksum.go b/internal/config/config/checksum.go similarity index 93% rename from config/config/checksum.go rename to internal/config/config/checksum.go index 20c5b7bf..499bb787 100644 --- a/config/config/checksum.go +++ b/internal/config/config/checksum.go @@ -1,7 +1,7 @@ package config import ( - "github.com/lets-cli/lets/checksum" + "github.com/lets-cli/lets/internal/checksum" ) // Checksum type for all checksum uses (env, command.env, command,checksum). diff --git a/config/config/clone.go b/internal/config/config/clone.go similarity index 100% rename from config/config/clone.go rename to internal/config/config/clone.go diff --git a/config/config/cmd.go b/internal/config/config/cmd.go similarity index 100% rename from config/config/cmd.go rename to internal/config/config/cmd.go diff --git a/config/config/cmd_test.go b/internal/config/config/cmd_test.go similarity index 100% rename from config/config/cmd_test.go rename to internal/config/config/cmd_test.go diff --git a/config/config/command.go b/internal/config/config/command.go similarity index 99% rename from config/config/command.go rename to internal/config/config/command.go index d5249487..7602945e 100644 --- a/config/config/command.go +++ b/internal/config/config/command.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/lets-cli/lets/checksum" + "github.com/lets-cli/lets/internal/checksum" log "github.com/sirupsen/logrus" ) diff --git a/config/config/command_test.go b/internal/config/config/command_test.go similarity index 100% rename from config/config/command_test.go rename to internal/config/config/command_test.go diff --git a/config/config/config.go b/internal/config/config/config.go similarity index 98% rename from config/config/config.go rename to internal/config/config/config.go index e1453f56..17f15935 100644 --- a/config/config/config.go +++ b/internal/config/config/config.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/lets-cli/lets/config/path" - "github.com/lets-cli/lets/set" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/config/path" + "github.com/lets-cli/lets/internal/set" + "github.com/lets-cli/lets/internal/util" "gopkg.in/yaml.v3" ) diff --git a/config/config/config_test.go b/internal/config/config/config_test.go similarity index 100% rename from config/config/config_test.go rename to internal/config/config/config_test.go diff --git a/config/config/deps.go b/internal/config/config/deps.go similarity index 100% rename from config/config/deps.go rename to internal/config/config/deps.go diff --git a/config/config/env.go b/internal/config/config/env.go similarity index 99% rename from config/config/env.go rename to internal/config/config/env.go index a9dc9e8f..bf2dbf53 100644 --- a/config/config/env.go +++ b/internal/config/config/env.go @@ -7,7 +7,7 @@ import ( "slices" "strings" - "github.com/lets-cli/lets/checksum" + "github.com/lets-cli/lets/internal/checksum" "gopkg.in/yaml.v3" ) diff --git a/config/config/mixin.go b/internal/config/config/mixin.go similarity index 97% rename from config/config/mixin.go rename to internal/config/config/mixin.go index 1a33eed1..097e35b9 100644 --- a/config/config/mixin.go +++ b/internal/config/config/mixin.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/lets-cli/lets/set" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/set" + "github.com/lets-cli/lets/internal/util" ) var allowedContentTypes = set.NewSet( diff --git a/config/config/mixin_test.go b/internal/config/config/mixin_test.go similarity index 100% rename from config/config/mixin_test.go rename to internal/config/config/mixin_test.go diff --git a/config/config/ref.go b/internal/config/config/ref.go similarity index 100% rename from config/config/ref.go rename to internal/config/config/ref.go diff --git a/config/config/version.go b/internal/config/config/version.go similarity index 90% rename from config/config/version.go rename to internal/config/config/version.go index 9662e8eb..de5f2a3a 100644 --- a/config/config/version.go +++ b/internal/config/config/version.go @@ -3,7 +3,7 @@ package config import ( "errors" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/util" ) type Version string diff --git a/config/find.go b/internal/config/find.go similarity index 93% rename from config/find.go rename to internal/config/find.go index f2c48f8f..e0fcf260 100644 --- a/config/find.go +++ b/internal/config/find.go @@ -5,9 +5,9 @@ import ( "path/filepath" "github.com/fatih/color" - "github.com/lets-cli/lets/config/path" - "github.com/lets-cli/lets/util" - "github.com/lets-cli/lets/workdir" + "github.com/lets-cli/lets/internal/config/path" + "github.com/lets-cli/lets/internal/util" + "github.com/lets-cli/lets/internal/workdir" log "github.com/sirupsen/logrus" ) diff --git a/config/find_test.go b/internal/config/find_test.go similarity index 100% rename from config/find_test.go rename to internal/config/find_test.go diff --git a/config/load.go b/internal/config/load.go similarity index 93% rename from config/load.go rename to internal/config/load.go index 416e4a6f..726551de 100644 --- a/config/load.go +++ b/internal/config/load.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/lets-cli/lets/config/config" + "github.com/lets-cli/lets/internal/config/config" "gopkg.in/yaml.v3" ) diff --git a/config/load_test.go b/internal/config/load_test.go similarity index 100% rename from config/load_test.go rename to internal/config/load_test.go diff --git a/config/path/path.go b/internal/config/path/path.go similarity index 96% rename from config/path/path.go rename to internal/config/path/path.go index b5da163d..c4072b5b 100644 --- a/config/path/path.go +++ b/internal/config/path/path.go @@ -5,7 +5,7 @@ import ( "fmt" "path/filepath" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/util" ) var ErrFileNotExists = errors.New("file not exists") diff --git a/config/validate.go b/internal/config/validate.go similarity index 95% rename from config/validate.go rename to internal/config/validate.go index 33c677ec..688712b7 100644 --- a/config/validate.go +++ b/internal/config/validate.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/lets-cli/lets/config/config" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/config/config" + "github.com/lets-cli/lets/internal/util" ) // Validate loaded config. diff --git a/config/validate_test.go b/internal/config/validate_test.go similarity index 97% rename from config/validate_test.go rename to internal/config/validate_test.go index 633faa66..6c32d177 100644 --- a/config/validate_test.go +++ b/internal/config/validate_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "github.com/lets-cli/lets/config/config" + "github.com/lets-cli/lets/internal/config/config" ) func TestValidateCommandInDependsExists(t *testing.T) { diff --git a/config/workdir.go b/internal/config/workdir.go similarity index 100% rename from config/workdir.go rename to internal/config/workdir.go diff --git a/docopt/docopts.go b/internal/docopt/docopts.go similarity index 100% rename from docopt/docopts.go rename to internal/docopt/docopts.go diff --git a/env/env.go b/internal/env/env.go similarity index 100% rename from env/env.go rename to internal/env/env.go diff --git a/executor/env.go b/internal/executor/env.go similarity index 97% rename from executor/env.go rename to internal/executor/env.go index 775a468d..f52cd3de 100644 --- a/executor/env.go +++ b/internal/executor/env.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/lets-cli/lets/checksum" + "github.com/lets-cli/lets/internal/checksum" ) func makeEnvEntry(k, v string) string { diff --git a/executor/env_test.go b/internal/executor/env_test.go similarity index 100% rename from executor/env_test.go rename to internal/executor/env_test.go diff --git a/executor/executor.go b/internal/executor/executor.go similarity index 97% rename from executor/executor.go rename to internal/executor/executor.go index 8714f65e..277f5fe7 100644 --- a/executor/executor.go +++ b/internal/executor/executor.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "github.com/lets-cli/lets/checksum" - "github.com/lets-cli/lets/config/config" - "github.com/lets-cli/lets/docopt" - "github.com/lets-cli/lets/env" - "github.com/lets-cli/lets/logging" + "github.com/lets-cli/lets/internal/checksum" + "github.com/lets-cli/lets/internal/config/config" + "github.com/lets-cli/lets/internal/docopt" + "github.com/lets-cli/lets/internal/env" + "github.com/lets-cli/lets/internal/logging" "golang.org/x/sync/errgroup" ) diff --git a/logging/formatter.go b/internal/logging/formatter.go similarity index 100% rename from logging/formatter.go rename to internal/logging/formatter.go diff --git a/logging/log.go b/internal/logging/log.go similarity index 100% rename from logging/log.go rename to internal/logging/log.go diff --git a/logging/log_test.go b/internal/logging/log_test.go similarity index 100% rename from logging/log_test.go rename to internal/logging/log_test.go diff --git a/logging/writerhook.go b/internal/logging/writerhook.go similarity index 100% rename from logging/writerhook.go rename to internal/logging/writerhook.go diff --git a/lsp/handlers.go b/internal/lsp/handlers.go similarity index 99% rename from lsp/handlers.go rename to internal/lsp/handlers.go index b13d7e6d..7af9bde5 100644 --- a/lsp/handlers.go +++ b/internal/lsp/handlers.go @@ -4,7 +4,7 @@ import ( "errors" "slices" - "github.com/lets-cli/lets/util" + "github.com/lets-cli/lets/internal/util" "github.com/tliron/glsp" lsp "github.com/tliron/glsp/protocol_3_16" ) diff --git a/lsp/server.go b/internal/lsp/server.go similarity index 100% rename from lsp/server.go rename to internal/lsp/server.go diff --git a/lsp/storage.go b/internal/lsp/storage.go similarity index 100% rename from lsp/storage.go rename to internal/lsp/storage.go diff --git a/lsp/treesitter.go b/internal/lsp/treesitter.go similarity index 100% rename from lsp/treesitter.go rename to internal/lsp/treesitter.go diff --git a/lsp/treesitter_test.go b/internal/lsp/treesitter_test.go similarity index 100% rename from lsp/treesitter_test.go rename to internal/lsp/treesitter_test.go diff --git a/lsp/utils.go b/internal/lsp/utils.go similarity index 100% rename from lsp/utils.go rename to internal/lsp/utils.go diff --git a/set/set.go b/internal/set/set.go similarity index 100% rename from set/set.go rename to internal/set/set.go diff --git a/set/set_test.go b/internal/set/set_test.go similarity index 100% rename from set/set_test.go rename to internal/set/set_test.go diff --git a/test/args.go b/internal/test/args.go similarity index 100% rename from test/args.go rename to internal/test/args.go diff --git a/test/temp_file.go b/internal/test/temp_file.go similarity index 100% rename from test/temp_file.go rename to internal/test/temp_file.go diff --git a/upgrade/registry/registry.go b/internal/upgrade/registry/registry.go similarity index 100% rename from upgrade/registry/registry.go rename to internal/upgrade/registry/registry.go diff --git a/upgrade/upgrade.go b/internal/upgrade/upgrade.go similarity index 98% rename from upgrade/upgrade.go rename to internal/upgrade/upgrade.go index 9b2a977a..b0b5319e 100644 --- a/upgrade/upgrade.go +++ b/internal/upgrade/upgrade.go @@ -7,7 +7,7 @@ import ( "path" "runtime" - "github.com/lets-cli/lets/upgrade/registry" + "github.com/lets-cli/lets/internal/upgrade/registry" log "github.com/sirupsen/logrus" ) diff --git a/upgrade/upgrade_test.go b/internal/upgrade/upgrade_test.go similarity index 98% rename from upgrade/upgrade_test.go rename to internal/upgrade/upgrade_test.go index 5147bc96..485db661 100644 --- a/upgrade/upgrade_test.go +++ b/internal/upgrade/upgrade_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/lets-cli/lets/upgrade/registry" + "github.com/lets-cli/lets/internal/upgrade/registry" ) type MockRegistry struct { diff --git a/util/dir.go b/internal/util/dir.go similarity index 100% rename from util/dir.go rename to internal/util/dir.go diff --git a/util/file.go b/internal/util/file.go similarity index 100% rename from util/file.go rename to internal/util/file.go diff --git a/util/version.go b/internal/util/version.go similarity index 100% rename from util/version.go rename to internal/util/version.go diff --git a/workdir/workdir.go b/internal/workdir/workdir.go similarity index 100% rename from workdir/workdir.go rename to internal/workdir/workdir.go diff --git a/main.go b/main.go index c7b1cda5..525429c2 100644 --- a/main.go +++ b/main.go @@ -8,14 +8,14 @@ import ( "strings" "syscall" - "github.com/lets-cli/lets/cmd" - "github.com/lets-cli/lets/config" - "github.com/lets-cli/lets/env" - "github.com/lets-cli/lets/logging" - "github.com/lets-cli/lets/set" - "github.com/lets-cli/lets/upgrade" - "github.com/lets-cli/lets/upgrade/registry" - "github.com/lets-cli/lets/workdir" + "github.com/lets-cli/lets/internal/cmd" + "github.com/lets-cli/lets/internal/config" + "github.com/lets-cli/lets/internal/env" + "github.com/lets-cli/lets/internal/logging" + "github.com/lets-cli/lets/internal/set" + "github.com/lets-cli/lets/internal/upgrade" + "github.com/lets-cli/lets/internal/upgrade/registry" + "github.com/lets-cli/lets/internal/workdir" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" )