renuo-cli 4.17.2 → 4.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd8ae089520815a2934d6aa8bd1b7209af01e717c1e623c0a53bfb0cda0931e
-  data.tar.gz: 49c94fd014528566a51727e6f7938b56ff8a0ec37aa93c5a4292b3ba10a0abd2
+  metadata.gz: 9274f5e3f76a6fc8b38f2bcfbb958dc57d3f22dcff65c8f5f2ff88ded44a7110
+  data.tar.gz: 47cd65170765517b17b1aea2ec401122f89ce224632d209b33ca1a1abbd9075e
 SHA512:
-  metadata.gz: 6d960d53deb1dc144cfeaa77311732139c0e29f651567934a7fbd3ea9d3a812f8f6fa77f83d90338ccc4fe55bf3f7a528aaa1e2191dbb120f09db031a13c8582
-  data.tar.gz: e70f032d4d4c1b7323cd5fc177d93e6c9d37ff83b72a54e3ee5be368eb07e88132fd81e50233217ef862ce1b3d5df696bfb957390f664f40b530f4e0a13360b7
+  metadata.gz: 803d0f36fc550f57927e86b094f9d7523493e03948cdf7836a526e23ddf92025369a1ef72593b7d38b6221a99401ed30a7947e681cff39404717537dbc4d02d7
+  data.tar.gz: ca5ed8907659e2be3f0c598329a4e5b53c0a0bc9a45983418585cee254ec3d099db67c58f0f95eb1491f48cafaf0381f6cef95c7b170dccb7451f42a54ba959c

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

@@ -3,23 +3,25 @@
 # :nocov:
 class Renuo::Cli::Commands::CheckDeploioStatus
   TIMEOUT_IN_SECONDS = 600
-  INTERVAL_IN_SECONDS = 30
-
-  APP_NAME = ENV.fetch "DEPLOIO_APP_NAME", nil
-  PROJECT = ENV.fetch "DEPLOIO_PROJECT", nil
+  INTERVAL_IN_SECONDS = 5
 
   command "check-deploio-status" do |c|
     c.syntax = "renuo check-deploio-status"
     c.summary = "Checks the build and release status of the deployment."
     c.description = "Checks the build and release status of the deployment."
-    c.option "--git-revision <revision>", String, "The git revision to check"
+    c.option "-a", "--app <name>", String, "The name of the app"
+    c.option "-p", "--project <name>", String, "The name of the project"
+    c.option "-g", "--git-revision <revision>", String, "The git revision to check"
     c.action { |_, options| new(options).run }
   end
 
   def initialize(options)
-    abort "missing env DEPLOIO_APP_NAME" if APP_NAME.nil?
-    abort "missing env DEPLOIO_PROJECT" if PROJECT.nil?
     @revision = options.git_revision || `git rev-parse HEAD`.strip
+    @app = options.app || ENV.fetch("DEPLOIO_APP_NAME", nil)
+    @project = options.project || ENV.fetch("DEPLOIO_PROJECT", nil)
+
+    abort "missing app name" if @app.nil?
+    abort "missing project name" if @project.nil?
   end
 
   def run
@@ -39,7 +41,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
   end
 
   def fetch(type)
-    command = "nctl get #{type} -a #{APP_NAME} -p #{PROJECT} -o yaml"
+    command = "nctl get #{type} -a #{@app} -p #{@project} -o yaml"
     stdout, stderr, status = Open3.capture3 command
 
     abort "error fetching #{type} information: #{stderr}" unless status.success?
@@ -47,7 +49,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
   end
 
   def fetch_build_logs
-    command = "nctl logs build -a #{APP_NAME} -p #{PROJECT} -l 5000 --no-labels"
+    command = "nctl logs build -a #{@app} -p #{@project} -l 5000 --no-labels"
     stdout, stderr, status = Open3.capture3 command
 
     abort "error fetching build logs: #{stderr}" unless status.success?

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

@@ -9,7 +9,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   PROJECT_NAME_PREFIX = "renuo-"
 
   command "create-deploio-app" do |c|
-    c.syntax = "renuo create-deploio-app"
+    c.syntax = "renuo create-deploio-app [project-name] [git-url]"
     c.summary = "Generates the script necessary to setup an application on Deploio."
     c.description = <<~DESC
       Generates the script necessary to setup an application on Deploio.
