renuo-cli 4.18.1 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae3114f37cfe01f2826e83aab108fe1c9b33a29da840214d768e9f18f418a1b
-  data.tar.gz: 83d9d199de7af9049419c2784c226a87eb1c749727982bdb31a4c237eb65355b
+  metadata.gz: 96e87891f76ac2c03e7d49276a00ec9f28b6d51530636c9fe18861b517202d56
+  data.tar.gz: 58a5b66274436e087f13ba451b252d2fc16a3e96c873e1abc43e6901e47dbc6c
 SHA512:
-  metadata.gz: da97bacdee6165fb3f3702d41229cb00609a09a5fff479213bb3d8d31a21ceeaf9460454bb57385cc7f6d60d8d61a0e427fddb3c3fbe31fb8245bddd96e18a77
-  data.tar.gz: 2d8a90db015c046e86e4f0f1937d45d02c69b1e9d3d6829deb8128e65114bb5055af3778a4e441f7f75f0b7b0794f1aea7a6a9663a1607b5a7d15bbcf339716a
+  metadata.gz: 3f8ead33a76b828827e9ffeb699d9b4005d84bb3eb92bc984fae844c9d11acf3008d60cb980d75ee52707f98c68ad675a13d75d5d34c3bdc95b3ebab3a6fbef9
+  data.tar.gz: 682b8f5e3c1ce078db1bca379297a29c174f382d1a7ce882ee0a52db2056f6b54a6b3e330c6e790d0cb926130535b1e8982768886b1847fca5e7bd51b7f0a9ac

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

@@ -7,7 +7,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
 
   command "check-deploio-status" do |c|
     c.syntax = "renuo check-deploio-status"
-    c.summary = "Checks the build and release status of the deployment."
+    c.summary = "DEPRECATED: Use 'renuo ci check-deploio-status' instead."
     c.description = "Checks the build and release status of the deployment."
     c.option "-a", "--app <name>", String, "The name of the app"
     c.option "-p", "--project <name>", String, "The name of the project"
@@ -25,6 +25,7 @@ class Renuo::Cli::Commands::CheckDeploioStatus
   end
 
   def run
+    warn "DEPRECATED: Use 'renuo ci check-deploio-status' instead."
     puts "(1/2) Checking build status for revision #{@revision}..."
     poll "build"
     abort "build check timed out after #{TIMEOUT_IN_SECONDS} seconds" if build.nil?

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

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+# :nocov:
+module Renuo::Cli::Commands::Ci
+  class CheckDeploioStatus
+    TIMEOUT_IN_SECONDS = 600
+    INTERVAL_IN_SECONDS = 5
+
+    command "ci check-deploio-status" do |c|
+      c.syntax = "renuo ci check-deploio-status"
+      c.summary = "Checks the build and release status of the deployment."
+      c.description = c.summary
+      c.option "-p", "--project <name>", String, "The name of the project"
+      c.action { |args, options| new(args, options).run }
+    end
+
+    def run
+      puts "(1/2) Checking build status for revision #{@revision}..."
+      poll "build"
+      abort "build check timed out after #{TIMEOUT_IN_SECONDS} seconds" if build.nil?
+
+      puts "(2/2) Checking release status for build #{build_name}..."
+      poll "release"
+      abort "release check timed out after #{TIMEOUT_IN_SECONDS} seconds" if release.nil?
+    end
+
+    private
+
+    def initialize(args, options)
+      @app = args.first
+      @project = options.project
+      @revision = ENV.fetch("SEMAPHORE_GIT_SHA", nil)
+
+      abort "missing app name" unless @app
+      abort "missing project name" unless @project
+      abort "this command must be run in Semaphore" unless @revision
+    end
+
+    def system!(cmd)
+      abort unless system cmd
+    end
+
+    def fetch(type)
+      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?
+      Psych.load_stream stdout
+    end
+
+    def fetch_build_logs
+      command = "nctl logs build -a #{@app} -p #{@project} -l 5000 --no-labels"
+      stdout, stderr, status = Open3.capture3 command
+
+      puts "error fetching build logs: #{stderr}" unless status.success?
+      stdout
+    end
+
+    def build
+      @build ||= fetch("builds").find do |build|
+        build.dig("spec", "forProvider", "sourceConfig", "git", "revision") == @revision
+      end
+    end
+
+    def build_name
+      @build_name ||= build.dig("metadata", "name")
+    end
+
+    def build_status
+      build.dig("status", "atProvider", "buildStatus")
+    end
+
+    def release
+      @release ||= fetch("releases").find do |release|
+        release.dig("spec", "forProvider", "build", "name") == build_name
+      end
+    end
+
+    def release_status
+      release.dig("status", "atProvider", "releaseStatus")
+    end
+
+    def succeeded?(status, type) # rubocop:disable Metrics/MethodLength
+      time = "[#{Time.now.utc.iso8601}]"
+
+      case status
+      when "available", "success"
+        puts "#{time} #{type} succeeded"
+        true
+      when "superseded"
+        puts "#{time} release was superseded"
+        true
+      when "paused"
+        abort "#{time} app is paused"
+      when "error", "failed", "failure"
+        puts fetch_build_logs
+        abort "#{time} #{type} failed"
+      else
+        puts "#{time} #{type} status is #{status}, waiting..."
+        instance_variable_set :"@#{type}", nil
+      end
+    end
+
+    def poll(type)
+      elapsed = 0
+
+      while elapsed < TIMEOUT_IN_SECONDS
+        if send type
+          break if succeeded?(send(:"#{type}_status"), type)
+        else
+          puts "no matching #{type} found, waiting..."
+        end
+
+        sleep INTERVAL_IN_SECONDS
+        elapsed += INTERVAL_IN_SECONDS
+      end
+    end
+  end
+end
+# :nocov:

