From 4ac2432770a72f9ae0e380f76c51cec2757c99a2 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Wed, 19 Mar 2025 08:26:53 +0300 Subject: [PATCH] fix: removerepo and LC_ALL=C for info command --- Makefile | 1 + e2e-tests/addrepo_test.go | 53 ++++++++++++++++-------- e2e-tests/issue_53_lc_all_c_info_test.go | 52 +++++++++++++++++++++++ go.mod | 3 ++ info.go | 3 ++ internal/translations/default.pot | 12 +++--- internal/translations/po/ru/default.po | 12 +++--- repo.go | 6 +++ 8 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 e2e-tests/issue_53_lc_all_c_info_test.go diff --git a/Makefile b/Makefile index 3c1e5a4..ac59441 100644 --- a/Makefile +++ b/Makefile @@ -73,5 +73,6 @@ test-coverage: bash scripts/coverage-badge.sh e2e-test: clean build + rm -f ./e2e-tests/alr cp alr e2e-tests go test -tags=e2e ./... \ No newline at end of file diff --git a/e2e-tests/addrepo_test.go b/e2e-tests/addrepo_test.go index 434be55..be41bcf 100644 --- a/e2e-tests/addrepo_test.go +++ b/e2e-tests/addrepo_test.go @@ -19,33 +19,52 @@ package e2etests_test import ( - "regexp" + "bytes" "testing" - "time" "github.com/efficientgo/e2e" - expect "github.com/tailscale/goexpect" + "github.com/stretchr/testify/assert" ) func TestE2EAlrAddRepo(t *testing.T) { dockerMultipleRun( t, - "add-repo", + "add-repo-remove-repo", COMMON_SYSTEMS, func(t *testing.T, r e2e.Runnable) { - runTestCommands(t, r, time.Second*10, []expect.Batcher{ - &expect.BSnd{S: "alr addrepo --name alr-repo --url https://gitea.plemya-x.ru/Plemya-x/alr-repo.git ; echo ALR-ADD-REPO-RETURN-CODE $?\n"}, - &expect.BCas{C: []expect.Caser{ - &expect.Case{ - R: regexp.MustCompile(`ALR-ADD-REPO-RETURN-CODE 0\n$`), - T: expect.OK(), - }, - &expect.Case{ - R: regexp.MustCompile(`ALR-ADD-REPO-RETURN-CODE \d\n$`), - T: expect.Fail(expect.NewStatus(expect.Internal, "Unexpected return code!")), - }, - }}, - }) + err := r.Exec(e2e.NewCommand( + "alr", + "addrepo", + "--name", + "alr-repo", + "--url", + "https://gitea.plemya-x.ru/Plemya-x/alr-repo.git", + )) + assert.NoError(t, err) + + err = r.Exec(e2e.NewCommand( + "bash", + "-c", + "cat $HOME/.config/alr/alr.toml", + )) + assert.NoError(t, err) + + err = r.Exec(e2e.NewCommand( + "alr", + "removerepo", + "--name", + "alr-repo", + )) + assert.NoError(t, err) + + var buf bytes.Buffer + err = r.Exec(e2e.NewCommand( + "bash", + "-c", + "cat $HOME/.config/alr/alr.toml", + ), e2e.WithExecOptionStdout(&buf)) + assert.NoError(t, err) + assert.Contains(t, buf.String(), "rootCmd") }, ) } diff --git a/e2e-tests/issue_53_lc_all_c_info_test.go b/e2e-tests/issue_53_lc_all_c_info_test.go new file mode 100644 index 0000000..91c378c --- /dev/null +++ b/e2e-tests/issue_53_lc_all_c_info_test.go @@ -0,0 +1,52 @@ +// ALR - Any Linux Repository +// Copyright (C) 2025 Евгений Храмов +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +//go:build e2e + +package e2etests_test + +import ( + "testing" + + "github.com/alecthomas/assert/v2" + "github.com/efficientgo/e2e" +) + +func TestE2EIssue53LcAllCInfo(t *testing.T) { + dockerMultipleRun( + t, + "issue-53-lc-all-c-info", + COMMON_SYSTEMS, + func(t *testing.T, r e2e.Runnable) { + err := r.Exec(e2e.NewCommand( + "alr", + "addrepo", + "--name", + "alr-repo", + "--url", + "https://gitea.plemya-x.ru/Plemya-x/alr-repo.git", + )) + assert.NoError(t, err) + + err = r.Exec(e2e.NewCommand( + "bash", + "-c", + "LANG=C alr info alr-bin", + )) + assert.NoError(t, err) + }, + ) +} diff --git a/go.mod b/go.mod index 0de8f00..fff90a9 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( gitea.plemya-x.ru/Plemya-x/fakeroot v0.0.1 github.com/AlecAivazis/survey/v2 v2.3.7 github.com/PuerkitoBio/purell v1.2.0 + github.com/alecthomas/assert/v2 v2.2.1 github.com/alecthomas/chroma/v2 v2.9.1 github.com/charmbracelet/bubbles v0.20.0 github.com/charmbracelet/bubbletea v1.2.4 @@ -48,6 +49,7 @@ require ( github.com/Masterminds/sprig/v3 v3.2.3 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect + github.com/alecthomas/repr v0.2.0 // indirect github.com/andybalholm/brotli v1.0.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect @@ -81,6 +83,7 @@ require ( github.com/goreleaser/fileglob v1.3.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hexops/gotextdiff v1.0.3 // indirect github.com/huandu/xstrings v1.3.3 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect diff --git a/info.go b/info.go index b9b7b12..9214668 100644 --- a/info.go +++ b/info.go @@ -122,6 +122,9 @@ func InfoCmd() *cli.Command { slog.Error("Can't detect system language", "err", err) os.Exit(1) } + if systemLang == "" { + systemLang = "en" + } if !all { info, err := distro.ParseOSRelease(ctx) diff --git a/internal/translations/default.pot b/internal/translations/default.pot index 5ea6ec7..016a4e3 100644 --- a/internal/translations/default.pot +++ b/internal/translations/default.pot @@ -138,15 +138,15 @@ msgstr "" msgid "Error finding packages" msgstr "" -#: info.go:129 +#: info.go:132 msgid "Error parsing os-release file" msgstr "" -#: info.go:138 +#: info.go:141 msgid "Error resolving overrides" msgstr "" -#: info.go:147 info.go:153 +#: info.go:150 info.go:156 msgid "Error encoding script variables" msgstr "" @@ -477,7 +477,7 @@ msgstr "" msgid "Error opening config file" msgstr "" -#: repo.go:88 repo.go:153 +#: repo.go:88 repo.go:153 repo.go:165 msgid "Error encoding config" msgstr "" @@ -497,11 +497,11 @@ msgstr "" msgid "Error removing repo directory" msgstr "" -#: repo.go:170 +#: repo.go:176 msgid "Error removing packages from database" msgstr "" -#: repo.go:182 +#: repo.go:188 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 cd7932d..364a4da 100644 --- a/internal/translations/po/ru/default.po +++ b/internal/translations/po/ru/default.po @@ -145,15 +145,15 @@ msgstr "Для команды info ожидался хотя бы 1 аргуме msgid "Error finding packages" msgstr "Ошибка при поиске пакетов" -#: info.go:129 +#: info.go:132 msgid "Error parsing os-release file" msgstr "Ошибка при разборе файла выпуска операционной системы" -#: info.go:138 +#: info.go:141 msgid "Error resolving overrides" msgstr "Ошибка устранения переорпеделений" -#: info.go:147 info.go:153 +#: info.go:150 info.go:156 msgid "Error encoding script variables" msgstr "Ошибка кодирования переменных скрита" @@ -497,7 +497,7 @@ msgstr "URL-адрес нового репозитория" msgid "Error opening config file" msgstr "Ошибка при открытии конфигурационного файла" -#: repo.go:88 repo.go:153 +#: repo.go:88 repo.go:153 repo.go:165 msgid "Error encoding config" msgstr "Ошибка при кодировании конфигурации" @@ -517,11 +517,11 @@ msgstr "Репозитория не существует" msgid "Error removing repo directory" msgstr "Ошибка при удалении каталога репозитория" -#: repo.go:170 +#: repo.go:176 msgid "Error removing packages from database" msgstr "Ошибка при удалении пакетов из базы данных" -#: repo.go:182 +#: repo.go:188 msgid "Pull all repositories that have changed" msgstr "Скачать все изменённые репозитории" diff --git a/repo.go b/repo.go index 9491a7c..646dee8 100644 --- a/repo.go +++ b/repo.go @@ -160,6 +160,12 @@ func RemoveRepoCmd() *cli.Command { os.Exit(1) } + err = cfg.Save(cfgFl) + if err != nil { + slog.Error(gotext.Get("Error encoding config"), "err", err) + os.Exit(1) + } + db := database.New(cfg) err = db.Init(ctx) if err != nil {