@@ -20,14 +20,16 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
       - Configure repository access by generating SSH keys and adding them to 1Password.
       - Create the application and database for each specified environment.
     DESC
+    c.option "-o", "--org <organization>", String, "The organization name"
     c.example "renuo create-deploio-app my-app git@github.com:renuo/my-app.git",
               "Prompts the user for the necessary information and generates the commands " \
               "to create the project, databases, and apps on Deploio."
-    c.action { |args| new.run(args) }
+    c.action { |args, options| new.run(args, options) }
   end
 
-  def run(args)
+  def run(args, options = {})
     @project_name, @git_url = args
+    @options = options
     parse_arguments
     setup_commands
     setup_environments
@@ -51,7 +53,12 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   private
 
+  def valid_name?(name)
+    name&.length&.between?(3, 63) && name.match?(/^[a-z0-9-]+$/)
+  end
+
   def parse_arguments
+    set_organization
     set_project_name
     set_git_url
     set_postgres_version
@@ -60,7 +67,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def set_project_name
     loop do
-      break if @project_name&.length&.between?(3, 63) && @project_name.match?(/^[a-z0-9-]+$/)
+      break if valid_name?(@project_name)
 
       say ">> Project name must be between 3 and 63 characters and can only contain lowercase letters, " \
           "numbers, and hyphens. Please try again.".colorize(:red)
@@ -69,7 +76,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     end
 
     @project_display_name = @project_name
-    @project_name = PROJECT_NAME_PREFIX + @project_name
+    @project_name_with_org_prefix = "#{@organization}-#{@project_name}"
   end
 
   def set_git_url
@@ -98,7 +105,23 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def set_vault_name
-    @vault_name = ask("Enter the 1Password vault name: ") { |q| q.default = "Deploio" }
+    @vault_name = ask("SSH Credentials for deploio to access the git repo will be stored on 1Password. " \
+                      "Enter the 1Password vault name: ") do |q|
+      q.default = "Deploio"
+    end
+  end
+
+  def set_organization
+    @organization = @options.org if @options.org
+
+    loop do
+      break if valid_name?(@organization)
+
+      say ">> Organization name must be between 3 and 63 characters and can only contain lowercase letters, " \
+          "numbers, and hyphens. Please try again.".colorize(:red)
+
+      @organization = ask("Enter the organization name (default: renuo): ") { |q| q.default = "renuo" }
+    end
   end
 
   def setup_commands
@@ -127,7 +150,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
   def say_project_creation
     say <<~OUTPUT
-      nctl create project #{@project_name} --display-name='#{@project_display_name}'
+      nctl create project #{@project_name_with_org_prefix} --display-name='#{@project_display_name}' --organization=#{@organization}
     OUTPUT
   end
 
@@ -135,14 +158,14 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
     if environment == "main"
       say <<~OUTPUT
         nctl create postgres #{environment} \\
-          --project=#{@project_name} \\
+          --project=#{@project_name_with_org_prefix} \\
           --postgres-version=#{@postgres_version} \\
           --machine-type=nine-db-xs
       OUTPUT
     else
       say <<~OUTPUT
         nctl create postgresdatabase #{environment} \\
-          --project=#{@project_name} \\
+          --project=#{@project_name_with_org_prefix} \\
           --postgres-database-version=#{@postgres_version}
       OUTPUT
     end
@@ -151,7 +174,7 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   def say_app_creation(environment)
     say <<~OUTPUT
       nctl create app #{environment} \\
-        --project #{@project_name} \\
+        --project #{@project_name_with_org_prefix} \\
         --git-ssh-private-key-from-file=#{GITHUB_SSH_KEY_FILE_NAME} \\
         --git-url=#{@git_url} \\
         --git-revision="#{environment}" \\
@@ -169,15 +192,15 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
         --account renuo.1password.com \\
         --category ssh \\
         --ssh-generate-key #{SSH_ALGORITHM.downcase} \\
-        --title "#{@project_name}-deploy-key" \\
+        --title "#{@project_name_with_org_prefix}-deploy-key" \\
         --vault #{@vault_name} \\
-        --tags #{@project_name}
+        --tags #{@project_name_with_org_prefix}
 
       # Extract keys to temp files for deploio usage
-      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} \\
+      op item get "#{@project_name_with_org_prefix}-deploy-key" --vault #{@vault_name} \\
         --account renuo.1password.com \\
         --reveal --fields "public key" > #{file_name}.pub
-      op item get "#{@project_name}-deploy-key" --vault #{@vault_name} --reveal \\
+      op item get "#{@project_name_with_org_prefix}-deploy-key" --vault #{@vault_name} --reveal \\
         --account renuo.1password.com \\
         --fields "private key" --format json | jq -r '.ssh_formats.openssh.value' > #{file_name}
     OUTPUT

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

@@ -1,49 +1,111 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 class Renuo::Cli::Commands::CreatePr
   command "create-pr" do |c|
     c.syntax = "renuo create-pr"
     c.summary = "Creates a PR for the current branch"
     c.description = "Creates a PR, assigns it to you and automatically inserts the Redmine ticket number into " \
                     "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 "-t", "--title <title>", String, "The title of the pull request (optional)"
+    c.option "-r", "--redmine-ticket <number>", Integer, "The redmine ticket number (optional)"
     c.example "Create a PR with the title 'Implement XYZ'",
               "renuo create-pr --title 'Implement XYZ'"
     c.action { |_, options| new.run(options) }
   end
 
   def run(opts)
-    create_pr(opts)
+    pr_url = build_pr_url(opts)
+    open_browser(pr_url)
   end
 
   private
 
-  def create_pr(opts)
-    command = [
-      "gh pr create",
-      "--assignee @me",
-      pr_title(opts),
-      "--body \"#{pr_body(opts)}\"",
-      "--web"
-    ].compact.join(" ")
+  def build_pr_url(opts)
+    repo_url = fetch_remote_url_in_https
+    current_branch = fetch_current_branch
+    default_branch = fetch_head_branch
+    title = pr_title(opts, current_branch, default_branch)
+    body = pr_body(opts, current_branch)
+
+    "#{repo_url}/compare/#{default_branch}...#{current_branch}?expand=1" \
+      "&assignees=#{github_user_login}" \
+      "&title=#{CGI.escape(title)}" \
+      "#{"&body=#{CGI.escape(body)}" unless body.empty?}"
+  end
+
+  def fetch_remote_url_in_https
+    url = `git config --get remote.origin.url`.strip
+    if url.empty?
+      puts "Error: Unable to retrieve the remote repository URL."
+      exit 1
+    end
 
-    puts `#{command}`
+    if url.start_with?("git@")
+      url = url.gsub(/^git@([^:]+):/, 'https://\1/').gsub(/\.git$/, "")
+    end
+
+    url
+  end
+
+  def fetch_current_branch
+    branch = `git rev-parse --abbrev-ref HEAD`.strip
+    if branch.empty?
+      puts "Error: Unable to determine the current Git branch."
+      exit 1
+    end
+    branch
   end
 
-  def pr_title(opts)
-    opts.title ? "--title \"#{opts.title}\"" : "--fill"
+  def fetch_head_branch
+    ref = `git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null`.strip
+    if ref.empty?
+      puts "Warning: Unable to determine the default branch. Falling back to 'develop'."
+      return "develop"
+    end
+    ref.split("/").last
   end
 
-  def pr_body(opts)
-    redmine_ticket_number = redmine_ticket_number(opts)
+  def pr_title(opts, current_branch, default_branch)
+    opts.title || first_commit_message(default_branch) || current_branch
+  end
+
+  def first_commit_message(default_branch)
+    message = `git log #{default_branch}..HEAD --format=%s --reverse 2>/dev/null`.strip.split("\n").first
+    message unless message.to_s.empty?
+  end
+
+  def pr_body(opts, current_branch)
+    redmine_ticket_number = redmine_ticket_number(opts, current_branch)
     return "" unless redmine_ticket_number
 
     "TICKET-#{redmine_ticket_number}"
   end
 
-  def redmine_ticket_number(opts)
-    current_branch = `git branch --show-current`.strip
+  def redmine_ticket_number(opts, current_branch)
     opts.redmine_ticket || current_branch.match(/(\d+)/)&.captures&.first
   end
+
+  def github_user_login
+    login = `gh api user -q ".login"`.strip
+    if login.empty?
+      puts "Error: Unable to retrieve GitHub user."
+      exit 1
+    end
+    login
+  end
+
+  def open_browser(url)
+    case RbConfig::CONFIG["host_os"]
+    when /darwin/
+      system("open", url)
+    when /linux/
+      system("xdg-open", url)
+    else
+      puts "Error: Unable to detect the operating system to open the browser."
+      puts "Please open this URL manually: #{url}"
+      exit 1
+    end
+  end
 end

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

@@ -17,8 +17,8 @@ class Renuo::Cli::Commands::Debug
       The command will show a menu with all found targets.
       It will only use a cache. You must manually update the cache with option 1).
     DESC
-    c.option "--heroku", "Show only Heroku apps"
-    c.option "--deploio", "Show only Deploio apps"
+    c.option "-H", "--heroku", "Show only Heroku apps"
+    c.option "-d", "--deploio", "Show only Deploio apps"
     c.action do |args, options|
       new.run(args, options)
     rescue Interrupt

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

@@ -16,9 +16,9 @@ class Renuo::Cli::Commands::DisplayName
     c.example 'Display "Peter Muster" on the dashboard', 'renuo display-name "Peter Muster"'
     c.example "Remove the current name from the dashboard", "renuo display-name --delete"
     c.example "Override the current message on the dashboard", "renuo display-name Happy friday 🍻 --override"
-    c.option "--delete", "Deletes the current name"
-    c.option "--override", "Overrides the entire message"
-    c.option "--monitor", "Open the Google slides"
+    c.option "-d", "--delete", "Deletes the current name"
+    c.option "-o", "--override", "Overrides the entire message"
+    c.option "-m", "--monitor", "Open the Google slides"
     c.action { |args, options| new.run(args, options) }
   end
 

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

@@ -6,7 +6,7 @@ class Renuo::Cli::Commands::FetchSecrets # rubocop:disable Metrics/ClassLength
   command "fetch-secrets" do |c|
     c.syntax = "renuo fetch-secrets"
     c.summary = "Fetches the needed secrets in a project from the renuo secrets store"
-    c.option "--init <private_vault_link>", String, "Initializes the renuo secrets store"
+    c.option "-i", "--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.

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

@@ -6,11 +6,11 @@ class Renuo::Cli::Commands::GithubReplace
     c.summary = "Replaces text in multiple GitHub projects and automatically creates a pull request"
     c.description = "Finds and replaces the contents of specific files in Renuo GitHub projects and " \
                     "automatically creates a pull request"
-    c.option "--projects <name,name,..>", String, "The github project to clone and edit"
-    c.option "--branch <name>", String, "The branch to create"
-    c.option "--title <name>", String, "The title of the pull request"
+    c.option "-p", "--projects <name,name,..>", String, "The github project to clone and edit"
+    c.option "-b", "--branch <name>", String, "The branch to create"
+    c.option "-t", "--title <name>", String, "The title of the pull request"
     c.option "--body <text>", String, "The body of the pull request"
-    c.option "--files <files,files,..>", String, "The files to check"
+    c.option "-f", "--files <files,files,..>", String, "The files to check"
     c.example "Update Semaphore Ubuntu version",
               "renuo github-replace ubuntu1804 ubuntu2204 --projects=renuo-cli,renuo-website-v3 " \
               '--branch=feature/1234-update-ubuntu --title="Update os_image version" --body=TICKET-1234 ' \

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -4,13 +4,11 @@ require "active_support"
 require "active_support/core_ext"
 require "colorize"
 require "fileutils"
-require "gems"
 require "highline"
 require "json"
 require "net/http"
 require "open3"
 require "psych"
-require "rubygems"
 require "securerandom"
 require "tmpdir"
 require "uri"
@@ -29,35 +27,16 @@ module Renuo
     module Commands; end
     module Services; end
 
-    # include CommandHelper
-
     def start
       require "commander/import"
 
       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
-
-    def update
-      info = Gems.info Renuo::Cli::NAME
-      return unless Gem::Version.new(Renuo::Cli::VERSION) < Gem::Version.new(info["version"])
-
-      say "You are running the version #{Renuo::Cli::VERSION} but the brand new #{info["version"]} is available. 🎉"
-
-      if agree("Why don't you update with `gem update renuo-cli`? I can run it for you. 💪")
-        system("gem update #{Renuo::Cli::NAME}")
-        abort "Nice! I updated myself. 🤩 Now you can run the command again."
-      end
-
-      abort("Good. Just do it yourself then...😒")
-    end
   end
 end
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.17.2
+  version: 4.18.0
 platform: ruby
 authors:
 - Renuo AG
@@ -51,20 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: gems
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 description: The Renuo CLI automates some commonly used workflows by providing a command
   line interface.
 email: