From 6a879abb3373f0f7f008ed88f1286042a880220f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 12 Jan 2024 18:22:20 +0300 Subject: [PATCH 1/5] [cli] Fixes --- cli/cli.go | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 6273ef2..c740431 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -66,7 +66,7 @@ import ( // App info const ( APP = "RBInstall" - VER = "3.3.0" + VER = "3.3.1" DESC = "Utility for installing prebuilt Ruby versions to rbenv" ) @@ -768,10 +768,12 @@ func installVersion(rubyVersion string, reinstall bool) { gemName, gemVersion := parseGemInfo(gem) taskDesc := fmt.Sprintf("Installing %s", gemName) - if gemVersion != "" { + if gemVersion == "" || gemVersion == "latest" { + taskDesc += fmt.Sprintf(" (latest)") + } else if strings.Count(gemVersion, ".") < 2 { taskDesc += fmt.Sprintf(" (%s.x)", gemVersion) } else { - taskDesc += fmt.Sprintf(" (latest)") + taskDesc += fmt.Sprintf(" (%s)", gemVersion) } spinner.Show(taskDesc) @@ -941,18 +943,18 @@ func unistallTaskHandler(versionName string) error { var err error - // Remove symlink - if fsutil.IsExist(path.Join(versionsDir, cleanVersionName)) { - err = os.Remove(path.Join(versionsDir, cleanVersionName)) + // Remove directory with files + if fsutil.IsExist(path.Join(versionsDir, versionName)) { + err = os.RemoveAll(path.Join(versionsDir, versionName)) if err != nil { return err } } - // Remove directory with files - if fsutil.IsExist(path.Join(versionsDir, versionName)) { - err = os.RemoveAll(path.Join(versionsDir, versionName)) + // Remove symlink + if fsutil.IsExist(path.Join(versionsDir, cleanVersionName)) { + err = os.Remove(path.Join(versionsDir, cleanVersionName)) if err != nil { return err @@ -1068,10 +1070,12 @@ func updateGems(rubyVersion string) { for _, gem := range strings.Split(knf.GetS(GEMS_INSTALL), " ") { gemName, gemVersion := parseGemInfo(gem) - if gemVersion != "" { + if gemVersion == "" || gemVersion == "latest" { + gemVerInfo = fmt.Sprintf("(latest)") + } else if strings.Count(gemVersion, ".") < 2 { gemVerInfo = fmt.Sprintf("(%s.x)", gemVersion) } else { - gemVerInfo = fmt.Sprintf("(latest)") + gemVerInfo = fmt.Sprintf("(%s)", gemVersion) } if isGemInstalled(rubyVersion, gemName) { @@ -1119,7 +1123,11 @@ func runGemCmd(rubyVersion, cmd, gem, gemVersion string) (string, error) { gemCmd := exec.Command(rubyPath+"/bin/ruby", rubyPath+"/bin/gem", cmd, gem, "--force") if gemVersion != "" { - gemCmd.Args = append(gemCmd.Args, "--version", fmt.Sprintf("~>%s", gemVersion)) + if strings.Count(gemVersion, ".") >= 2 { + gemCmd.Args = append(gemCmd.Args, "--version", fmt.Sprintf("%s", gemVersion)) + } else { + gemCmd.Args = append(gemCmd.Args, "--version", fmt.Sprintf("~>%s.0", gemVersion)) + } } if knf.GetB(GEMS_NO_DOCUMENT) { From f24fcf98603e9b6464309246bed7d54436e37420 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Fri, 12 Jan 2024 18:31:22 +0300 Subject: [PATCH 2/5] [cli] Code refactoring --- cli/cli.go | 63 ++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index c740431..1568d8f 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -746,13 +746,8 @@ func installVersion(rubyVersion string, reinstall bool) { if knf.GetB(GEMS_RUBYGEMS_UPDATE) && strutil.HasPrefixAny(info.Name, "1", "2", "3") { rgVersion := getAdvisableRubyGemsVersion(info.Name) - gemVersion := rgVersion - if gemVersion != "latest" && strings.Count(gemVersion, ".") < 2 { - gemVersion += ".x" - } - - spinner.Show("Updating RubyGems to %s", gemVersion) + spinner.Show("Updating RubyGems to %s", formatGemVersion(rgVersion)) err = updateRubygemsTaskHandler(info.Name, rgVersion) spinner.Done(err == nil) @@ -766,17 +761,8 @@ func installVersion(rubyVersion string, reinstall bool) { if knf.GetS(GEMS_INSTALL) != "" { for _, gem := range strings.Split(knf.GetS(GEMS_INSTALL), " ") { gemName, gemVersion := parseGemInfo(gem) - taskDesc := fmt.Sprintf("Installing %s", gemName) - - if gemVersion == "" || gemVersion == "latest" { - taskDesc += fmt.Sprintf(" (latest)") - } else if strings.Count(gemVersion, ".") < 2 { - taskDesc += fmt.Sprintf(" (%s.x)", gemVersion) - } else { - taskDesc += fmt.Sprintf(" (%s)", gemVersion) - } - spinner.Show(taskDesc) + spinner.Show(fmt.Sprintf("Installing %s (%s)", gemName, formatGemVersion(gemVersion))) _, err = installGemTaskHandler(info.Name, gemName, gemVersion) spinner.Done(err == nil) @@ -1065,24 +1051,16 @@ func updateGems(rubyVersion string) { // //////////////////////////////////////////////////////////////////////////////// // if knf.GetS(GEMS_INSTALL) != "" { - var gemVerInfo, installedVersion string + var installedVersion string for _, gem := range strings.Split(knf.GetS(GEMS_INSTALL), " ") { gemName, gemVersion := parseGemInfo(gem) - if gemVersion == "" || gemVersion == "latest" { - gemVerInfo = fmt.Sprintf("(latest)") - } else if strings.Count(gemVersion, ".") < 2 { - gemVerInfo = fmt.Sprintf("(%s.x)", gemVersion) - } else { - gemVerInfo = fmt.Sprintf("(%s)", gemVersion) - } - if isGemInstalled(rubyVersion, gemName) { - spinner.Show("Updating %s %s", gemName, gemVerInfo) + spinner.Show("Updating %s (%s)", gemName, formatGemVersion(gemVersion)) installedVersion, err = updateGemTaskHandler(rubyVersion, gemName, gemVersion) } else { - spinner.Show("Installing %s %s", gemName, gemVerInfo) + spinner.Show("Installing %s (%s)", gemName, formatGemVersion(gemVersion)) installedVersion, err = installGemTaskHandler(rubyVersion, gemName, gemVersion) } @@ -1150,28 +1128,28 @@ func runGemCmd(rubyVersion, cmd, gem, gemVersion string) (string, error) { return version, nil } - if gemVersion == "" { - gemVersion = "latest" - } else if strings.Count(gemVersion, ".") < 2 { - gemVersion += ".x" - } - actionLog, err := logFailedAction(strings.TrimRight(string(output), "\r\n")) if err == nil { switch cmd { case "update": - return "", fmtc.Errorf("Can't update gem %s (%s). Gem command output saved as %s.", gem, gemVersion, actionLog) + return "", fmtc.Errorf( + "Can't update gem %s (%s). Gem command output saved as %s.", + gem, formatGemVersion(gemVersion), actionLog, + ) default: - return "", fmtc.Errorf("Can't install gem %s (%s). Gem command output saved as %s.", gem, gemVersion, actionLog) + return "", fmtc.Errorf( + "Can't install gem %s (%s). Gem command output saved as %s.", + gem, formatGemVersion(gemVersion), actionLog, + ) } } switch cmd { case "update": - return "", fmtc.Errorf("Can't update gem %s (%s)", gem, gemVersion) + return "", fmtc.Errorf("Can't update gem %s (%s)", gem, formatGemVersion(gemVersion)) default: - return "", fmtc.Errorf("Can't install gem %s (%s)", gem, gemVersion) + return "", fmtc.Errorf("Can't install gem %s (%s)", gem, formatGemVersion(gemVersion)) } } @@ -1477,6 +1455,17 @@ func isGemInstalled(rubyVersion string, gemName string) bool { return false } +// formatGemVersion formats info about gem +func formatGemVersion(gemVersion string) string { + if gemVersion == "" || gemVersion == "latest" { + return "latest" + } else if strings.Count(gemVersion, ".") < 2 { + return fmt.Sprintf("%s.x", gemVersion) + } + + return gemVersion +} + // isVersionInstalled return true is given version already installed func isVersionInstalled(rubyVersion string) bool { fullPath := getVersionPath(rubyVersion) From bbaed99f3d9f95f876f83b7a013784ad9c14abc3 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 15 Jan 2024 13:05:27 +0300 Subject: [PATCH 3/5] Improve README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index a6d338f..b460ccc 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,9 @@ `rbinstall` is a utility for installing prebuilt Ruby to [rbenv](https://github.com/rbenv/rbenv). +> [!NOTE] +> Take a look at our [FAQ](https://kaos.sh/rbinstall/w/FAQ) for more information. + ### Usage demo [![demo](https://gh.kaos.st/rbinstall-300.gif)](#usage-demo) From 667541a7464c0274c99b037962c5257f9ca9f6f2 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 16 Jan 2024 00:05:56 +0300 Subject: [PATCH 4/5] [cli] Improvements --- cli/cli.go | 137 ++++++++++++++++++++++++++++++------------ common/rbinstall.spec | 14 +++-- index/index.go | 2 +- 3 files changed, 110 insertions(+), 43 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 1568d8f..7795b9f 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -66,7 +66,7 @@ import ( // App info const ( APP = "RBInstall" - VER = "3.3.1" + VER = "3.4.0" DESC = "Utility for installing prebuilt Ruby versions to rbenv" ) @@ -544,13 +544,23 @@ func printPrettyListing(dist, arch string) { } } - ruby := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_RUBY, options.GetB(OPT_ALL)) - jruby := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_JRUBY, options.GetB(OPT_ALL)) - truffle := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_TRUFFLE, options.GetB(OPT_ALL)) - other := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_OTHER, options.GetB(OPT_ALL)) + ruby := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_RUBY, true) + jruby := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_JRUBY, true) + truffle := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_TRUFFLE, true) + other := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_OTHER, true) + + rubyTotal := ruby.Total() + jrubyTotal := jruby.Total() + truffleTotal := truffle.Total() + otherTotal := other.Total() installed := getInstalledVersionsMap() + ruby = filterCategoryData(ruby, installed) + jruby = filterCategoryData(jruby, installed) + truffle = filterCategoryData(truffle, installed) + other = filterCategoryData(other, installed) + configureCategorySizes(map[string]index.CategoryData{ index.CATEGORY_RUBY: ruby, index.CATEGORY_JRUBY: jruby, @@ -558,11 +568,6 @@ func printPrettyListing(dist, arch string) { index.CATEGORY_OTHER: other, }) - rubyTotal := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_RUBY, true).Total() - jrubyTotal := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_JRUBY, true).Total() - truffleTotal := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_TRUFFLE, true).Total() - otherTotal := repoIndex.GetCategoryData(dist, arch, index.CATEGORY_OTHER, true).Total() - headerTemplate := getCategoryHeaderStyle(index.CATEGORY_RUBY) + " " + getCategoryHeaderStyle(index.CATEGORY_JRUBY) + " " + getCategoryHeaderStyle(index.CATEGORY_TRUFFLE) + " " + @@ -570,10 +575,10 @@ func printPrettyListing(dist, arch string) { fmtc.Printf( headerTemplate, - fmt.Sprintf("%s (%d)", strings.ToUpper(index.CATEGORY_RUBY), rubyTotal), - fmt.Sprintf("%s (%d)", strings.ToUpper(index.CATEGORY_JRUBY), jrubyTotal), - fmt.Sprintf("%s (%d)", strings.ToUpper(index.CATEGORY_TRUFFLE), truffleTotal), - fmt.Sprintf("%s (%d)", strings.ToUpper(index.CATEGORY_OTHER), otherTotal), + fmt.Sprintf("%s (%d/%d)", strings.ToUpper(index.CATEGORY_RUBY), countVersions(ruby), rubyTotal), + fmt.Sprintf("%s (%d/%d)", strings.ToUpper(index.CATEGORY_JRUBY), countVersions(jruby), jrubyTotal), + fmt.Sprintf("%s (%d/%d)", strings.ToUpper(index.CATEGORY_TRUFFLE), countVersions(truffle), truffleTotal), + fmt.Sprintf("%s (%d/%d)", strings.ToUpper(index.CATEGORY_OTHER), countVersions(other), otherTotal), ) var counter int @@ -597,7 +602,7 @@ func printPrettyListing(dist, arch string) { if !options.GetB(OPT_ALL) { fmtc.NewLine() - fmtc.Println("{s-}For listing outdated versions use option '--all'{!}") + fmtc.Println("{s-}For listing outdated versions use option '--all/-a'{!}") } } @@ -655,6 +660,10 @@ func installVersion(rubyVersion string, reinstall bool) { printErrorAndExit(err.Error()) } + progress.DefaultSettings.BarFgColorTag = "{" + categoryColor[category] + "}" + spinner.SpinnerColorTag = "{" + categoryColor[category] + "}" + fmtc.NameColor("category", "{"+categoryColor[category]+"}") + checkRBEnv() checkDependencies(info, category) @@ -672,10 +681,6 @@ func installVersion(rubyVersion string, reinstall bool) { var file string - progress.DefaultSettings.BarFgColorTag = "{" + categoryColor[category] + "}" - spinner.SpinnerColorTag = "{" + categoryColor[category] + "}" - fmtc.NameColor("category", "{"+categoryColor[category]+"}") - if !noProgress { fmtc.Printf("Fetching {*}{?category}%s{!} from storage…\n", info.Name) file, err = downloadFile(info) @@ -1025,12 +1030,21 @@ func updateGems(rubyVersion string) { printErrorAndExit("Version %s is not installed", rubyVersion) } + _, category, err := getVersionInfo(rubyVersion) + + if err == nil { + fmtc.NameColor("category", "{"+categoryColor[category]+"}") + spinner.SpinnerColorTag = "{" + categoryColor[category] + "}" + } else { + fmtc.NameColor("category", "{"+categoryColor[index.CATEGORY_RUBY]+"}") + } + checkRBEnv() runDate = time.Now() installed := false - fmtc.Printf("Updating gems for {c}%s{!}…\n\n", rubyVersion) + fmtc.Printf("Updating gems for {?category}%s{!}…\n\n", rubyVersion) // //////////////////////////////////////////////////////////////////////////////// // @@ -1155,18 +1169,11 @@ func runGemCmd(rubyVersion, cmd, gem, gemVersion string) (string, error) { // updateRubygems update rubygems to defined version func updateRubygems(rubyVersion, gemVersion string) error { - var gemCmd *exec.Cmd - rubyPath := getVersionPath(rubyVersion) + gemCmd := exec.Command(rubyPath+"/bin/ruby", rubyPath+"/bin/gem", "update", "--no-document", "--system") - if gemVersion == "latest" { - gemCmd = exec.Command(rubyPath+"/bin/ruby", rubyPath+"/bin/gem", "update", "--system") - } else { - gemCmd = exec.Command(rubyPath+"/bin/ruby", rubyPath+"/bin/gem", "update", "--system", gemVersion) - } - - if knf.GetB(GEMS_NO_DOCUMENT) { - gemCmd.Args = append(gemCmd.Args, "--no-document") + if gemVersion != "latest" { + gemCmd.Args = append(gemCmd.Args, gemVersion) } if knf.GetS(GEMS_SOURCE) != "" { @@ -1292,7 +1299,7 @@ func printCurrentVersionName(category string, versions index.CategoryData, insta } } - printRubyVersion(category, prettyName) + printRubyVersion(category, prettyName, info.EOL) return true } @@ -1348,8 +1355,12 @@ func printSized(format string, size int, a ...any) { } // printRubyVersion print version with align spaces -func printRubyVersion(category, name string) { - fmtc.Printf(" " + name + getAlignSpaces(fmtc.Clean(name), categorySize[category]) + " ") +func printRubyVersion(category, name string, eol bool) { + if !eol { + fmtc.Printf(" " + name + getAlignSpaces(fmtc.Clean(name), categorySize[category]) + " ") + } else { + fmtc.Printf(" {s}" + name + "{!}" + getAlignSpaces(fmtc.Clean(name), categorySize[category]) + " ") + } } // configureCategorySizes configure column size for each category @@ -1556,6 +1567,49 @@ func getInstalledVersionsMap() map[string]bool { return result } +// filterCategoryData filters category data removing EOL versions +func filterCategoryData(versions index.CategoryData, installed map[string]bool) index.CategoryData { + var result index.CategoryData + + showAll := options.GetB(OPT_ALL) + +MAIN: + for _, info := range versions { + if info.EOL && !showAll { + for _, vInfo := range info.Variations { + if installed[vInfo.Name] { + result = append(result, info) + continue MAIN + } + } + + if installed[info.Name] { + result = append(result, info) + continue MAIN + } + } else { + result = append(result, info) + } + } + + return result +} + +// countVersions counts versions in category data +func countVersions(versions index.CategoryData) int { + var result int + + for _, info := range versions { + if info.EOL { + continue + } + + result += len(info.Variations) + 1 + } + + return result +} + // getVersionGemPath returns path to directory with installed gems func getVersionGemDirPath(rubyVersion string) string { gemsPath := getVersionPath(rubyVersion) + "/lib/ruby/gems" @@ -1580,12 +1634,12 @@ func getVersionPath(rubyVersion string) string { // getRBEnvVersionsPath return path to rbenv directory with all versions func getRBEnvVersionsPath() string { - return knf.GetS(RBENV_DIR) + "/versions" + return path.Join(knf.GetS(RBENV_DIR), "versions") } // getUnpackDirPath return path to directory for unpacking data func getUnpackDirPath() string { - return getRBEnvVersionsPath() + "/.rbinstall" + return path.Join(getRBEnvVersionsPath(), ".rbinstall") } // getAlignSpaces return spaces for output align @@ -1595,15 +1649,22 @@ func getAlignSpaces(t string, l int) string { // getGemSourceURL return url of gem source func getGemSourceURL(rubyVersion string) string { + source := knf.GetS(GEMS_SOURCE) + + if strutil.HasPrefixAny(source, "https://", "http://") { + source = strutil.Exclude(source, "https://") + source = strutil.Exclude(source, "http://") + } + if strings.HasPrefix(rubyVersion, "1.8") { - return "http://" + knf.GetS(GEMS_SOURCE) + return "http://" + source } if !options.GetB(OPT_GEMS_INSECURE) && knf.GetB(GEMS_SOURCE_SECURE, false) { - return "https://" + knf.GetS(GEMS_SOURCE) + return "https://" + source } - return "http://" + knf.GetS(GEMS_SOURCE) + return "http://" + source } // checkRBEnv check rbenv directory and state diff --git a/common/rbinstall.spec b/common/rbinstall.spec index ae0a082..a310c5b 100644 --- a/common/rbinstall.spec +++ b/common/rbinstall.spec @@ -10,7 +10,7 @@ Summary: Utility for installing prebuilt Ruby to rbenv Name: rbinstall -Version: 3.3.0 +Version: 3.4.0 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: rbenv libyaml ca-certificates zlib >= 1.2.11 -BuildRequires: golang >= 1.20 +BuildRequires: golang >= 1.21 Provides: %{name} = %{version}-%{release} @@ -39,7 +39,7 @@ Utility for installing different prebuilt versions of Ruby to rbenv. Summary: Utility for generating RBInstall index Version: 3.2.1 -Release: 0%{?dist} +Release: 1%{?dist} Group: Development/Tools %description gen @@ -51,7 +51,7 @@ Utility for generating RBInstall index. Summary: Utility for cloning RBInstall repository Version: 3.1.1 -Release: 0%{?dist} +Release: 1%{?dist} Group: Development/Tools %description clone @@ -118,6 +118,12 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Mon Jan 15 2024 Anton Novojilov - 3.4.0-0 +- [cli] Improved versions listing +- [cli] Fixed bug with uninstalling +- [cli] UI fixes +- [cli] Code refactoring + * Fri Jan 12 2024 Anton Novojilov - 3.3.0-0 - [cli] Improved rubygems gem update - [cli|gen|clone] Code refactoring diff --git a/index/index.go b/index/index.go index effd966..a87e3ae 100644 --- a/index/index.go +++ b/index/index.go @@ -58,7 +58,7 @@ type CategoryData []*VersionInfo // VersionInfo contains info about particular version type VersionInfo struct { - Variations []*VersionInfo `json:"variations,omitempty"` // Info about version variations (railsexpress/jemalloc) + Variations []*VersionInfo `json:"variations,omitempty"` // Info about version variations (jemalloc) Name string `json:"name"` // Base version name File string `json:"file"` // Full filename (with extension) Path string `json:"path"` // Relative path to file From 06bfa669e5c80630d54a6ad41ff337076eda0dfd Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 16 Jan 2024 15:19:44 +0300 Subject: [PATCH 5/5] Dependencies update --- cli/cli.go | 2 +- clone/clone.go | 2 +- common/rbinstall.spec | 9 +++++---- gen/gen.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 7795b9f..64540e8 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -602,7 +602,7 @@ func printPrettyListing(dist, arch string) { if !options.GetB(OPT_ALL) { fmtc.NewLine() - fmtc.Println("{s-}For listing outdated versions use option '--all/-a'{!}") + fmtc.Printf("{s-}For listing outdated versions use option '%s'{!}\n", options.Format(OPT_ALL)) } } diff --git a/clone/clone.go b/clone/clone.go index 787e015..d7bcce7 100644 --- a/clone/clone.go +++ b/clone/clone.go @@ -43,7 +43,7 @@ import ( // App info const ( APP = "RBInstall Clone" - VER = "3.1.1" + VER = "3.1.2" DESC = "Utility for cloning RBInstall repository" ) diff --git a/common/rbinstall.spec b/common/rbinstall.spec index a310c5b..10a5981 100644 --- a/common/rbinstall.spec +++ b/common/rbinstall.spec @@ -38,8 +38,8 @@ Utility for installing different prebuilt versions of Ruby to rbenv. %package gen Summary: Utility for generating RBInstall index -Version: 3.2.1 -Release: 1%{?dist} +Version: 3.2.2 +Release: 0%{?dist} Group: Development/Tools %description gen @@ -50,8 +50,8 @@ Utility for generating RBInstall index. %package clone Summary: Utility for cloning RBInstall repository -Version: 3.1.1 -Release: 1%{?dist} +Version: 3.1.2 +Release: 0%{?dist} Group: Development/Tools %description clone @@ -123,6 +123,7 @@ rm -rf %{buildroot} - [cli] Fixed bug with uninstalling - [cli] UI fixes - [cli] Code refactoring +- Dependencies update * Fri Jan 12 2024 Anton Novojilov - 3.3.0-0 - [cli] Improved rubygems gem update diff --git a/gen/gen.go b/gen/gen.go index 511aa1c..f44feb4 100644 --- a/gen/gen.go +++ b/gen/gen.go @@ -41,7 +41,7 @@ import ( // App info const ( APP = "RBInstall Gen" - VER = "3.2.1" + VER = "3.2.2" DESC = "Utility for generating RBInstall index" ) diff --git a/go.mod b/go.mod index 10ea326..233fd33 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.93.0 + github.com/essentialkaos/ek/v12 v12.94.0 github.com/essentialkaos/npck v1.6.2 ) diff --git a/go.sum b/go.sum index 81e5ef5..ec481b7 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.93.0 h1:5lwuNYgUYjQHy2h57adWt2t1w5L2MxqTPKgHjyH3h6k= -github.com/essentialkaos/ek/v12 v12.93.0/go.mod h1:peB5w8zUkRuDs7m/QG5Z2gMmqzSIs2viAmxzzNFIIoo= +github.com/essentialkaos/ek/v12 v12.94.0 h1:3mPRCOsJKictpqOuydZ0HleCQb/3B3STFo8GJ4yjFOM= +github.com/essentialkaos/ek/v12 v12.94.0/go.mod h1:peB5w8zUkRuDs7m/QG5Z2gMmqzSIs2viAmxzzNFIIoo= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/essentialkaos/npck v1.6.2 h1:OqV74UfA9qoRYbFVsZ+KYH9kY//1nU6uX/HBfAltUQ4=