renuo-cli 4.14.1 → 4.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d640a2a344a4f7297eaa13bef43760785530de9f46deef2a4016665b5ced8e8
-  data.tar.gz: 1fc8e948cf5c4ef86c6be83f001338cef37a84da78088c7929d162d7e891c6e9
+  metadata.gz: b7d2be942a488e9f935ad409f20fa275aea27af14713c6b98b155718208fbbbe
+  data.tar.gz: 8b854cf2514442624fe57d6f25e6540575140f14b2ece1ecda41ad2f5ef767cb
 SHA512:
-  metadata.gz: 7a11af0c25dd6c23eecda8f9e588ff9a599714c5e9b8b9ef9d41c3488d28a71ab834c1789cddb4aa81a73eefb72f3ce98d028b263c81fe6dd2f108f58ea3c7af
-  data.tar.gz: 5c323269241ed04e97243bf8009aa527fa508491e5a62169d4c77303496a17c1ced584537ab7cea02666d082b8b720730237ea47d7abb967b4a50a447c093ec7
+  metadata.gz: 2b3b6acf9f8c2899d818ab72a1429835fc3f94ad003d8d6974c2bbee8d39819aeec07e5c947dd814f0626d1151fc007dff8d78664b7f84bd63d3d1ef2c6b68cc
+  data.tar.gz: 612d0f7b4f197079cbb8e48c0cf7262a9d07f175e03c2318a7cc7a803451bc0c39c812ecebf13cd07b0c666090c0c21b1eedfecba3105ba6758fc616436349de

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

