renuo-cli 4.13.0 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57fc12b5a4094d854e4c1286323f5ba2a2f14186e4848a8e0d22e8e170588fb
-  data.tar.gz: f612852d8349bfd0a5961c058b8cd6196dd60056544a72e81cfc0be862e9ba28
+  metadata.gz: 8d640a2a344a4f7297eaa13bef43760785530de9f46deef2a4016665b5ced8e8
+  data.tar.gz: 1fc8e948cf5c4ef86c6be83f001338cef37a84da78088c7929d162d7e891c6e9
 SHA512:
-  metadata.gz: 30791f47ca4ac90b0d1ea21af197c1f2ff4d8bfc763a3b8869848b2042bd68c33cd4fb33ab7ed04e63595f92f8e56631c41ce64a05a002fceb969222279f9bbf
-  data.tar.gz: ec909b93570706e37b446064b1306c261912e35e8aa166990aa23cc5b70cad02a4efa9e21f5af8954c4748a0786d706bf6f91c366bdfb2a5cad907088bc20587
+  metadata.gz: 7a11af0c25dd6c23eecda8f9e588ff9a599714c5e9b8b9ef9d41c3488d28a71ab834c1789cddb4aa81a73eefb72f3ce98d028b263c81fe6dd2f108f58ea3c7af
+  data.tar.gz: 5c323269241ed04e97243bf8009aa527fa508491e5a62169d4c77303496a17c1ced584537ab7cea02666d082b8b720730237ea47d7abb967b4a50a447c093ec7

data/README.md

@@ -20,7 +20,7 @@ After checking out the repo, run `bin/setup` to install dependencies.
 
 Run `rake spec` to run the tests.
 
-Run `ruby -Ilib ./bin/renuo` to run the executable. (e.g. `ruby -Ilib ./bin/renuo -v`)
+Run `bundle exec ruby -Ilib ./bin/renuo` to run the executable. (e.g. `ruby -Ilib ./bin/renuo -v`)
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

data/lib/renuo/cli/commands/check_deploio_status.rb

@@ -83,7 +83,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
     when "available", "success"
       puts "#{type} succeeded"
       true
-    when "error", "failed"
+    when "error", "failed", "failure"
       puts fetch_build_logs
       abort "#{type} failed"
     else

data/lib/renuo/cli/commands/create_deploio_app.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "../helpers/environments"
+
 class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLength
-  DATABASE_SSH_KEY_FILE = "temporary_database_ssh_key"
   GITHUB_SSH_KEY_FILE_NAME = "temporary_repository_ssh_key"
   GITHUB_DEPLOY_KEY_TITLE = "deploio-deploy-key"
   SSH_ALGORITHM = "Ed25519"
+  PROJECT_NAME_PREFIX = "renuo-"
 
   command "create-deploio-app" do |c|
     c.syntax = "renuo create-deploio-app"
@@ -32,32 +34,71 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     cleanup
   end
 
+  def git_url_valid?(git_url)
+    http_git_url_regex = %r{^https?://[\w.-]+/[\w.-]+/[\w.-]+(?:\.git)?/?$}
+    ssh_git_url_regex = %r{^(git@[\w.-]+[:|/][\w.-]+/[\w.-]+\.git)$}
+    git_url.match?(http_git_url_regex) || git_url.match?(ssh_git_url_regex)
+  end
+
   private
 
-  def parse_arguments # rubocop:disable Metrics/MethodLength
-    @project_name = ask("Enter the project name (e.g: my_app): ")
-    validate_project_name!
+  def parse_arguments
+    set_project_name
+    set_git_url
+    set_postgres_version
+    set_vault_name
+  end
 
-    @app_name = ask("Enter the app name (e.g: main): ")
-    validate_app_name!
+  def set_project_name
+    loop do
+      @project_name = ask("Enter the project name (e.g: my-app): ")
 
-    @git_url = ask("Enter the git URL (e.g: git@github.com:my-org/my-app.git): ")
-    validate_git_url
+      break if @project_name&.length&.between?(3, 63) && @project_name.match?(/^[a-z0-9-]+$/)
 
-    @postgres_version = ask("Enter the Postgres version (major version only, e.g., 16): ")
-    validate_postgres_version
+      say ">> Project name must be between 3 and 63 characters and can only contain lowercase letters, " \
+          "numbers, and hyphens. Please try again.".colorize(:red)
+    end
 
-    @vault_name = ask("Enter the 1Password vault name (leave empty to skip): ")
-    if @vault_name.empty?
-      say "Skipping 1Password vault setup. Defaulting to Deploio."
-      @vault_name = "Deploio"
-    else
-      validate_vault_name
+    @project_display_name = @project_name
+    @project_name = PROJECT_NAME_PREFIX + @project_name
+  end
+
+  def set_git_url
+    loop do
+      @git_url = ask("Enter the git URL (e.g: git@github.com:my-org/my-app.git): ")
+      break if @git_url.present? && git_url_valid?(@git_url)
+
+      say ">> Git URL must be provided and valid. Please try again.".colorize(:red)
+    end
+  end
+
+  def set_postgres_version
+    loop do
+      @postgres_version = ask("Enter Postgres version (e.g., 16) or leave empty to skip database creation: ")
+      break if @postgres_version.empty? || @postgres_version.match?(/^\d+$/)
+
+      say ">> The postgres version is invalid. Only major versions are allowed. " \
+          "For example, use 16 instead of 16.4. Please try again.".colorize(:red)
+    end
+  end
+
+  def set_vault_name # rubocop:disable Metrics/MethodLength
+    loop do
+      @vault_name = ask("Enter the 1Password vault name (leave empty to skip): ")
+      if @vault_name.empty?
+        say "Skipping 1Password vault setup. Defaulting to Deploio."
+        @vault_name = "Deploio"
+        break
+      elsif @vault_name.present?
+        break
+      else
+        say ">> The vault name must be provided. Please try again.".colorize(:red)
+      end
     end
   end
 
   def setup_commands
-    say "# Commands to setup your Deploio application\n".bold
+    say "\n# Commands to setup your Deploio applications\n".bold
     say_project_creation
     say "\n# Configure repository access\n".bold
     say_configure_repository_deploy_key
@@ -65,49 +106,24 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def setup_environments
     ENVIRONMENTS.each do |environment|
+      unless @postgres_version.empty?
+        say "\n# Commands to create #{environment} database \n".bold
+        say_database_creation(environment)
+      end
+
       say "\n# Commands to create #{environment} application \n".bold
-      say_database_creation(environment)
-      say "\n# Commands to create #{environment} database \n".bold
       say_app_creation(environment)
     end
   end
 
   def cleanup
-    say "rm #{GITHUB_SSH_KEY_FILE_NAME}"
-  end
-
-  def validate_app_name!
-    abort(">> App name must be provided") if @app_name.blank?
-  end
-
-  def validate_project_name!
-    abort(">> Project name must be between 3 and 63 characters.") unless @project_name&.length&.between?(3, 63)
-  end
-
-  def validate_git_url
-    abort(">> Git URL must be provided") unless @git_url
-    http_git_url_regex = URI::DEFAULT_PARSER.make_regexp(%w[http https])
-    ssh_git_url_regex = %r{^(git@[\w.-]+[:|/][\w.-]+/[\w.-]+\.git)$}
-    valid_git_url = @git_url.match?(http_git_url_regex) || @git_url.match?(ssh_git_url_regex)
-    abort(">> Git URL must be valid") unless valid_git_url
-  end
-
-  def validate_postgres_version
-    return if @postgres_version.match?(/^\d+$/)
-
-    abort("The postgres version is invalid. Only major versions are allowed (e.g., use 16 instead of 16.4)")
-  end
-
-  def validate_vault_name
-    return if @vault_name.present?
-
-    abort("The vault name must be provided")
+    say "\n# Cleanup temporary files\n".bold
+    say "rm #{GITHUB_SSH_KEY_FILE_NAME} #{GITHUB_SSH_KEY_FILE_NAME}.pub"
   end
 
   def say_project_creation
     say <<~OUTPUT
-      nctl create project #{@project_name} \\
-        --display-name='#{@app_name}'
+      nctl create project #{@project_name} --display-name='#{@project_display_name}'
     OUTPUT
   end
 
@@ -121,15 +137,14 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def say_app_creation(environment)
-    generate_ssh_key(DATABASE_SSH_KEY_FILE)
     say <<~OUTPUT
       nctl create app #{environment} \\
         --project #{@project_name} \\
         --git-ssh-private-key-from-file=#{GITHUB_SSH_KEY_FILE_NAME} \\
         --git-url=#{@git_url} \\
         --git-revision="#{environment}" \\
-        --basic-auth=false \\ # Disabling Deploio basic auth as Rails app handles authentication
-        --build-env=SECRET_KEY_BASE='rails secret' \\ # Don't forget to generate the secret key
+        --basic-auth=false `# Disabling Deploio basic auth as Rails app handles authentication` \\
+        --build-env=SECRET_KEY_BASE='rails secret' `# Do not forget to generate the secret key` \\
         --language=ruby \\
         --size=mini
     OUTPUT
@@ -137,19 +152,19 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def generate_ssh_key(file_name)
     say <<~OUTPUT
-      ssh-keygen -t #{SSH_ALGORITHM} \\
-        -f #{file_name} \\
-        -N ''
-    OUTPUT
-
-    say <<~OUTPUT
+      # Create SSH key item in 1Password directly
       op item create \\
-        --title #{file_name} \\
+        --category ssh \\
+        --ssh-generate-key #{SSH_ALGORITHM.downcase} \\
+        --title "#{@project_name}-deploy-key" \\
         --vault #{@vault_name} \\
-        --category ssh-key \\
-        --tags #{@project_name} \\
-        --ssh-public-key < #{file_name}.pub \\
-        --ssh-private-key < #{file_name}
+        --tags #{@project_name}
+
+      # Extract keys to temp files for deploio usage
+      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} \\
+        --reveal --fields "public key" > #{file_name}.pub
+      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} --reveal \\
+        --fields "private key" --format json | jq -r '.ssh_formats.openssh.value' > #{file_name}
     OUTPUT
   end
 
@@ -164,16 +179,34 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
       return
     end
 
-    repo_name = @git_url[%r{github.com/(.*/.*)\.git}, 1]
+    repo_name = extract_repo_name(@git_url)
     unless repo_name
       say "# Attention: Deploy key unconfigured because repository URL is not valid".colorize(:orange)
       return
     end
 
     say <<~OUTPUT
-      gh repo deploy-key add #{GITHUB_SSH_KEY_FILE_NAME} \\
+      gh repo deploy-key add #{GITHUB_SSH_KEY_FILE_NAME}.pub \\
         --repo #{repo_name} \\
         --title #{GITHUB_DEPLOY_KEY_TITLE}
     OUTPUT
   end
+
+  def extract_repo_name(git_url)
+    return nil unless git_url
+
+    # Handle HTTPS URLs: https://domain.com/author/repo.git
+    if git_url.match?(%r{^https?://})
+      match = git_url.match(%r{^https?://[^/]+/(.+?)(?:\.git)?/?$})
+      return match[1] if match
+    end
+
+    # Handle SSH URLs: git@domain.com:author/repo.git
+    if git_url.start_with?("git@")
+      match = git_url.match(/^git@[^:]+:(.+?)(?:\.git)?$/)
+      return match[1] if match
+    end
+
+    raise "Repository name not found in git URL: #{git_url}"
+  end
 end

data/lib/renuo/cli/commands/create_heroku_app.rb

@@ -26,7 +26,6 @@ class Renuo::Cli::Commands::CreateHerokuApp
     heroku_name = "#{project_name}-#{env}"
     say "heroku apps:create --region eu #{heroku_name} -t staff"
     say "heroku domains:add #{heroku_name}.renuoapp.ch --app #{heroku_name}"
-    say "heroku domains:add #{project_name}-#{MASTER}.renuoapp.ch --app #{heroku_name}" if env == MAIN
     say "heroku addons:create heroku-postgresql  --app #{heroku_name}"
     say "heroku labs:enable runtime-dyno-metadata --app #{heroku_name}"
     say "heroku pg:backups:schedule DATABASE_URL --at '02:00 Europe/Zurich' --app #{heroku_name}"

data/lib/renuo/cli/commands/create_pr.rb

@@ -8,19 +8,13 @@ class Renuo::Cli::Commands::CreatePr
                     "the PR body"
     c.option "--title <title>", String, "The title of the pull request (optional)"
     c.option "--redmine-ticket <number>", Integer, "The redmine ticket number (optional)"
-    c.option "--draft", "Mark the PR as draft"
-    c.option "--[no-]web-create", "Open web browser to create a pull request (default: true)"
     c.example "Create a PR with the title 'Implement XYZ'",
               "renuo create-pr --title 'Implement XYZ'"
-    c.action do |_, options|
-      options.default web_create: true
-      new.run(options)
-    end
+    c.action { |_, options| new.run(options) }
   end
 
   def run(opts)
     create_pr(opts)
-    open_pr_in_browser unless opts.web_create
   end
 
   private
@@ -31,8 +25,7 @@ class Renuo::Cli::Commands::CreatePr
       "--assignee @me",
       pr_title(opts),
       "--body \"#{pr_body(opts)}\"",
-      ("--web" if opts.web_create),
-      ("--draft" if opts.draft)
+      "--web"
     ].compact.join(" ")
 
     puts `#{command}`
@@ -53,8 +46,4 @@ class Renuo::Cli::Commands::CreatePr
     current_branch = `git branch --show-current`.strip
     opts.redmine_ticket || current_branch.match(/(\d+)/)&.captures&.first
   end
-
-  def open_pr_in_browser
-    puts `gh pr view --web`
-  end
 end

data/lib/renuo/cli/commands/debug.rb

@@ -57,8 +57,11 @@ class Renuo::Cli::Commands::Debug
 
       if should_scan_deploio && Cache.stored_at("deploio_apps")
         select_deploio_targets(query).each do |app|
-          exec_cmd = "nctl exec app #{app[:name]} bash --project #{app[:namespace]}"
-          menu.choice(exec_cmd) { exec exec_cmd.squish }
+          bash_cmd = "nctl exec app #{app[:name]} bash --project #{app[:namespace]}"
+          menu.choice(bash_cmd) { exec bash_cmd.squish }
+
+          rails_console_cmd = "nctl exec app #{app[:name]} bundle exec rails console --project #{app[:namespace]}"
+          menu.choice(rails_console_cmd) { exec rails_console_cmd.squish }
 
           log_cmd = "nctl logs app #{app[:name]} -f   --project #{app[:namespace]}"
           menu.choice(log_cmd) { exec log_cmd.squish }
@@ -74,7 +77,10 @@ class Renuo::Cli::Commands::Debug
           exec_cmd = "heroku run bash --app #{app[:name]}"
           menu.choice(exec_cmd) { exec exec_cmd.squish }
 
-          log_cmd = "heroku logs -t  --app #{app[:name]}"
+          rails_console_cmd = "heroku run bundle exec rails console --app #{app[:name]}"
+          menu.choice(rails_console_cmd) { exec rails_console_cmd.squish }
+
+          log_cmd = "heroku logs -t --app #{app[:name]}"
           menu.choice(log_cmd)  { exec log_cmd.squish }
 
           app[:domains].each do |host|

data/lib/renuo/cli/commands/fetch_secrets.rb

@@ -9,6 +9,7 @@ class Renuo::Cli::Commands::FetchSecrets # rubocop:disable Metrics/ClassLength
     c.option "--init <private_vault_link>", String, "Initializes the renuo secrets store"
     c.description = <<~DESCRIPTION
       Run the command within a project folder to fetch the secrets from the renuo secrets store.
+      You need to create a "Secure Note" for your project and right to click copy the private link.
       The bin/setup of the project might run this command for you.
     DESCRIPTION
     c.action { |_, options| options.init ? new.init(options.init) : new.run }

data/lib/renuo/cli/commands/release.rb

@@ -102,21 +102,21 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
     @current_version ||= if `#{cmd_in_folder("git tag")}` == ""
                            "0.0.0"
                          else
-                           sorted_tags = `#{cmd_in_folder("git tag --sort=taggerdate")}`.split("\n").reverse
+                           sorted_tags = `#{cmd_in_folder("git tag --sort=v:refname")}`.split("\n").reverse
                            sorted_tags.find { |tag| tag =~ RenuoVersion::SEMVER_SCHEMA }.strip
                          end
   end
 
   def bump_version
-    version_bumped = find_and_replace_version
+    changed_files = find_and_replace_version
 
-    return unless version_bumped
+    return unless changed_files.any?
 
-    system(cmd_in_folder(%(git add #{find_files_with_version.join(" ")} && git commit -m "Bump version")))
+    system(cmd_in_folder(%(git add #{changed_files.join(" ")} && git commit -m "Bump version")))
   end
 
   def find_and_replace_version
-    find_files_with_version.any? do |file_name|
+    find_files_with_version.filter do |file_name|
       puts "Replace the version in #{file_name}?"
       print_version_found(file_name)
       if agree("confirm?")

data/lib/renuo/cli/commands/upgrade_laptop.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Renuo::Cli::Commands::UpgradeLaptop
+  include CommandHelper
+
   command "upgrade-laptop" do |c|
     c.syntax = "renuo upgrade-laptop"
     c.summary = "Upgrades the installed apps from the app store, macOS and homebrew"

data/lib/renuo/cli/helpers/environments.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 MAIN = "main"
-MASTER = "master"
 DEVELOP = "develop"
 ENVIRONMENTS = [MAIN, DEVELOP].freeze

data/lib/renuo/cli/templates/semaphore/semaphore-deploy.yml.erb

@@ -7,6 +7,8 @@ agent:
 
 blocks:
   - name: <%= environment %>-deploy
+    execution_time_limit:
+      minutes: 10
     task:
       secrets:
         - name: <%= project_name %>

data/lib/renuo/cli/templates/semaphore/semaphore.yml.erb

@@ -24,21 +24,11 @@ global_job_config:
       - source .semaphore/bin/cache_restore rails
       - bundle config set deployment 'true'
       - bundle config set path 'vendor/bundle'
-      - bundle install -j 4
+      - bundle install
 
 blocks:
-  - name: cache
-    dependencies: []
-    execution_time_limit:
-      minutes: 10
-    task:
-      jobs:
-        - name: cache
-          commands:
-            - source .semaphore/bin/cache_store rails
-
   - name: linting
-    dependencies: [cache]
+    dependencies: []
     execution_time_limit:
       minutes: 5
     task:
@@ -48,7 +38,7 @@ blocks:
             - bin/fastcheck
 
   - name: tests
-    dependencies: [cache]
+    dependencies: []
     execution_time_limit:
       minutes: 10
     task:
@@ -59,16 +49,17 @@ blocks:
           value: test
       prologue:
         commands:
-          - sem-service start postgres
-          - cp config/application.example.yml config/application.yml
+          - sem-service start postgres 16
+          - cp .env.example .env
           - bundle exec rails db:create db:schema:load
       jobs:
         - name: tests
           commands:
             - bin/check
       epilogue:
-        on_fail:
+        always:
           commands:
+            - source .semaphore/bin/cache_store rails
             - mkdir -p log coverage tmp/screenshots tmp/capybara
             - artifact push job log
             - artifact push job tmp/screenshots

data/lib/renuo/cli/version.rb

@@ -3,7 +3,7 @@
 # :nocov:
 module Renuo
   class Cli
-    VERSION = "4.13.0"
+    VERSION = "4.14.1"
     NAME = "renuo-cli"
   end
 end

data/lib/renuo/cli.rb

@@ -36,9 +36,11 @@ module Renuo
 
       program :version, Renuo::Cli::VERSION
       program :description, "Renuo CLI"
+      program :help_paging, false
       update
 
       Dir[File.expand_path("cli/{commands,services}/*.rb", __dir__)].each { |f| require f }
+      default_command :help
     end
 
     private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.14.1
 platform: ruby
 authors:
 - Renuo AG
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.0
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []