From 703ab8e8c41840ccfb6dd512e5177173d63c5c15 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 9 Jun 2025 10:15:47 +0300 Subject: [PATCH] refactor: move `pkg/` to `internal/` and update imports Restructure project by relocating package contents from pkg/ to internal/ to better reflect internal-only usage. This commit is initial step to prepare project for public api --- build.go | 2 +- gen.go | 2 +- helper.go | 2 +- info.go | 2 +- install.go | 4 +- internal.go | 4 +- {pkg => internal}/build/build.go | 4 +- .../build/build_internal_test.need-to-update | 4 +- {pkg => internal}/build/cache.go | 0 {pkg => internal}/build/checker.go | 2 +- {pkg => internal}/build/dirs.go | 0 .../build/find_deps/alt_linux.go | 0 {pkg => internal}/build/find_deps/empty.go | 0 {pkg => internal}/build/find_deps/fedora.go | 0 .../build/find_deps/find_deps.go | 2 +- {pkg => internal}/build/installer.go | 2 +- {pkg => internal}/build/main_build.go | 2 +- {pkg => internal}/build/safe_common.go | 0 {pkg => internal}/build/safe_installer.go | 2 +- .../build/safe_script_executor.go | 0 {pkg => internal}/build/script_executor.go | 4 +- {pkg => internal}/build/script_resolver.go | 0 {pkg => internal}/build/script_view.go | 0 {pkg => internal}/build/source_downloader.go | 0 {pkg => internal}/build/utils.go | 4 +- .../build/utils_internal_test.go | 0 internal/cliutils/app_builder/builder.go | 6 +- {pkg => internal}/distro/osrelease.go | 0 {pkg => internal}/gen/funcs.go | 0 {pkg => internal}/gen/pip.go | 0 {pkg => internal}/gen/tmpls/pip.tmpl.sh | 0 {pkg => internal}/manager/apk.go | 0 {pkg => internal}/manager/apt.go | 0 {pkg => internal}/manager/apt_rpm.go | 0 {pkg => internal}/manager/common.go | 0 {pkg => internal}/manager/common_rpm.go | 0 {pkg => internal}/manager/dnf.go | 0 {pkg => internal}/manager/managers.go | 0 {pkg => internal}/manager/pacman.go | 0 {pkg => internal}/manager/yum.go | 0 {pkg => internal}/manager/zypper.go | 0 internal/overrides/overrides.go | 2 +- internal/overrides/overrides_test.go | 2 +- {pkg => internal}/parser/parser.go | 0 {pkg => internal}/repos/find.go | 0 {pkg => internal}/repos/find_test.go | 2 +- {pkg => internal}/repos/pull.go | 0 {pkg => internal}/repos/pull_internal_test.go | 0 {pkg => internal}/repos/pull_test.go | 2 +- {pkg => internal}/repos/repos.go | 0 {pkg => internal}/repos/utils.go | 4 +- {pkg => internal}/search/search.go | 0 .../search/search_options_builder.go | 0 {pkg => internal}/search/search_test.go | 2 +- internal/shutils/decoder/decoder.go | 2 +- internal/shutils/decoder/decoder_test.go | 2 +- internal/shutils/handlers/exec_test.go | 2 +- internal/translations/default.pot | 160 ++++++++-------- internal/translations/po/ru/default.po | 172 +++++++++--------- list.go | 4 +- main.go | 2 +- search.go | 4 +- upgrade.go | 8 +- 63 files changed, 209 insertions(+), 209 deletions(-) rename {pkg => internal}/build/build.go (99%) rename {pkg => internal}/build/build_internal_test.need-to-update (98%) rename {pkg => internal}/build/cache.go (100%) rename {pkg => internal}/build/checker.go (97%) rename {pkg => internal}/build/dirs.go (100%) rename {pkg => internal}/build/find_deps/alt_linux.go (100%) rename {pkg => internal}/build/find_deps/empty.go (100%) rename {pkg => internal}/build/find_deps/fedora.go (100%) rename {pkg => internal}/build/find_deps/find_deps.go (97%) rename {pkg => internal}/build/installer.go (96%) rename {pkg => internal}/build/main_build.go (96%) rename {pkg => internal}/build/safe_common.go (100%) rename {pkg => internal}/build/safe_installer.go (98%) rename {pkg => internal}/build/safe_script_executor.go (100%) rename {pkg => internal}/build/script_executor.go (98%) rename {pkg => internal}/build/script_resolver.go (100%) rename {pkg => internal}/build/script_view.go (100%) rename {pkg => internal}/build/source_downloader.go (100%) rename {pkg => internal}/build/utils.go (98%) rename {pkg => internal}/build/utils_internal_test.go (100%) rename {pkg => internal}/distro/osrelease.go (100%) rename {pkg => internal}/gen/funcs.go (100%) rename {pkg => internal}/gen/pip.go (100%) rename {pkg => internal}/gen/tmpls/pip.tmpl.sh (100%) rename {pkg => internal}/manager/apk.go (100%) rename {pkg => internal}/manager/apt.go (100%) rename {pkg => internal}/manager/apt_rpm.go (100%) rename {pkg => internal}/manager/common.go (100%) rename {pkg => internal}/manager/common_rpm.go (100%) rename {pkg => internal}/manager/dnf.go (100%) rename {pkg => internal}/manager/managers.go (100%) rename {pkg => internal}/manager/pacman.go (100%) rename {pkg => internal}/manager/yum.go (100%) rename {pkg => internal}/manager/zypper.go (100%) rename {pkg => internal}/parser/parser.go (100%) rename {pkg => internal}/repos/find.go (100%) rename {pkg => internal}/repos/find_test.go (98%) rename {pkg => internal}/repos/pull.go (100%) rename {pkg => internal}/repos/pull_internal_test.go (100%) rename {pkg => internal}/repos/pull_test.go (98%) rename {pkg => internal}/repos/repos.go (100%) rename {pkg => internal}/repos/utils.go (98%) rename {pkg => internal}/search/search.go (100%) rename {pkg => internal}/search/search_options_builder.go (100%) rename {pkg => internal}/search/search_test.go (97%) diff --git a/build.go b/build.go index 8efeb9c..ea5aab3 100644 --- a/build.go +++ b/build.go @@ -28,12 +28,12 @@ import ( "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/build" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" ) func BuildCmd() *cli.Command { diff --git a/gen.go b/gen.go index 701838f..ac00a8a 100644 --- a/gen.go +++ b/gen.go @@ -25,7 +25,7 @@ import ( "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/gen" ) func GenCmd() *cli.Command { diff --git a/helper.go b/helper.go index 89b8fe8..71b4e6b 100644 --- a/helper.go +++ b/helper.go @@ -32,8 +32,8 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) func HelperCmd() *cli.Command { diff --git a/info.go b/info.go index 75069a0..f1bb398 100644 --- a/info.go +++ b/info.go @@ -31,9 +31,9 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) func InfoCmd() *cli.Command { diff --git a/install.go b/install.go index 245784d..1a58611 100644 --- a/install.go +++ b/install.go @@ -25,13 +25,13 @@ import ( "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/build" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) func InstallCmd() *cli.Command { diff --git a/internal.go b/internal.go index ab010b1..bbea3db 100644 --- a/internal.go +++ b/internal.go @@ -32,14 +32,14 @@ import ( "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/build" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/constants" "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) func InternalBuildCmd() *cli.Command { diff --git a/pkg/build/build.go b/internal/build/build.go similarity index 99% rename from pkg/build/build.go rename to internal/build/build.go index d559750..a76074b 100644 --- a/pkg/build/build.go +++ b/internal/build/build.go @@ -33,9 +33,9 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) type BuildInput struct { diff --git a/pkg/build/build_internal_test.need-to-update b/internal/build/build_internal_test.need-to-update similarity index 98% rename from pkg/build/build_internal_test.need-to-update rename to internal/build/build_internal_test.need-to-update index 998603e..b649815 100644 --- a/pkg/build/build_internal_test.need-to-update +++ b/internal/build/build_internal_test.need-to-update @@ -29,8 +29,8 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" ) type TestPackageFinder struct { diff --git a/pkg/build/cache.go b/internal/build/cache.go similarity index 100% rename from pkg/build/cache.go rename to internal/build/cache.go diff --git a/pkg/build/checker.go b/internal/build/checker.go similarity index 97% rename from pkg/build/checker.go rename to internal/build/checker.go index 134a588..515f71a 100644 --- a/pkg/build/checker.go +++ b/internal/build/checker.go @@ -24,8 +24,8 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) type Checker struct { diff --git a/pkg/build/dirs.go b/internal/build/dirs.go similarity index 100% rename from pkg/build/dirs.go rename to internal/build/dirs.go diff --git a/pkg/build/find_deps/alt_linux.go b/internal/build/find_deps/alt_linux.go similarity index 100% rename from pkg/build/find_deps/alt_linux.go rename to internal/build/find_deps/alt_linux.go diff --git a/pkg/build/find_deps/empty.go b/internal/build/find_deps/empty.go similarity index 100% rename from pkg/build/find_deps/empty.go rename to internal/build/find_deps/empty.go diff --git a/pkg/build/find_deps/fedora.go b/internal/build/find_deps/fedora.go similarity index 100% rename from pkg/build/find_deps/fedora.go rename to internal/build/find_deps/fedora.go diff --git a/pkg/build/find_deps/find_deps.go b/internal/build/find_deps/find_deps.go similarity index 97% rename from pkg/build/find_deps/find_deps.go rename to internal/build/find_deps/find_deps.go index fd8068f..1a858f2 100644 --- a/pkg/build/find_deps/find_deps.go +++ b/internal/build/find_deps/find_deps.go @@ -21,8 +21,8 @@ import ( "github.com/goreleaser/nfpm/v2" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) type ProvReqFinder interface { diff --git a/pkg/build/installer.go b/internal/build/installer.go similarity index 96% rename from pkg/build/installer.go rename to internal/build/installer.go index b0fd994..d416db1 100644 --- a/pkg/build/installer.go +++ b/internal/build/installer.go @@ -17,7 +17,7 @@ package build import ( - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" ) func NewInstaller(mgr manager.Manager) *Installer { diff --git a/pkg/build/main_build.go b/internal/build/main_build.go similarity index 96% rename from pkg/build/main_build.go rename to internal/build/main_build.go index 0cd439b..0acc933 100644 --- a/pkg/build/main_build.go +++ b/internal/build/main_build.go @@ -17,7 +17,7 @@ package build import ( - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" ) func NewMainBuilder( diff --git a/pkg/build/safe_common.go b/internal/build/safe_common.go similarity index 100% rename from pkg/build/safe_common.go rename to internal/build/safe_common.go diff --git a/pkg/build/safe_installer.go b/internal/build/safe_installer.go similarity index 98% rename from pkg/build/safe_installer.go rename to internal/build/safe_installer.go index 6fda8bc..b911b19 100644 --- a/pkg/build/safe_installer.go +++ b/internal/build/safe_installer.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/go-plugin" "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" ) type InstallerPlugin struct { diff --git a/pkg/build/safe_script_executor.go b/internal/build/safe_script_executor.go similarity index 100% rename from pkg/build/safe_script_executor.go rename to internal/build/safe_script_executor.go diff --git a/pkg/build/script_executor.go b/internal/build/script_executor.go similarity index 98% rename from pkg/build/script_executor.go rename to internal/build/script_executor.go index a1b95f0..41a0c2e 100644 --- a/pkg/build/script_executor.go +++ b/internal/build/script_executor.go @@ -36,12 +36,12 @@ import ( "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/syntax" + finddeps "gitea.plemya-x.ru/Plemya-x/ALR/internal/build/find_deps" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - finddeps "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build/find_deps" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) type LocalScriptExecutor struct { diff --git a/pkg/build/script_resolver.go b/internal/build/script_resolver.go similarity index 100% rename from pkg/build/script_resolver.go rename to internal/build/script_resolver.go diff --git a/pkg/build/script_view.go b/internal/build/script_view.go similarity index 100% rename from pkg/build/script_view.go rename to internal/build/script_view.go diff --git a/pkg/build/source_downloader.go b/internal/build/source_downloader.go similarity index 100% rename from pkg/build/source_downloader.go rename to internal/build/source_downloader.go diff --git a/pkg/build/utils.go b/internal/build/utils.go similarity index 98% rename from pkg/build/utils.go rename to internal/build/utils.go index e307b25..ce54b31 100644 --- a/pkg/build/utils.go +++ b/internal/build/utils.go @@ -39,10 +39,10 @@ import ( "github.com/goreleaser/nfpm/v2/files" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) // Функция readScript анализирует скрипт сборки с использованием встроенной реализации bash diff --git a/pkg/build/utils_internal_test.go b/internal/build/utils_internal_test.go similarity index 100% rename from pkg/build/utils_internal_test.go rename to internal/build/utils_internal_test.go diff --git a/internal/cliutils/app_builder/builder.go b/internal/cliutils/app_builder/builder.go index 9d4d275..6276735 100644 --- a/internal/cliutils/app_builder/builder.go +++ b/internal/cliutils/app_builder/builder.go @@ -26,9 +26,9 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/repos" ) type AppDeps struct { diff --git a/pkg/distro/osrelease.go b/internal/distro/osrelease.go similarity index 100% rename from pkg/distro/osrelease.go rename to internal/distro/osrelease.go diff --git a/pkg/gen/funcs.go b/internal/gen/funcs.go similarity index 100% rename from pkg/gen/funcs.go rename to internal/gen/funcs.go diff --git a/pkg/gen/pip.go b/internal/gen/pip.go similarity index 100% rename from pkg/gen/pip.go rename to internal/gen/pip.go diff --git a/pkg/gen/tmpls/pip.tmpl.sh b/internal/gen/tmpls/pip.tmpl.sh similarity index 100% rename from pkg/gen/tmpls/pip.tmpl.sh rename to internal/gen/tmpls/pip.tmpl.sh diff --git a/pkg/manager/apk.go b/internal/manager/apk.go similarity index 100% rename from pkg/manager/apk.go rename to internal/manager/apk.go diff --git a/pkg/manager/apt.go b/internal/manager/apt.go similarity index 100% rename from pkg/manager/apt.go rename to internal/manager/apt.go diff --git a/pkg/manager/apt_rpm.go b/internal/manager/apt_rpm.go similarity index 100% rename from pkg/manager/apt_rpm.go rename to internal/manager/apt_rpm.go diff --git a/pkg/manager/common.go b/internal/manager/common.go similarity index 100% rename from pkg/manager/common.go rename to internal/manager/common.go diff --git a/pkg/manager/common_rpm.go b/internal/manager/common_rpm.go similarity index 100% rename from pkg/manager/common_rpm.go rename to internal/manager/common_rpm.go diff --git a/pkg/manager/dnf.go b/internal/manager/dnf.go similarity index 100% rename from pkg/manager/dnf.go rename to internal/manager/dnf.go diff --git a/pkg/manager/managers.go b/internal/manager/managers.go similarity index 100% rename from pkg/manager/managers.go rename to internal/manager/managers.go diff --git a/pkg/manager/pacman.go b/internal/manager/pacman.go similarity index 100% rename from pkg/manager/pacman.go rename to internal/manager/pacman.go diff --git a/pkg/manager/yum.go b/internal/manager/yum.go similarity index 100% rename from pkg/manager/yum.go rename to internal/manager/yum.go diff --git a/pkg/manager/zypper.go b/internal/manager/zypper.go similarity index 100% rename from pkg/manager/zypper.go rename to internal/manager/zypper.go diff --git a/internal/overrides/overrides.go b/internal/overrides/overrides.go index 8d42f8a..5f81bd0 100644 --- a/internal/overrides/overrides.go +++ b/internal/overrides/overrides.go @@ -30,7 +30,7 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" ) type Opts struct { diff --git a/internal/overrides/overrides_test.go b/internal/overrides/overrides_test.go index 42d985c..5177dac 100644 --- a/internal/overrides/overrides_test.go +++ b/internal/overrides/overrides_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/text/language" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) var info = &distro.OSRelease{ diff --git a/pkg/parser/parser.go b/internal/parser/parser.go similarity index 100% rename from pkg/parser/parser.go rename to internal/parser/parser.go diff --git a/pkg/repos/find.go b/internal/repos/find.go similarity index 100% rename from pkg/repos/find.go rename to internal/repos/find.go diff --git a/pkg/repos/find_test.go b/internal/repos/find_test.go similarity index 98% rename from pkg/repos/find_test.go rename to internal/repos/find_test.go index 1b06e48..08b79bd 100644 --- a/pkg/repos/find_test.go +++ b/internal/repos/find_test.go @@ -25,8 +25,8 @@ import ( "testing" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/repos" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) func TestFindPkgs(t *testing.T) { diff --git a/pkg/repos/pull.go b/internal/repos/pull.go similarity index 100% rename from pkg/repos/pull.go rename to internal/repos/pull.go diff --git a/pkg/repos/pull_internal_test.go b/internal/repos/pull_internal_test.go similarity index 100% rename from pkg/repos/pull_internal_test.go rename to internal/repos/pull_internal_test.go diff --git a/pkg/repos/pull_test.go b/internal/repos/pull_test.go similarity index 98% rename from pkg/repos/pull_test.go rename to internal/repos/pull_test.go index 9e1e785..0b0f1f3 100644 --- a/pkg/repos/pull_test.go +++ b/internal/repos/pull_test.go @@ -28,8 +28,8 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/repos" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" ) type TestEnv struct { diff --git a/pkg/repos/repos.go b/internal/repos/repos.go similarity index 100% rename from pkg/repos/repos.go rename to internal/repos/repos.go diff --git a/pkg/repos/utils.go b/internal/repos/utils.go similarity index 98% rename from pkg/repos/utils.go rename to internal/repos/utils.go index 04cc656..b381b73 100644 --- a/pkg/repos/utils.go +++ b/internal/repos/utils.go @@ -35,10 +35,10 @@ import ( "mvdan.cc/sh/v3/syntax" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/parser" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/parser" ) // isValid makes sure the path of the file being updated is valid. diff --git a/pkg/search/search.go b/internal/search/search.go similarity index 100% rename from pkg/search/search.go rename to internal/search/search.go diff --git a/pkg/search/search_options_builder.go b/internal/search/search_options_builder.go similarity index 100% rename from pkg/search/search_options_builder.go rename to internal/search/search_options_builder.go diff --git a/pkg/search/search_test.go b/internal/search/search_test.go similarity index 97% rename from pkg/search/search_test.go rename to internal/search/search_test.go index f564ae2..9d773cc 100644 --- a/pkg/search/search_test.go +++ b/internal/search/search_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/search" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/search" ) func TestSearhOptionsBuilder(t *testing.T) { diff --git a/internal/shutils/decoder/decoder.go b/internal/shutils/decoder/decoder.go index 55f8744..29b0352 100644 --- a/internal/shutils/decoder/decoder.go +++ b/internal/shutils/decoder/decoder.go @@ -31,8 +31,8 @@ import ( "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/syntax" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) var ErrNotPointerToStruct = errors.New("val must be a pointer to a struct") diff --git a/internal/shutils/decoder/decoder_test.go b/internal/shutils/decoder/decoder_test.go index 54a2b38..c9676b3 100644 --- a/internal/shutils/decoder/decoder_test.go +++ b/internal/shutils/decoder/decoder_test.go @@ -31,8 +31,8 @@ import ( "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/syntax" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) type BuildVars struct { diff --git a/internal/shutils/handlers/exec_test.go b/internal/shutils/handlers/exec_test.go index a81302d..d4eaacd 100644 --- a/internal/shutils/handlers/exec_test.go +++ b/internal/shutils/handlers/exec_test.go @@ -27,9 +27,9 @@ import ( "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/syntax" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" ) const testScript = ` diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 4d8214a..92082a1 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -178,6 +178,68 @@ msgstr "" msgid "Error removing packages" msgstr "" +#: internal/build/build.go:417 +msgid "Building package" +msgstr "" + +#: internal/build/build.go:446 +msgid "The checksums array must be the same length as sources" +msgstr "" + +#: internal/build/build.go:488 +msgid "Downloading sources" +msgstr "" + +#: internal/build/build.go:580 +msgid "Installing dependencies" +msgstr "" + +#: internal/build/checker.go:43 +msgid "" +"Your system's CPU architecture doesn't match this package. Do you want to " +"build anyway?" +msgstr "" + +#: internal/build/checker.go:67 +msgid "This package is already installed" +msgstr "" + +#: internal/build/find_deps/alt_linux.go:35 +msgid "Command not found on the system" +msgstr "" + +#: internal/build/find_deps/alt_linux.go:86 +msgid "Provided dependency found" +msgstr "" + +#: internal/build/find_deps/alt_linux.go:93 +msgid "Required dependency found" +msgstr "" + +#: internal/build/find_deps/empty.go:32 +msgid "AutoProv is not implemented for this package format, so it's skipped" +msgstr "" + +#: internal/build/find_deps/empty.go:37 +msgid "AutoReq is not implemented for this package format, so it's skipped" +msgstr "" + +#: internal/build/script_executor.go:236 +msgid "Building package metadata" +msgstr "" + +#: internal/build/script_executor.go:366 +msgid "Executing prepare()" +msgstr "" + +#: internal/build/script_executor.go:375 +msgid "Executing build()" +msgstr "" + +#: internal/build/script_executor.go:404 internal/build/script_executor.go:424 +msgid "Executing %s()" +msgstr "" + #: internal/cliutils/app_builder/builder.go:75 msgid "Error loading config" msgstr "" @@ -321,6 +383,24 @@ msgstr "" msgid "ERROR" msgstr "" +#: internal/repos/pull.go:77 +msgid "Pulling repository" +msgstr "" + +#: internal/repos/pull.go:113 +msgid "Repository up to date" +msgstr "" + +#: internal/repos/pull.go:204 +msgid "Git repository does not appear to be a valid ALR repo" +msgstr "" + +#: internal/repos/pull.go:220 +msgid "" +"ALR repo's minimum ALR version is greater than the current version. Try " +"updating ALR if something doesn't work." +msgstr "" + #: internal/utils/cmd.go:97 msgid "Error on dropping capabilities" msgstr "" @@ -377,86 +457,6 @@ msgstr "" msgid "Error while running app" msgstr "" -#: pkg/build/build.go:417 -msgid "Building package" -msgstr "" - -#: pkg/build/build.go:446 -msgid "The checksums array must be the same length as sources" -msgstr "" - -#: pkg/build/build.go:488 -msgid "Downloading sources" -msgstr "" - -#: pkg/build/build.go:580 -msgid "Installing dependencies" -msgstr "" - -#: pkg/build/checker.go:43 -msgid "" -"Your system's CPU architecture doesn't match this package. Do you want to " -"build anyway?" -msgstr "" - -#: pkg/build/checker.go:67 -msgid "This package is already installed" -msgstr "" - -#: pkg/build/find_deps/alt_linux.go:35 -msgid "Command not found on the system" -msgstr "" - -#: pkg/build/find_deps/alt_linux.go:86 -msgid "Provided dependency found" -msgstr "" - -#: pkg/build/find_deps/alt_linux.go:93 -msgid "Required dependency found" -msgstr "" - -#: pkg/build/find_deps/empty.go:32 -msgid "AutoProv is not implemented for this package format, so it's skipped" -msgstr "" - -#: pkg/build/find_deps/empty.go:37 -msgid "AutoReq is not implemented for this package format, so it's skipped" -msgstr "" - -#: pkg/build/script_executor.go:236 -msgid "Building package metadata" -msgstr "" - -#: pkg/build/script_executor.go:366 -msgid "Executing prepare()" -msgstr "" - -#: pkg/build/script_executor.go:375 -msgid "Executing build()" -msgstr "" - -#: pkg/build/script_executor.go:404 pkg/build/script_executor.go:424 -msgid "Executing %s()" -msgstr "" - -#: pkg/repos/pull.go:77 -msgid "Pulling repository" -msgstr "" - -#: pkg/repos/pull.go:113 -msgid "Repository up to date" -msgstr "" - -#: pkg/repos/pull.go:204 -msgid "Git repository does not appear to be a valid ALR repo" -msgstr "" - -#: pkg/repos/pull.go:220 -msgid "" -"ALR repo's minimum ALR version is greater than the current version. Try " -"updating ALR if something doesn't work." -msgstr "" - #: refresh.go:30 msgid "Pull all repositories that have changed" msgstr "" diff --git a/internal/translations/po/ru/default.po b/internal/translations/po/ru/default.po index 0372580..dd35c8c 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -185,6 +185,72 @@ msgstr "Для команды remove ожидался хотя бы 1 аргум msgid "Error removing packages" msgstr "Ошибка при удалении пакетов" +#: internal/build/build.go:417 +msgid "Building package" +msgstr "Сборка пакета" + +#: internal/build/build.go:446 +msgid "The checksums array must be the same length as sources" +msgstr "Массив контрольных сумм должен быть той же длины, что и источники" + +#: internal/build/build.go:488 +msgid "Downloading sources" +msgstr "Скачивание источников" + +#: internal/build/build.go:580 +msgid "Installing dependencies" +msgstr "Установка зависимостей" + +#: internal/build/checker.go:43 +msgid "" +"Your system's CPU architecture doesn't match this package. Do you want to " +"build anyway?" +msgstr "" +"Архитектура процессора вашей системы не соответствует этому пакету. Вы все " +"равно хотите выполнить сборку?" + +#: internal/build/checker.go:67 +msgid "This package is already installed" +msgstr "Этот пакет уже установлен" + +#: internal/build/find_deps/alt_linux.go:35 +msgid "Command not found on the system" +msgstr "Команда не найдена в системе" + +#: internal/build/find_deps/alt_linux.go:86 +msgid "Provided dependency found" +msgstr "Найденная предоставленная зависимость" + +#: internal/build/find_deps/alt_linux.go:93 +msgid "Required dependency found" +msgstr "Найдена требуемая зависимость" + +#: internal/build/find_deps/empty.go:32 +msgid "AutoProv is not implemented for this package format, so it's skipped" +msgstr "" +"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено" + +#: internal/build/find_deps/empty.go:37 +msgid "AutoReq is not implemented for this package format, so it's skipped" +msgstr "" +"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено" + +#: internal/build/script_executor.go:236 +msgid "Building package metadata" +msgstr "Сборка метаданных пакета" + +#: internal/build/script_executor.go:366 +msgid "Executing prepare()" +msgstr "Выполнение prepare()" + +#: internal/build/script_executor.go:375 +msgid "Executing build()" +msgstr "Выполнение build()" + +#: internal/build/script_executor.go:404 internal/build/script_executor.go:424 +msgid "Executing %s()" +msgstr "Выполнение %s()" + #: internal/cliutils/app_builder/builder.go:75 msgid "Error loading config" msgstr "Ошибка при загрузке" @@ -331,6 +397,26 @@ msgstr "%s %s загружается — %s/с\n" msgid "ERROR" msgstr "ОШИБКА" +#: internal/repos/pull.go:77 +msgid "Pulling repository" +msgstr "Скачивание репозитория" + +#: internal/repos/pull.go:113 +msgid "Repository up to date" +msgstr "Репозиторий уже обновлён" + +#: internal/repos/pull.go:204 +msgid "Git repository does not appear to be a valid ALR repo" +msgstr "Репозиторий Git не поддерживается репозиторием ALR" + +#: internal/repos/pull.go:220 +msgid "" +"ALR repo's minimum ALR version is greater than the current version. Try " +"updating ALR if something doesn't work." +msgstr "" +"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте " +"обновить ALR, если что-то не работает." + #: internal/utils/cmd.go:97 msgid "Error on dropping capabilities" msgstr "Ошибка при понижении привилегий" @@ -387,92 +473,6 @@ msgstr "Показать справку" msgid "Error while running app" msgstr "Ошибка при запуске приложения" -#: pkg/build/build.go:417 -msgid "Building package" -msgstr "Сборка пакета" - -#: pkg/build/build.go:446 -msgid "The checksums array must be the same length as sources" -msgstr "Массив контрольных сумм должен быть той же длины, что и источники" - -#: pkg/build/build.go:488 -msgid "Downloading sources" -msgstr "Скачивание источников" - -#: pkg/build/build.go:580 -msgid "Installing dependencies" -msgstr "Установка зависимостей" - -#: pkg/build/checker.go:43 -msgid "" -"Your system's CPU architecture doesn't match this package. Do you want to " -"build anyway?" -msgstr "" -"Архитектура процессора вашей системы не соответствует этому пакету. Вы все " -"равно хотите выполнить сборку?" - -#: pkg/build/checker.go:67 -msgid "This package is already installed" -msgstr "Этот пакет уже установлен" - -#: pkg/build/find_deps/alt_linux.go:35 -msgid "Command not found on the system" -msgstr "Команда не найдена в системе" - -#: pkg/build/find_deps/alt_linux.go:86 -msgid "Provided dependency found" -msgstr "Найденная предоставленная зависимость" - -#: pkg/build/find_deps/alt_linux.go:93 -msgid "Required dependency found" -msgstr "Найдена требуемая зависимость" - -#: pkg/build/find_deps/empty.go:32 -msgid "AutoProv is not implemented for this package format, so it's skipped" -msgstr "" -"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено" - -#: pkg/build/find_deps/empty.go:37 -msgid "AutoReq is not implemented for this package format, so it's skipped" -msgstr "" -"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено" - -#: pkg/build/script_executor.go:236 -msgid "Building package metadata" -msgstr "Сборка метаданных пакета" - -#: pkg/build/script_executor.go:366 -msgid "Executing prepare()" -msgstr "Выполнение prepare()" - -#: pkg/build/script_executor.go:375 -msgid "Executing build()" -msgstr "Выполнение build()" - -#: pkg/build/script_executor.go:404 pkg/build/script_executor.go:424 -msgid "Executing %s()" -msgstr "Выполнение %s()" - -#: pkg/repos/pull.go:77 -msgid "Pulling repository" -msgstr "Скачивание репозитория" - -#: pkg/repos/pull.go:113 -msgid "Repository up to date" -msgstr "Репозиторий уже обновлён" - -#: pkg/repos/pull.go:204 -msgid "Git repository does not appear to be a valid ALR repo" -msgstr "Репозиторий Git не поддерживается репозиторием ALR" - -#: pkg/repos/pull.go:220 -msgid "" -"ALR repo's minimum ALR version is greater than the current version. Try " -"updating ALR if something doesn't work." -msgstr "" -"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте " -"обновить ALR, если что-то не работает." - #: refresh.go:30 msgid "Pull all repositories that have changed" msgstr "Скачать все изменённые репозитории" diff --git a/list.go b/list.go index 3cad799..5b809eb 100644 --- a/list.go +++ b/list.go @@ -29,12 +29,12 @@ import ( "github.com/leonelquinteros/gotext" "github.com/urfave/cli/v2" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/build" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" ) func ListCmd() *cli.Command { diff --git a/main.go b/main.go index 80a0315..106c459 100644 --- a/main.go +++ b/main.go @@ -33,8 +33,8 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" "gitea.plemya-x.ru/Plemya-x/ALR/internal/config" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" ) diff --git a/search.go b/search.go index b6129b2..f677bee 100644 --- a/search.go +++ b/search.go @@ -28,10 +28,10 @@ import ( "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/search" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/search" ) func SearchCmd() *cli.Command { diff --git a/upgrade.go b/upgrade.go index 6316692..d90b46e 100644 --- a/upgrade.go +++ b/upgrade.go @@ -29,16 +29,16 @@ import ( "go.elara.ws/vercmp" "golang.org/x/exp/maps" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/build" "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder" database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/distro" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/manager" "gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" + "gitea.plemya-x.ru/Plemya-x/ALR/internal/search" "gitea.plemya-x.ru/Plemya-x/ALR/internal/types" "gitea.plemya-x.ru/Plemya-x/ALR/internal/utils" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" - "gitea.plemya-x.ru/Plemya-x/ALR/pkg/search" ) func UpgradeCmd() *cli.Command {