@@ -35,9 +35,17 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def git_url_valid?(git_url)
+    http_git_url?(git_url) || ssh_git_url?(git_url)
+  end
+
+  def http_git_url?(git_url)
     http_git_url_regex = %r{^https?://[\w.-]+/[\w.-]+/[\w.-]+(?:\.git)?/?$}
+    git_url.match?(http_git_url_regex)
+  end
+
+  def ssh_git_url?(git_url)
     ssh_git_url_regex = %r{^(git@[\w.-]+[:|/][\w.-]+/[\w.-]+\.git)$}
-    git_url.match?(http_git_url_regex) || git_url.match?(ssh_git_url_regex)
+    git_url.match?(ssh_git_url_regex)
   end
 
   private
@@ -70,6 +78,11 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
 
       say ">> Git URL must be provided and valid. Please try again.".colorize(:red)
     end
+
+    return unless http_git_url?(@git_url)
+
+    say ">> Your provided URL uses https. If the repository is private, an ssh url is required.".colorize(:yellow)
+    say ">> (e.g: git@github.com:my-org/my-app.git instead of https://github.com/my-org/my-app.git)".colorize(:yellow)
   end
 
   def set_postgres_version

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

@@ -91,7 +91,7 @@ class Renuo::Cli::Commands::FetchSecrets # rubocop:disable Metrics/ClassLength
       warn "Field `#{name}` not found in item #{item_id}. Check the field name in your #{CONFIG_FILE} file."
     else
       value = env_json["value"]
-      update_or_add_variable(".env", name, /^#{name}=/, "#{name}=#{value}")
+      update_or_add_variable(".env", name, /^#{name}=.*$/, "#{name}=#{value}")
       update_or_add_variable("config/application.yml", name, /^#{name}:.*$/, "#{name}: \"#{value}\"")
     end
   end

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

@@ -6,13 +6,17 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
   UPDATE_TYPES = %w[major minor patch custom].freeze
   TMP_FOLDER_NAME = "_RENUO_RELEASE_TEMP_#{rand(100_000_000)}".freeze
   MOVE_TO_TMP_FOLDER = "mkdir -p #{TMP_FOLDER_NAME} && cd #{TMP_FOLDER_NAME}".freeze
+  SUPPORTED_HOSTS = %w[github.com gitlab.com].freeze
 
   command "release" do |c|
     c.syntax = "renuo release"
-    c.summary = "Release a projects state of develop (on github) to main in one command."
+    c.summary = "Release a project's state of develop to main in one command."
     c.description = "Creates a new release version of a project on main as either a Major, Minor, " \
-                    "Patch or Custom release based on the current state of develop on Github"
-    c.example "renuo release my-project minor", "release a minor release of my-project"
+                    "Patch or Custom release based on the current state of develop. " \
+                    "Supports GitHub and GitLab repositories."
+    c.example "renuo release my-project minor", "release a minor release of renuo/my-project on GitHub"
+    c.example "renuo release renuo/my-project minor", "release a minor release of renuo/my-project on GitHub"
+    c.example "renuo release https://gitlab.com/renuo/project patch", "release a patch of a GitLab project"
     c.example "renuo release my-project custom 2.5.0", "release my-project as release 2.5.0"
     c.action { |args| new.run(args) }
   end
@@ -39,6 +43,23 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
 
   def validate_project_name
     abort(">> No project name given.") unless @project_name
+
+    @host, @repo_path = repo_identifier(@project_name)
+  end
+
+  def repo_identifier(input)
+    return ["github.com", "renuo/#{input}"] unless input.include?("/")
+    return ["github.com", input] unless input.start_with?("http://", "https://", "git@")
+
+    # Convert git@host:path to https://host/path
+    uri = input.sub(/^git@([^:]+):/, 'https://\1/').sub(/\.git$/, "")
+    parsed = URI.parse(uri)
+    host = parsed.host
+    repo_path = parsed.path.sub(%r{^/}, "")
+
+    return [host, repo_path] if SUPPORTED_HOSTS.include?(host)
+
+    abort(">> Unsupported host '#{host}'. Supported hosts: #{SUPPORTED_HOSTS.join(", ")}")
   end
 
   def validate_update_type
@@ -74,11 +95,20 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
 
   def open_comparison_page
     puts "Opening browser to double-check what is going to be deployed…"
-    open_path "https://github.com/#{@project_name}/compare/#{main_branch}...develop"
+    open_path comparison_url
+  end
+
+  def comparison_url
+    case @host
+    when "gitlab.com"
+      "https://#{@host}/#{@repo_path}/-/compare/#{main_branch}...develop"
+    else
+      "https://#{@host}/#{@repo_path}/compare/#{main_branch}...develop"
+    end
   end
 
   def checkout_project
-    abort(">> Project not found on Github.") unless system("#{MOVE_TO_TMP_FOLDER} && gh repo clone #{@project_name}")
+    abort(">> Project not found.") unless system("#{MOVE_TO_TMP_FOLDER} && git clone git@#{@host}:#{@repo_path}.git")
 
     system(cmd_in_folder("git checkout #{main_branch} && git pull origin #{main_branch} &&" \
                          "git checkout #{develop_branch} && git pull origin #{develop_branch}"))
@@ -173,7 +203,7 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
   end
 
   def ask_for_final_confirmation
-    unless agree(">> Are you sure you wish to deploy '#{@project_name}' " \
+    unless agree(">> Are you sure you wish to deploy '#{@repo_path}' " \
                  "as a #{@update_type} release (#{current_version} => #{@version})?")
       abort(">> Cancelling Release.")
     end
@@ -195,7 +225,7 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
   end
 
   def folder_name
-    @project_name.split("/").last
+    @repo_path.split("/").last
   end
 
   def cleanup
@@ -203,7 +233,7 @@ class Renuo::Cli::Commands::Release # rubocop:disable Metrics/ClassLength
   end
 
   def main_branch
-    remote_repo = "git@github.com:#{@project_name}.git"
+    remote_repo = "git@#{@host}:#{@repo_path}.git"
     @main_branch ||= `git ls-remote --heads #{remote_repo} main`.empty? ? "master" : "main"
   end
 

data/lib/renuo/cli/services/heroku.rb

@@ -17,7 +17,7 @@ class Renuo::Cli::Services::Heroku
     end
 
     def fetch_app_names(team = nil)
-      fetch_app_names_cmd = %(heroku apps --json #{team ? "--team=#{team}" : ""} | jq -r '.[] | "\\(.name)"')
+      fetch_app_names_cmd = %(heroku apps --json #{"--team=#{team}" if team} | jq -r '.[] | "\\(.name)"')
       stdout, stderr, status = Open3.capture3 fetch_app_names_cmd
       raise "Error fetching Heroku app list: #{stderr}" unless status.success?
 

data/lib/renuo/cli/templates/semaphore/bin/cache_restore.erb

@@ -16,11 +16,8 @@ do
     ;;
 
   assets)
-    cache restore "packs-$SEMAPHORE_GIT_BRANCH,packs-develop"
-    cache restore "packstest-$SEMAPHORE_GIT_BRANCH,packstest-develop"
     cache restore "assets-$SEMAPHORE_GIT_BRANCH,assets-develop"
     cache restore "sprocketscache-$SEMAPHORE_GIT_BRANCH,sprocketscache-develop"
-    cache restore "webpackercache-$SEMAPHORE_GIT_BRANCH,webpackercache-develop"
     ;;
 
   *)

data/lib/renuo/cli/templates/semaphore/bin/cache_store.erb

@@ -16,11 +16,8 @@ do
     ;;
 
   assets)
-    cache store packs-$SEMAPHORE_GIT_BRANCH public/packs
-    cache store packstest-$SEMAPHORE_GIT_BRANCH public/packs-test
     cache store assets-$SEMAPHORE_GIT_BRANCH public/assets
     cache store sprocketscache-$SEMAPHORE_GIT_BRANCH tmp/cache/assets/sprockets
-    cache store webpackercache-$SEMAPHORE_GIT_BRANCH tmp/cache/webpacker
     ;;
 
   *)

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

@@ -2,7 +2,7 @@ version: v1.0
 name: <%= environment %>-deploy
 agent:
   machine:
-    type: e2-standard-2
+    type: f1-standard-4
     os_image: ubuntu2204
 
 blocks:
@@ -12,6 +12,7 @@ blocks:
     task:
       secrets:
         - name: <%= project_name %>
+        - name: nctl
       env_vars:
         - name: DEPLOIO_PROJECT
           value: renuo-<%= project_name %>
@@ -24,7 +25,7 @@ blocks:
             - echo 'deb [trusted=yes] https://repo.nine.ch/deb/ /' | sudo tee /etc/apt/sources.list.d/repo.nine.ch.list
             - sudo apt-get -qq update
             - sudo apt-get -qq install -y nctl
-            - nctl auth login --api-token=$API_TOKEN --organization=renuo
+            - nctl auth login --api-client-id=$NCTL_API_CLIENT_ID --api-client-secret=$NCTL_API_CLIENT_SECRET --organization=$NCTL_ORGANIZATION
             - nctl update app $DEPLOIO_APP_NAME -p $DEPLOIO_PROJECT --build-env="RUBY_VERSION=$(cat .ruby-version)" --git-revision=$(git rev-parse HEAD) --skip-repo-access-check
             - gem i renuo-cli
             - renuo check-deploio-status

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

@@ -3,7 +3,7 @@ name: <%= project_name %>
 
 agent:
   machine:
-    type: e2-standard-2
+    type: f1-standard-4
     os_image: ubuntu2204
 
 auto_cancel:

data/lib/renuo/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.16.0
 platform: ruby
 authors:
 - Renuo AG
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 3.7.2
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []