diff --git a/.codebeatsettings b/.codebeatsettings deleted file mode 100644 index e06ac69..0000000 --- a/.codebeatsettings +++ /dev/null @@ -1,11 +0,0 @@ -{ - "GOLANG": { - "ABC": [25, 50, 75, 100], - "CYCLO": [30, 50, 75, 100], - "TOO_MANY_IVARS": [12, 16, 20, 24], - "TOO_MANY_FUNCTIONS": [50, 70, 90, 120], - "LOC": [35, 50, 75, 100], - "TOTAL_COMPLEXITY": [100, 180, 280, 400], - "TOTAL_LOC": [500, 750, 1000, 2000] - } -} diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index a9f09b8..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,51 +0,0 @@ -_Before opening an issue, search for similar bug reports or feature requests on GitHub Issues. If yes, please add a_ 👍 _reaction to the existing issue. If no similar issue can be found, fill out either the "Bug Report" or the "Feature Request" section below. Erase the other section and everything on and above this line._ - -### Bug report - -**System info:** - -* **Verbose application info (`rbinstall -vv`):** -* **Install tools:** - -**Steps to reproduce:** - -1. [First Step] -2. [Second Step] -3. [and so on...] - -**Expected behavior:** - -[What you expected to happen] - -**Actual behavior:** - -[What actually happened] - -**Additional info:** - -[Include gist of relevant config, logs, etc.] - -Please run those if possible and link them from a [gist](http://gist.github.com). - ---- - -### Feature Request - -Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them. - -**Proposal:** - -[Description of the feature] - -**Current behavior:** - -[What currently happens] - -**Desired behavior:** - -[What you would like to happen] - -**Use case:** - -[Why is this important (helps with prioritizing requests)] - diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 0000000..6f3dad3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,64 @@ +name: ❗ Bug Report +description: File a bug report +title: "[Bug]: " +labels: ["issue • bug"] +assignees: + - andyone + +body: + - type: markdown + attributes: + value: | + > [!IMPORTANT] + > Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue. + + - type: textarea + attributes: + label: Verbose application info + description: Output of `rbinstall -vv` command + render: shell + validations: + required: true + + - type: dropdown + id: version + attributes: + label: Install tools + description: How did you install this application + options: + - From Sources + - RPM Package + - Prebuilt Binary + default: 0 + validations: + required: true + + - type: textarea + attributes: + label: Steps to reproduce + description: Short guide on how to reproduce this problem on our site + placeholder: | + 1. [First Step] + 2. [Second Step] + 3. [and so on...] + validations: + required: true + + - type: textarea + attributes: + label: Expected behavior + description: What you expected to happen + validations: + required: true + + - type: textarea + attributes: + label: Actual behavior + description: What actually happened + validations: + required: true + + - type: textarea + attributes: + label: Additional info + description: Include gist of relevant config, logs, etc. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..3ba13e0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml new file mode 100644 index 0000000..14154c8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -0,0 +1,26 @@ +name: ❓ Question +description: Question about application, configuration or code +title: "[Question]: " +labels: ["issue • question"] +assignees: + - andyone + +body: + - type: markdown + attributes: + value: | + > [!IMPORTANT] + > Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue. + + - type: textarea + attributes: + label: Question + description: Detailed question + validations: + required: true + + - type: textarea + attributes: + label: Related version application info + description: Output of `rbinstall -vv` command + render: shell diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml new file mode 100644 index 0000000..39c69e0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/suggestion.yml @@ -0,0 +1,43 @@ +name: ➕ Suggestion +description: Suggest new feature or improvement +title: "[Suggestion]: " +labels: ["issue • suggestion"] +assignees: + - andyone + +body: + - type: markdown + attributes: + value: | + > [!IMPORTANT] + > Before you open an issue, search GitHub Issues for a similar feature requests. If so, please add a 👍 reaction to the existing issue. + > + > Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them. + + - type: textarea + attributes: + label: Proposal + description: Description of the feature + validations: + required: true + + - type: textarea + attributes: + label: Current behavior + description: What currently happens + validations: + required: true + + - type: textarea + attributes: + label: Desired behavior + description: What you would like to happen + validations: + required: true + + - type: textarea + attributes: + label: Use case + description: Why is this important (helps with prioritizing requests) + validations: + required: true diff --git a/.github/workflows/docker-push.yml b/.github/workflows/cd-release.yml similarity index 74% rename from .github/workflows/docker-push.yml rename to .github/workflows/cd-release.yml index 739e087..fadcd8e 100644 --- a/.github/workflows/docker-push.yml +++ b/.github/workflows/cd-release.yml @@ -1,4 +1,4 @@ -name: "Docker Push" +name: "CD (Release)" on: release: @@ -19,15 +19,16 @@ permissions: env: IMAGE_NAME: ${{ github.repository }} + LATEST_IMAGE: ol8 jobs: - Docker: - name: Docker Build & Publish + BuildImage: + name: Image Build & Publish runs-on: ubuntu-latest strategy: matrix: - image: [ 'ol8', 'ol9' ] + image: [ 'ol8', 'ol9', 'ruby', 'ruby-jemalloc', 'jruby' ] steps: - name: Checkout @@ -48,9 +49,32 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare metadata for build + - name: Checkout the latest tag + run: | + rev=$(git rev-list --tags --max-count=1) + tag=$(git describe --tags "$rev") + + if [[ -z "$tag" ]] ; then + echo "::error::Can't find the latest tag" + exit 1 + fi + + echo -e "\033[34mRev:\033[0m $rev" + echo -e "\033[34mTag:\033[0m $tag" + + git checkout "$tag" + + - name: Prepare metadata for the build id: metadata run: | + rev=$(git rev-list --tags --max-count=1) + version=$(git describe --tags "$rev" | tr -d 'v') + + if [[ -z "$version" ]] ; then + echo "::error::Can't find version info" + exit 1 + fi + docker_file=".docker/${{matrix.image}}.docker" base_image=$(grep 'FROM ' $docker_file | grep -v 'builder' | sed 's#${REGISTRY}/##' | tail -1 | cut -f2 -d' ') @@ -59,14 +83,21 @@ jobs: exit 1 fi - dh_tags="${{env.IMAGE_NAME}}:${{matrix.image}}" - gh_tags="ghcr.io/${{env.IMAGE_NAME}}:${{matrix.image}}" + dh_tags="${{env.IMAGE_NAME}}:${{matrix.image}}-$version,${{env.IMAGE_NAME}}:${{matrix.image}}" + gh_tags="ghcr.io/${{env.IMAGE_NAME}}:${{matrix.image}}-$version,ghcr.io/${{env.IMAGE_NAME}}:${{matrix.image}}" + + if [[ -n "${{env.LATEST_IMAGE}}" && "${{env.LATEST_IMAGE}}" == "${{matrix.image}}" ]] ; then + dh_tags="$dh_tags,${{env.IMAGE_NAME}}:latest" + gh_tags="$gh_tags,ghcr.io/${{env.IMAGE_NAME}}:latest" + fi + echo "version=$version" >> $GITHUB_OUTPUT echo "dockerfile=$docker_file" >> $GITHUB_OUTPUT echo "baseimage=$base_image" >> $GITHUB_OUTPUT echo "dh_tags=$dh_tags" >> $GITHUB_OUTPUT echo "gh_tags=$gh_tags" >> $GITHUB_OUTPUT + echo -e "\033[34mVersion:\033[0m $version" echo -e "\033[34mDockerfile:\033[0m $docker_file" echo -e "\033[34mBase image:\033[0m $base_image" echo -e "\033[34mDH Tags:\033[0m $dh_tags" @@ -75,13 +106,13 @@ jobs: - name: Check if build/rebuild is required id: build_check run: | - if [[ "${{github.event_name}}" == "release" ]] ; then + if [[ "$GITHUB_EVENT_NAME" == "release" ]] ; then echo "build=true" >> $GITHUB_OUTPUT exit 0 fi if [[ "${{ github.event.inputs.force_rebuild }}" == "true" ]] ; then - echo "::warning::Rebuild ${{matrix.image}} (reason: forced rebuild)" + echo "::warning::Rebuild ${{matrix.version}} (reason: forced rebuild)" echo "build=true" >> $GITHUB_OUTPUT exit 0 fi diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml new file mode 100644 index 0000000..a072791 --- /dev/null +++ b/.github/workflows/ci-pr.yml @@ -0,0 +1,69 @@ +name: CI (PR) + +on: + pull_request: + branches: [master] + workflow_dispatch: + inputs: + force_run: + description: 'Force workflow run' + required: true + type: choice + options: [yes, no] + +permissions: + actions: read + contents: read + statuses: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + CI: + uses: ./.github/workflows/ci.yml + secrets: inherit + + ImageBuild: + name: Container Image Build Check + runs-on: ubuntu-latest + + needs: CI + + env: + REGISTRY: ghcr.io + + strategy: + matrix: + image: [ 'ol8', 'ol9', 'ruby', 'ruby-jemalloc', 'jruby' ] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to DockerHub + uses: docker/login-action@v3 + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + if: ${{ env.DOCKERHUB_USERNAME != '' }} + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Docker image + run: | + docker build --build-arg REGISTRY=${REGISTRY} -f .docker/${{matrix.image}}.docker -t ${{matrix.image}} . + + - name: Show info about built Docker image + uses: essentialkaos/docker-info-action@v1 + with: + image: ${{matrix.image}} + show-labels: true diff --git a/.github/workflows/ci-push.yml b/.github/workflows/ci-push.yml new file mode 100644 index 0000000..04d2363 --- /dev/null +++ b/.github/workflows/ci-push.yml @@ -0,0 +1,26 @@ +name: CI (Push) + +on: + push: + branches: [master, develop] + workflow_dispatch: + inputs: + force_run: + description: 'Force workflow run' + required: true + type: choice + options: [yes, no] + +permissions: + actions: read + contents: read + statuses: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + CI: + uses: ./.github/workflows/ci.yml + secrets: inherit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6571b0c..0af750d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,29 +1,13 @@ name: CI on: - push: - branches: [master, develop] - pull_request: - branches: [master] - schedule: - - cron: '0 19 */15 * *' - workflow_dispatch: - inputs: - force_run: - description: 'Force workflow run' - required: true - type: choice - options: [yes, no] + workflow_call: permissions: actions: read contents: read statuses: write -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - jobs: Go: name: Go @@ -45,7 +29,7 @@ jobs: - name: Download dependencies run: make deps - - name: Build binary + - name: Build binaries run: make all Perfecto: @@ -83,7 +67,7 @@ jobs: - name: Check dockerfiles with Hadolint uses: essentialkaos/hadolint-action@v1 with: - files: .docker/ol8.docker .docker/ol9.docker .docker/ruby.docker .docker/ruby-jemalloc.docker .docker/jruby.docker + files: .docker/*.docker Typos: name: Typos @@ -98,59 +82,3 @@ jobs: - name: Check spelling continue-on-error: true uses: crate-ci/typos@master - - DockerBuild: - name: Docker Build Check - runs-on: ubuntu-latest - - needs: [Hadolint] - - env: - REGISTRY: ghcr.io - - strategy: - matrix: - image: [ 'ol8', 'ol9' ] - - steps: - - name: Check event type - run: | - if [[ "${{github.event_name}}" != "pull_request" ]] ; then - echo "::notice::Event type is not 'pull_request', all job actions will be skipped" - fi - - # This step is a hack for needs+if issue with actions - # More info about issue: https://github.com/actions/runner/issues/491 - - - name: Checkout - uses: actions/checkout@v4 - if: ${{ github.event_name == 'pull_request' }} - - - name: Login to DockerHub - uses: docker/login-action@v3 - env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - if: ${{ github.event_name == 'pull_request' && env.DOCKERHUB_USERNAME != '' }} - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - if: ${{ github.event_name == 'pull_request' }} - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build Docker image - if: ${{ github.event_name == 'pull_request' }} - run: | - docker build --build-arg REGISTRY=${REGISTRY} -f .docker/${{matrix.image}}.docker -t ${{matrix.image}} . - - - name: Show info about built Docker image - uses: essentialkaos/docker-info-action@v1 - if: ${{ github.event_name == 'pull_request' }} - with: - image: ${{matrix.image}} - show-labels: true diff --git a/README.md b/README.md index 26a308e..e185f36 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@

GoReportCard Code Climate Maintainability - codebeat badge - GitHub Actions CI Status + Codacy badge + GitHub Actions CI Status GitHub Actions CodeQL Status

@@ -27,8 +27,8 @@ #### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo) ```bash -sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm -sudo yum install rbinstall +sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm +sudo dnf install rbinstall ``` ### Usage @@ -49,8 +49,8 @@ sudo yum install rbinstall | Branch | Status | |--------|--------| -| `master` | [![CI](https://kaos.sh/w/rbinstall/ci.svg?branch=master)](https://kaos.sh/w/rbinstall/ci?query=branch:master) | -| `develop` | [![CI](https://kaos.sh/w/rbinstall/ci.svg?branch=develop)](https://kaos.sh/w/rbinstall/ci?query=branch:develop) | +| `master` | [![CI](https://kaos.sh/w/rbinstall/ci-push.svg?branch=master)](https://kaos.sh/w/rbinstall/ci-push?query=branch:master) | +| `develop` | [![CI](https://kaos.sh/w/rbinstall/ci-push.svg?branch=develop)](https://kaos.sh/w/rbinstall/ci-push?query=branch:develop) | ### Contributing diff --git a/cli/cli.go b/cli/cli.go index 84fc346..bdb45cd 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -21,43 +21,44 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v12/env" - "github.com/essentialkaos/ek/v12/fmtc" - "github.com/essentialkaos/ek/v12/fmtutil" - "github.com/essentialkaos/ek/v12/fsutil" - "github.com/essentialkaos/ek/v12/hash" - "github.com/essentialkaos/ek/v12/knf" - "github.com/essentialkaos/ek/v12/log" - "github.com/essentialkaos/ek/v12/options" - "github.com/essentialkaos/ek/v12/pager" - "github.com/essentialkaos/ek/v12/passwd" - "github.com/essentialkaos/ek/v12/path" - "github.com/essentialkaos/ek/v12/progress" - "github.com/essentialkaos/ek/v12/req" - "github.com/essentialkaos/ek/v12/signal" - "github.com/essentialkaos/ek/v12/sortutil" - "github.com/essentialkaos/ek/v12/spinner" - "github.com/essentialkaos/ek/v12/strutil" - "github.com/essentialkaos/ek/v12/support" - "github.com/essentialkaos/ek/v12/support/deps" - "github.com/essentialkaos/ek/v12/support/network" - "github.com/essentialkaos/ek/v12/support/pkgs" - "github.com/essentialkaos/ek/v12/system" - "github.com/essentialkaos/ek/v12/system/container" - "github.com/essentialkaos/ek/v12/terminal" - "github.com/essentialkaos/ek/v12/terminal/tty" - "github.com/essentialkaos/ek/v12/timeutil" - "github.com/essentialkaos/ek/v12/tmp" - "github.com/essentialkaos/ek/v12/usage" - "github.com/essentialkaos/ek/v12/usage/completion/bash" - "github.com/essentialkaos/ek/v12/usage/completion/fish" - "github.com/essentialkaos/ek/v12/usage/completion/zsh" - "github.com/essentialkaos/ek/v12/usage/man" - "github.com/essentialkaos/ek/v12/usage/update" - "github.com/essentialkaos/ek/v12/version" - - knfv "github.com/essentialkaos/ek/v12/knf/validators" - knff "github.com/essentialkaos/ek/v12/knf/validators/fs" + "github.com/essentialkaos/ek/v13/env" + "github.com/essentialkaos/ek/v13/fmtc" + "github.com/essentialkaos/ek/v13/fmtutil" + "github.com/essentialkaos/ek/v13/fsutil" + "github.com/essentialkaos/ek/v13/hash" + "github.com/essentialkaos/ek/v13/knf" + "github.com/essentialkaos/ek/v13/log" + "github.com/essentialkaos/ek/v13/options" + "github.com/essentialkaos/ek/v13/pager" + "github.com/essentialkaos/ek/v13/passwd" + "github.com/essentialkaos/ek/v13/path" + "github.com/essentialkaos/ek/v13/progress" + "github.com/essentialkaos/ek/v13/req" + "github.com/essentialkaos/ek/v13/signal" + "github.com/essentialkaos/ek/v13/sortutil" + "github.com/essentialkaos/ek/v13/spinner" + "github.com/essentialkaos/ek/v13/strutil" + "github.com/essentialkaos/ek/v13/support" + "github.com/essentialkaos/ek/v13/support/deps" + "github.com/essentialkaos/ek/v13/support/network" + "github.com/essentialkaos/ek/v13/support/pkgs" + "github.com/essentialkaos/ek/v13/system" + "github.com/essentialkaos/ek/v13/system/container" + "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v13/terminal/tty" + "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v13/tmp" + "github.com/essentialkaos/ek/v13/usage" + "github.com/essentialkaos/ek/v13/usage/completion/bash" + "github.com/essentialkaos/ek/v13/usage/completion/fish" + "github.com/essentialkaos/ek/v13/usage/completion/zsh" + "github.com/essentialkaos/ek/v13/usage/man" + "github.com/essentialkaos/ek/v13/usage/update" + "github.com/essentialkaos/ek/v13/version" + + knfv "github.com/essentialkaos/ek/v13/knf/validators" + knff "github.com/essentialkaos/ek/v13/knf/validators/fs" + knfn "github.com/essentialkaos/ek/v13/knf/validators/network" "github.com/essentialkaos/npck/tar" "github.com/essentialkaos/npck/tzst" @@ -70,7 +71,7 @@ import ( // App info const ( APP = "RBInstall" - VER = "3.4.4" + VER = "3.5.0" DESC = "Utility for installing prebuilt Ruby versions to rbenv" ) @@ -390,8 +391,15 @@ func loadConfig() { // validateConfig validate knf.values func validateConfig() { errs := knf.Validate([]*knf.Validator{ + {STORAGE_URL, knfv.Set, nil}, + + {STORAGE_URL, knfn.URL, nil}, + {MAIN_TMP_DIR, knff.Perms, "DWX"}, - {STORAGE_URL, knfv.Empty, nil}, + + {LOG_LEVEL, knfv.SetToAnyIgnoreCase, []string{ + "", "debug", "info", "warn", "error", "crit", + }}, }) if len(errs) != 0 { diff --git a/clone/clone.go b/clone/clone.go index 58079a2..590e53d 100644 --- a/clone/clone.go +++ b/clone/clone.go @@ -15,27 +15,27 @@ import ( "runtime" "time" - "github.com/essentialkaos/ek/v12/fmtc" - "github.com/essentialkaos/ek/v12/fmtutil" - "github.com/essentialkaos/ek/v12/fsutil" - "github.com/essentialkaos/ek/v12/httputil" - "github.com/essentialkaos/ek/v12/jsonutil" - "github.com/essentialkaos/ek/v12/options" - "github.com/essentialkaos/ek/v12/path" - "github.com/essentialkaos/ek/v12/pluralize" - "github.com/essentialkaos/ek/v12/progress" - "github.com/essentialkaos/ek/v12/req" - "github.com/essentialkaos/ek/v12/support" - "github.com/essentialkaos/ek/v12/support/deps" - "github.com/essentialkaos/ek/v12/terminal" - "github.com/essentialkaos/ek/v12/terminal/input" - "github.com/essentialkaos/ek/v12/terminal/tty" - "github.com/essentialkaos/ek/v12/timeutil" - "github.com/essentialkaos/ek/v12/usage" - "github.com/essentialkaos/ek/v12/usage/completion/bash" - "github.com/essentialkaos/ek/v12/usage/completion/fish" - "github.com/essentialkaos/ek/v12/usage/completion/zsh" - "github.com/essentialkaos/ek/v12/usage/man" + "github.com/essentialkaos/ek/v13/fmtc" + "github.com/essentialkaos/ek/v13/fmtutil" + "github.com/essentialkaos/ek/v13/fsutil" + "github.com/essentialkaos/ek/v13/httputil" + "github.com/essentialkaos/ek/v13/jsonutil" + "github.com/essentialkaos/ek/v13/options" + "github.com/essentialkaos/ek/v13/path" + "github.com/essentialkaos/ek/v13/pluralize" + "github.com/essentialkaos/ek/v13/progress" + "github.com/essentialkaos/ek/v13/req" + "github.com/essentialkaos/ek/v13/support" + "github.com/essentialkaos/ek/v13/support/deps" + "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v13/terminal/tty" + "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v13/usage" + "github.com/essentialkaos/ek/v13/usage/completion/bash" + "github.com/essentialkaos/ek/v13/usage/completion/fish" + "github.com/essentialkaos/ek/v13/usage/completion/zsh" + "github.com/essentialkaos/ek/v13/usage/man" "github.com/essentialkaos/rbinstall/index" ) @@ -45,7 +45,7 @@ import ( // App info const ( APP = "RBInstall Clone" - VER = "3.1.6" + VER = "3.2.0" DESC = "Utility for cloning RBInstall repository" ) diff --git a/common/rbinstall.spec b/common/rbinstall.spec index 546521e..e5b2cc5 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.4.4 +Version: 3.5.0 Release: 0%{?dist} Group: Applications/System License: Apache License, Version 2.0 @@ -38,7 +38,7 @@ Utility for installing different prebuilt versions of Ruby to rbenv. %package gen Summary: Utility for generating RBInstall index -Version: 3.2.6 +Version: 3.3.0 Release: 0%{?dist} Group: Development/Tools @@ -50,7 +50,7 @@ Utility for generating RBInstall index. %package clone Summary: Utility for cloning RBInstall repository -Version: 3.1.6 +Version: 3.2.0 Release: 0%{?dist} Group: Development/Tools @@ -120,6 +120,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Fri Aug 02 2024 Anton Novojilov - 3.5.0-0 +- ek package updated to v13 + * Sun Jun 23 2024 Anton Novojilov - 3.4.4-0 - [cli|gen|clone] Code refactoring - Dependencies update diff --git a/gen/gen.go b/gen/gen.go index 2681850..ce74191 100644 --- a/gen/gen.go +++ b/gen/gen.go @@ -15,25 +15,25 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v12/fmtc" - "github.com/essentialkaos/ek/v12/fmtutil" - "github.com/essentialkaos/ek/v12/fsutil" - "github.com/essentialkaos/ek/v12/hash" - "github.com/essentialkaos/ek/v12/jsonutil" - "github.com/essentialkaos/ek/v12/options" - "github.com/essentialkaos/ek/v12/path" - "github.com/essentialkaos/ek/v12/sortutil" - "github.com/essentialkaos/ek/v12/strutil" - "github.com/essentialkaos/ek/v12/support" - "github.com/essentialkaos/ek/v12/support/deps" - "github.com/essentialkaos/ek/v12/terminal" - "github.com/essentialkaos/ek/v12/terminal/tty" - "github.com/essentialkaos/ek/v12/timeutil" - "github.com/essentialkaos/ek/v12/usage" - "github.com/essentialkaos/ek/v12/usage/completion/bash" - "github.com/essentialkaos/ek/v12/usage/completion/fish" - "github.com/essentialkaos/ek/v12/usage/completion/zsh" - "github.com/essentialkaos/ek/v12/usage/man" + "github.com/essentialkaos/ek/v13/fmtc" + "github.com/essentialkaos/ek/v13/fmtutil" + "github.com/essentialkaos/ek/v13/fsutil" + "github.com/essentialkaos/ek/v13/hash" + "github.com/essentialkaos/ek/v13/jsonutil" + "github.com/essentialkaos/ek/v13/options" + "github.com/essentialkaos/ek/v13/path" + "github.com/essentialkaos/ek/v13/sortutil" + "github.com/essentialkaos/ek/v13/strutil" + "github.com/essentialkaos/ek/v13/support" + "github.com/essentialkaos/ek/v13/support/deps" + "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v13/terminal/tty" + "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v13/usage" + "github.com/essentialkaos/ek/v13/usage/completion/bash" + "github.com/essentialkaos/ek/v13/usage/completion/fish" + "github.com/essentialkaos/ek/v13/usage/completion/zsh" + "github.com/essentialkaos/ek/v13/usage/man" "github.com/essentialkaos/rbinstall/index" ) @@ -43,7 +43,7 @@ import ( // App info const ( APP = "RBInstall Gen" - VER = "3.2.6" + VER = "3.3.0" DESC = "Utility for generating RBInstall index" ) diff --git a/go.mod b/go.mod index 90c9bc1..41447e5 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,17 @@ module github.com/essentialkaos/rbinstall -go 1.19 +go 1.21 require ( - github.com/essentialkaos/ek/v12 v12.127.0 + github.com/essentialkaos/ek/v13 v13.3.1 github.com/essentialkaos/npck v1.6.3 ) require ( github.com/essentialkaos/depsy v1.3.0 // indirect + github.com/essentialkaos/ek/v12 v12.130.0 // indirect github.com/essentialkaos/go-linenoise/v3 v3.6.0 // indirect github.com/klauspost/compress v1.17.9 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/sys v0.22.0 // indirect ) diff --git a/go.sum b/go.sum index db1c241..2b04a60 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,11 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk= +github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU= github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.127.0 h1:fU5A+QbIZ7NTq1K5jGVwAWwuLtBUhsIKuRWYT78hE+Q= -github.com/essentialkaos/ek/v12 v12.127.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw= +github.com/essentialkaos/ek/v12 v12.130.0 h1:JhcjGZaBIEFfyNReHAHeTgldNv65ruHa9LR7YIVgmn0= +github.com/essentialkaos/ek/v12 v12.130.0/go.mod h1:yGof+LJIkWvQtGINs+2AGv/yeqcfj/brpQ9eYnzMzKs= +github.com/essentialkaos/ek/v13 v13.3.1 h1:RcBJrBeEKby4I8386FHYxbVhj3XbJP2SS0uz2AJH+1Q= +github.com/essentialkaos/ek/v13 v13.3.1/go.mod h1:RVf1NpNyK04xkBJ3NTUD1wNLWemY9/naVD4iEVjU2fA= github.com/essentialkaos/go-linenoise/v3 v3.6.0 h1:deLcrodtLIkcHjNyW/MoQpjznXPVqvwlspxk7s/5YeY= github.com/essentialkaos/go-linenoise/v3 v3.6.0/go.mod h1:Fi6kLdZdURkXHpRkIiX2nFGORNv81CXTZ2Mn72i/cn0= github.com/essentialkaos/npck v1.6.3 h1:isUq6nkPuL6/PD8lcN1lvFmJEDP8smeGhINmkTFG1Ho= @@ -10,9 +13,12 @@ github.com/essentialkaos/npck v1.6.3/go.mod h1:ZQOPKznWzmoq1mMU2jWfJTbJ418P49hNl github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/index/index.go b/index/index.go index 7b3c71f..6e7a5ed 100644 --- a/index/index.go +++ b/index/index.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v12/sortutil" - "github.com/essentialkaos/ek/v12/uuid" + "github.com/essentialkaos/ek/v13/sortutil" + "github.com/essentialkaos/ek/v13/uuid" ) // ////////////////////////////////////////////////////////////////////////////////// //