data/lib/renuo/cli/commands/ci/update_deploio_app.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Renuo::Cli::Commands::Ci
+  class UpdateDeploioApp
+    command "ci update-deploio-app" do |c|
+      c.syntax = "renuo ci update-deploio-app"
+      c.summary = "Updates a Deploio app."
+      c.description = c.summary
+      c.option "-d", "--docker", "If the app uses a Dockerfile"
+      c.option "-p", "--project <name>", String, "The name of the project"
+      c.example "renuo ci update-deploio-app main -dp renuo-dashboard",
+                "Updates the 'main' app of the 'renuo-dashboard' project using a Dockerfile"
+      c.action { |args, options| new(args, options).run }
+    end
+
+    def run
+      system! "checkout --use-cache" if @docker
+      system! "echo 'deb [trusted=yes] https://repo.nine.ch/deb/ /' " \
+              "| sudo tee /etc/apt/sources.list.d/repo.nine.ch.list"
+      system! "sudo apt-get update -qqo Dir::Etc::sourcelist=/etc/apt/sources.list.d/repo.nine.ch.list"
+      system! "sudo apt-get install -qq nctl"
+      system! "nctl auth login"
+      system! "nctl update app #{@app} -p #{@project} --env APP_REVISION=$SEMAPHORE_GIT_SHA " \
+              "#{"--build-env RUBY_VERSION=#{File.read(".ruby-version").strip} " if @docker}" \
+              "--git-revision $SEMAPHORE_GIT_SHA --skip-repo-access-check"
+    end
+
+    private
+
+    def initialize(args, options)
+      @app = args.first
+      @project = options.project
+      @docker = options.docker
+
+      abort "missing app name" unless @app
+      abort "missing project name" unless @project
+      abort "this command must be run in Semaphore" unless ENV.key?("SEMAPHORE_GIT_SHA")
+    end
+
+    def system!(cmd)
+      abort unless system cmd
+    end
+  end
+end

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

@@ -155,20 +155,14 @@ class Renuo::Cli::Commands::CreateDeploioApp # rubocop:disable Metrics/ClassLeng
   end
 
   def say_database_creation(environment)
-    if environment == "main"
-      say <<~OUTPUT
-        nctl create postgres #{environment} \\
-          --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_with_org_prefix} \\
-          --postgres-database-version=#{@postgres_version}
-      OUTPUT
-    end
+    say <<~OUTPUT
+      nctl create postgresdatabase #{environment} \\
+        --project=#{@project_name_with_org_prefix} \\
+        --postgres-database-version=#{@postgres_version} \\
+        --location=nine-es34 \\
+        --backup-schedule=daily
+        --collation=C.UTF-8
+    OUTPUT
   end
 
   def say_app_creation(environment)

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

@@ -107,7 +107,7 @@ class Renuo::Cli::Commands::CreateDeploioObjectStorage
           --project #{@project_name} \\
           --env="DEPLOIO_ACCESS_KEY={ACCESS_KEY}" \\
           --env="DEPLOIO_SECRET_KEY={SECRET_KEY}" \\
-          --env="DEPLOIO_ENDPOINT=https://#{@location}.objects.nineapis.ch" \\
+          --env="DEPLOIO_ENDPOINT=https://#{@location.gsub("nine-", "")}.objects.nineapis.ch" \\
           --env="DEPLOIO_BUCKET=#{bucket_name}"
       OUTPUT
     end

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

@@ -55,15 +55,16 @@ class Renuo::Cli::Commands::Debug
 
       open_cmds = []
 
+      # rubocop:disable Layout/LineLength
       if should_scan_deploio && Cache.stored_at("deploio_apps")
         select_deploio_targets(query).each do |app|
-          bash_cmd = "nctl exec app #{app[:name]} bash --project #{app[:namespace]}"
+          bash_cmd = "nctl #{bold("exec")} app #{bold(app[:name])} bash --project #{bold(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]}"
+          rails_console_cmd = "nctl #{bold("exec")} app #{bold(app[:name])} bundle #{bold("exec")} rails console --project #{bold(app[:namespace])}"
           menu.choice(rails_console_cmd) { exec rails_console_cmd.squish }
 
-          log_cmd = "nctl logs app #{app[:name]} -f   --project #{app[:namespace]}"
+          log_cmd = "nctl #{bold("logs")} app #{bold(app[:name])} -f --project #{bold(app[:namespace])}"
           menu.choice(log_cmd) { exec log_cmd.squish }
 
           app[:hosts].each do |host|
@@ -71,16 +72,17 @@ class Renuo::Cli::Commands::Debug
           end
         end
       end
+      # rubocop:enable Layout/LineLength
 
       if should_scan_heroku && Cache.stored_at("heroku_apps")
         select_heroku_targets(query).each do |app|
-          exec_cmd = "heroku run bash --app #{app[:name]}"
+          exec_cmd = "heroku #{bold("run")} bash --app #{bold(app[:name])}"
           menu.choice(exec_cmd) { exec exec_cmd.squish }
 
-          rails_console_cmd = "heroku run bundle exec rails console --app #{app[:name]}"
+          rails_console_cmd = "heroku #{bold("run")} bundle exec rails console --app #{bold(app[:name])}"
           menu.choice(rails_console_cmd) { exec rails_console_cmd.squish }
 
-          log_cmd = "heroku logs -t --app #{app[:name]}"
+          log_cmd = "heroku #{bold("logs")} -t --app #{bold(app[:name])}"
           menu.choice(log_cmd)  { exec log_cmd.squish }
 
           app[:domains].each do |host|
@@ -111,4 +113,11 @@ class Renuo::Cli::Commands::Debug
       app[:name].include?(query) || app[:domains].any? { |domain| domain.include?(query) }
     end
   end
+
+  BOLD_START = "\033[1m"
+  BOLD_END = "\033[0m"
+
+  def bold(text)
+    "#{BOLD_START}#{text}#{BOLD_END}"
+  end
 end

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

@@ -12,7 +12,7 @@ spec:
       notify:
         slack:
           endpoint: <%= slack_endpoint %>
-          channels: ["#project-<%= project_name %>"]
+          channels: ["#project-<%= project_name %>-notifications"]
     - name: build notifications
       filter:
         projects: [<%= project_name %>]
@@ -22,4 +22,4 @@ spec:
       notify:
         slack:
           endpoint: <%= slack_endpoint %>
-          channels: ["#project-<%= project_name %>"]
+          channels: ["#project-<%= project_name %>-notifications"]

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

@@ -1,31 +1,22 @@
 version: v1.0
 name: <%= environment %>-deploy
+
 agent:
   machine:
-    type: f1-standard-4
-    os_image: ubuntu2204
+    type: e1-standard-2
+    os_image: ubuntu2404
 
 blocks:
-  - name: <%= environment %>-deploy
+  - name: cd
     execution_time_limit:
       minutes: 10
     task:
       secrets:
         - name: <%= project_name %>
         - name: nctl
-      env_vars:
-        - name: DEPLOIO_PROJECT
-          value: renuo-<%= project_name %>
-        - name: DEPLOIO_APP_NAME
-          value: <%= environment %>
       jobs:
-        - name: <%= environment %>-deploy
+        - name: deploying
           commands:
-            - checkout --use-cache
-            - 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-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
+            - gem i -q renuo-cli
+            - renuo ci update-deploio-app <%= environment %> -p renuo-<%= project_name %>
+            - renuo ci check-deploio-status <%= environment %> -p renuo-<%= project_name %>

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

@@ -4,7 +4,7 @@ name: <%= project_name %>
 agent:
   machine:
     type: f1-standard-4
-    os_image: ubuntu2204
+    os_image: ubuntu2404
 
 auto_cancel:
   running:
@@ -49,7 +49,7 @@ blocks:
           value: test
       prologue:
         commands:
-          - sem-service start postgres 16
+          - sem-service start postgres 17
           - cp .env.example .env
           - bundle exec rails db:create db:schema:load
       jobs:

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -34,7 +34,7 @@ module Renuo
       program :description, "Renuo CLI"
       program :help_paging, false
 
-      Dir[File.expand_path("cli/{commands,services}/*.rb", __dir__)].each { |f| require f }
+      Dir[File.expand_path("cli/{commands,services}/**/*.rb", __dir__)].each { |f| require f }
       default_command :help
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.18.1
+  version: 4.20.0
 platform: ruby
 authors:
 - Renuo AG
@@ -65,6 +65,8 @@ files:
 - bin/renuo
 - lib/renuo/cli.rb
 - lib/renuo/cli/commands/check_deploio_status.rb
+- lib/renuo/cli/commands/ci/check_deploio_status.rb
+- lib/renuo/cli/commands/ci/update_deploio_app.rb
 - lib/renuo/cli/commands/commit_leaderboard_stage.rb
 - lib/renuo/cli/commands/commit_leaderboard_sync.rb
 - lib/renuo/cli/commands/configure_semaphore.rb
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.8
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []