From e49138fdd263c5857455661857e09479e85b4c53 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Tue, 4 Feb 2025 16:11:03 +0100 Subject: [PATCH] refactor(packagemanager,cli,tui): move packages in specific subfolders --- cmd/check_cmd.go | 4 ++-- cmd/cmd.go | 2 +- cmd/install_cmd.go | 4 ++-- cmd/package_commands.go | 2 +- cmd/remove_cmd.go | 4 ++-- cmd/search_cmd.go | 4 ++-- cmd/update_command.go | 4 ++-- {config => internal/config}/config.go | 4 ++-- {dotfiles => internal/dotfiles}/dotfiles.go | 0 {tui => internal/tui}/tui.go | 8 ++++---- {utils => internal/utils}/utils.go | 0 {utils => internal/utils}/utils_test.go | 0 {packagemanager => pkg/packagemanager}/apt.go | 0 {packagemanager => pkg/packagemanager}/cargo.go | 0 {packagemanager => pkg/packagemanager}/cargo_test.go | 0 {packagemanager => pkg/packagemanager}/choco.go | 0 {packagemanager => pkg/packagemanager}/dnf.go | 0 {packagemanager => pkg/packagemanager}/flatpak.go | 0 {packagemanager => pkg/packagemanager}/flatpak_test.go | 0 {packagemanager => pkg/packagemanager}/golang.go | 0 {packagemanager => pkg/packagemanager}/golang_test.go | 0 {packagemanager => pkg/packagemanager}/homebrew.go | 0 {packagemanager => pkg/packagemanager}/homebrew_test.go | 0 {packagemanager => pkg/packagemanager}/os.go | 0 {packagemanager => pkg/packagemanager}/os_test.go | 0 {packagemanager => pkg/packagemanager}/package.go | 0 {packagemanager => pkg/packagemanager}/packagemanager.go | 0 {packagemanager => pkg/packagemanager}/pacman.go | 0 {packagemanager => pkg/packagemanager}/pipx.go | 0 {packagemanager => pkg/packagemanager}/pipx_test.go | 0 {packagemanager => pkg/packagemanager}/utils.go | 0 {packagemanager => pkg/packagemanager}/win.go | 0 {packagemanager => pkg/packagemanager}/win_dummy.go | 0 {packagemanager => pkg/packagemanager}/winget.go | 0 34 files changed, 18 insertions(+), 18 deletions(-) rename {config => internal/config}/config.go (85%) rename {dotfiles => internal/dotfiles}/dotfiles.go (100%) rename {tui => internal/tui}/tui.go (94%) rename {utils => internal/utils}/utils.go (100%) rename {utils => internal/utils}/utils_test.go (100%) rename {packagemanager => pkg/packagemanager}/apt.go (100%) rename {packagemanager => pkg/packagemanager}/cargo.go (100%) rename {packagemanager => pkg/packagemanager}/cargo_test.go (100%) rename {packagemanager => pkg/packagemanager}/choco.go (100%) rename {packagemanager => pkg/packagemanager}/dnf.go (100%) rename {packagemanager => pkg/packagemanager}/flatpak.go (100%) rename {packagemanager => pkg/packagemanager}/flatpak_test.go (100%) rename {packagemanager => pkg/packagemanager}/golang.go (100%) rename {packagemanager => pkg/packagemanager}/golang_test.go (100%) rename {packagemanager => pkg/packagemanager}/homebrew.go (100%) rename {packagemanager => pkg/packagemanager}/homebrew_test.go (100%) rename {packagemanager => pkg/packagemanager}/os.go (100%) rename {packagemanager => pkg/packagemanager}/os_test.go (100%) rename {packagemanager => pkg/packagemanager}/package.go (100%) rename {packagemanager => pkg/packagemanager}/packagemanager.go (100%) rename {packagemanager => pkg/packagemanager}/pacman.go (100%) rename {packagemanager => pkg/packagemanager}/pipx.go (100%) rename {packagemanager => pkg/packagemanager}/pipx_test.go (100%) rename {packagemanager => pkg/packagemanager}/utils.go (100%) rename {packagemanager => pkg/packagemanager}/win.go (100%) rename {packagemanager => pkg/packagemanager}/win_dummy.go (100%) rename {packagemanager => pkg/packagemanager}/winget.go (100%) diff --git a/cmd/check_cmd.go b/cmd/check_cmd.go index aab0f87..d31efcd 100644 --- a/cmd/check_cmd.go +++ b/cmd/check_cmd.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - pm "system_setup_tool/packagemanager" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" + pm "system_setup_tool/pkg/packagemanager" "github.com/spf13/cobra" ) diff --git a/cmd/cmd.go b/cmd/cmd.go index 52b2f40..3fda9ce 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -5,7 +5,7 @@ import ( "log" "os" "path/filepath" - "system_setup_tool/tui" + "system_setup_tool/internal/tui" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/install_cmd.go b/cmd/install_cmd.go index 7e4c7a7..73d179c 100644 --- a/cmd/install_cmd.go +++ b/cmd/install_cmd.go @@ -4,9 +4,9 @@ import ( "fmt" "log" "runtime" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" - pm "system_setup_tool/packagemanager" + pm "system_setup_tool/pkg/packagemanager" "github.com/spf13/cobra" ) diff --git a/cmd/package_commands.go b/cmd/package_commands.go index 74aec53..d0f1da4 100644 --- a/cmd/package_commands.go +++ b/cmd/package_commands.go @@ -4,7 +4,7 @@ import ( "fmt" "os" "sort" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/remove_cmd.go b/cmd/remove_cmd.go index 36c4bff..00af703 100644 --- a/cmd/remove_cmd.go +++ b/cmd/remove_cmd.go @@ -4,9 +4,9 @@ import ( "fmt" "log" "runtime" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" - pm "system_setup_tool/packagemanager" + pm "system_setup_tool/pkg/packagemanager" "github.com/spf13/cobra" ) diff --git a/cmd/search_cmd.go b/cmd/search_cmd.go index 3b9c28e..d076c94 100644 --- a/cmd/search_cmd.go +++ b/cmd/search_cmd.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - pm "system_setup_tool/packagemanager" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" + pm "system_setup_tool/pkg/packagemanager" "github.com/spf13/cobra" ) diff --git a/cmd/update_command.go b/cmd/update_command.go index 6f5ca15..1731c8c 100644 --- a/cmd/update_command.go +++ b/cmd/update_command.go @@ -5,8 +5,8 @@ import ( "log" "runtime" "sync" - pm "system_setup_tool/packagemanager" - "system_setup_tool/utils" + "system_setup_tool/internal/utils" + pm "system_setup_tool/pkg/packagemanager" "github.com/spf13/cobra" ) diff --git a/config/config.go b/internal/config/config.go similarity index 85% rename from config/config.go rename to internal/config/config.go index fddb47a..9a8eb7e 100644 --- a/config/config.go +++ b/internal/config/config.go @@ -1,8 +1,8 @@ package config import ( - "system_setup_tool/dotfiles" - pm "system_setup_tool/packagemanager" + "system_setup_tool/internal/dotfiles" + pm "system_setup_tool/pkg/packagemanager" ) type PackageManagerConfig struct { diff --git a/dotfiles/dotfiles.go b/internal/dotfiles/dotfiles.go similarity index 100% rename from dotfiles/dotfiles.go rename to internal/dotfiles/dotfiles.go diff --git a/tui/tui.go b/internal/tui/tui.go similarity index 94% rename from tui/tui.go rename to internal/tui/tui.go index a51004e..a387915 100644 --- a/tui/tui.go +++ b/internal/tui/tui.go @@ -3,11 +3,11 @@ package tui import ( "fmt" "log" - "system_setup_tool/config" - "system_setup_tool/dotfiles" - "system_setup_tool/utils" + "system_setup_tool/internal/config" + "system_setup_tool/internal/dotfiles" + "system_setup_tool/internal/utils" - pm "system_setup_tool/packagemanager" + pm "system_setup_tool/pkg/packagemanager" "github.com/charmbracelet/huh" "github.com/mitchellh/mapstructure" diff --git a/utils/utils.go b/internal/utils/utils.go similarity index 100% rename from utils/utils.go rename to internal/utils/utils.go diff --git a/utils/utils_test.go b/internal/utils/utils_test.go similarity index 100% rename from utils/utils_test.go rename to internal/utils/utils_test.go diff --git a/packagemanager/apt.go b/pkg/packagemanager/apt.go similarity index 100% rename from packagemanager/apt.go rename to pkg/packagemanager/apt.go diff --git a/packagemanager/cargo.go b/pkg/packagemanager/cargo.go similarity index 100% rename from packagemanager/cargo.go rename to pkg/packagemanager/cargo.go diff --git a/packagemanager/cargo_test.go b/pkg/packagemanager/cargo_test.go similarity index 100% rename from packagemanager/cargo_test.go rename to pkg/packagemanager/cargo_test.go diff --git a/packagemanager/choco.go b/pkg/packagemanager/choco.go similarity index 100% rename from packagemanager/choco.go rename to pkg/packagemanager/choco.go diff --git a/packagemanager/dnf.go b/pkg/packagemanager/dnf.go similarity index 100% rename from packagemanager/dnf.go rename to pkg/packagemanager/dnf.go diff --git a/packagemanager/flatpak.go b/pkg/packagemanager/flatpak.go similarity index 100% rename from packagemanager/flatpak.go rename to pkg/packagemanager/flatpak.go diff --git a/packagemanager/flatpak_test.go b/pkg/packagemanager/flatpak_test.go similarity index 100% rename from packagemanager/flatpak_test.go rename to pkg/packagemanager/flatpak_test.go diff --git a/packagemanager/golang.go b/pkg/packagemanager/golang.go similarity index 100% rename from packagemanager/golang.go rename to pkg/packagemanager/golang.go diff --git a/packagemanager/golang_test.go b/pkg/packagemanager/golang_test.go similarity index 100% rename from packagemanager/golang_test.go rename to pkg/packagemanager/golang_test.go diff --git a/packagemanager/homebrew.go b/pkg/packagemanager/homebrew.go similarity index 100% rename from packagemanager/homebrew.go rename to pkg/packagemanager/homebrew.go diff --git a/packagemanager/homebrew_test.go b/pkg/packagemanager/homebrew_test.go similarity index 100% rename from packagemanager/homebrew_test.go rename to pkg/packagemanager/homebrew_test.go diff --git a/packagemanager/os.go b/pkg/packagemanager/os.go similarity index 100% rename from packagemanager/os.go rename to pkg/packagemanager/os.go diff --git a/packagemanager/os_test.go b/pkg/packagemanager/os_test.go similarity index 100% rename from packagemanager/os_test.go rename to pkg/packagemanager/os_test.go diff --git a/packagemanager/package.go b/pkg/packagemanager/package.go similarity index 100% rename from packagemanager/package.go rename to pkg/packagemanager/package.go diff --git a/packagemanager/packagemanager.go b/pkg/packagemanager/packagemanager.go similarity index 100% rename from packagemanager/packagemanager.go rename to pkg/packagemanager/packagemanager.go diff --git a/packagemanager/pacman.go b/pkg/packagemanager/pacman.go similarity index 100% rename from packagemanager/pacman.go rename to pkg/packagemanager/pacman.go diff --git a/packagemanager/pipx.go b/pkg/packagemanager/pipx.go similarity index 100% rename from packagemanager/pipx.go rename to pkg/packagemanager/pipx.go diff --git a/packagemanager/pipx_test.go b/pkg/packagemanager/pipx_test.go similarity index 100% rename from packagemanager/pipx_test.go rename to pkg/packagemanager/pipx_test.go diff --git a/packagemanager/utils.go b/pkg/packagemanager/utils.go similarity index 100% rename from packagemanager/utils.go rename to pkg/packagemanager/utils.go diff --git a/packagemanager/win.go b/pkg/packagemanager/win.go similarity index 100% rename from packagemanager/win.go rename to pkg/packagemanager/win.go diff --git a/packagemanager/win_dummy.go b/pkg/packagemanager/win_dummy.go similarity index 100% rename from packagemanager/win_dummy.go rename to pkg/packagemanager/win_dummy.go diff --git a/packagemanager/winget.go b/pkg/packagemanager/winget.go similarity index 100% rename from packagemanager/winget.go rename to pkg/packagemanager/winget.go