geordi 12.6.0 → 12.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8359f51e8fa9d619b9d84ede59104e711d59e33c2f034e6a3bc1a8933fd457
-  data.tar.gz: 2d234986282ecc98a4853a8d6b4f8103556ca10694596b399b534aab3b8ce3d5
+  metadata.gz: 212f089b529c55fd8687a9bd623984863790475c50144f4191360f841fa7357b
+  data.tar.gz: c33fb0561961c4d6f1c11d6a0ae966351b4528c7af62d7d22a1ebd118866e2a2
 SHA512:
-  metadata.gz: 8415640931dfa6738300ab40b3a4ace0d232993cf7b29aacc924f3b9de3a13b82b45b9064984dcc263883ec50bcc8717e97671140c8c45413842a94566e6ff13
-  data.tar.gz: c4f0ed717cd6dadfc770019444b35e47fc8176ff65971a99fef0e71eeb37d2e740201b000738db5e12bdf8d3043e957f77a05d92165fc2562fde9de6ea8239ec
+  metadata.gz: f5940425de342af7a611912e7b17d79c922eb6933c26b43da5d6c4e880864700e7ee9b044fa4a21bf56545bebff5204f950eefcb55582d76f8017ef503c8b290
+  data.tar.gz: dc062018c3e10ba98b90b8bc846e8592c94c42cd669c358b5ef7abadf73371a6160949d9753f145b318296598d3575efda0660a6ffdfbeb048a84584ace3be8c

data/CHANGELOG.md

@@ -10,12 +10,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
-## 12.6.0 2025-09-22
+## 12.6.1 2025-09-23
 
 ### Compatible changes
+* User prompts are now pink, and printed commands cyan (colors swapped).
+* Restored backwards compatibility with older versions of `dumple` installed on a server.
+
 
-- `geordi dump`: Allow to forward the compression option to the underlying `dumple` command, e.g. `geordi dump --compress=zstd:3` (for PostgreSQL) or `geordi dump --compress` (for MySQL).
-- `dumple`: Allow to specify a compression algorithm for PostgreSQL, e.g. `dumple --compress=zstd:3`. The already supported compression for MySQL `dumple --compress` is kept untouched.
+## 12.6.0 2025-09-22
+
+### Compatible changes
+* `geordi dump`: Allow to forward the compression option to the underlying `dumple` command, e.g. `geordi dump --compress=zstd:3` (for PostgreSQL) or `geordi dump --compress` (for MySQL).
+* `dumple`: Allow to specify a compression algorithm for PostgreSQL, e.g. `dumple --compress=zstd:3`. The already supported compression for MySQL `dumple --compress` is kept untouched.
 
 
 ## 12.5.0 2025-09-09
@@ -117,7 +123,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 # 9.6.1 2023-09-22
 
 ### Compatible changes
-* `chromedriver-update` command: Retrieve chromedriver from new location 
+* `chromedriver-update` command: Retrieve chromedriver from new location
 
 
 # 9.6.0 2023-07-24
@@ -129,7 +135,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 # 9.5.1 2023-04-26
 
 ### Compatible changes
-* `cucumber` command: Support the passing of options without "=" 
+* `cucumber` command: Support the passing of options without "="
 
 
 # 9.5.0 2023-03-22
@@ -225,7 +231,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 * Removed VNC test browser support for integration tests – Headless Chrome has
   matured and is almost a drop-in replacement. Also, key binding issues have
   increased with VNC and recent Linux.
-  * Please use a headless Chrome setup <https://makandracards.com/makandra/492109-capybara-running-tests-with-headless-chrome>. 
+  * Please use a headless Chrome setup <https://makandracards.com/makandra/492109-capybara-running-tests-with-headless-chrome>.
   * You might also want to get rid of your local VNC server `sudo apt remove tightvncserver`.
 * Removed support for serial execution of scenarios tagged with @solo. Serial
   execution is not needed with Headless Chrome, as Headless instances cannot
@@ -294,7 +300,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## 4.2.0 2020-10-02
 
 ### Compatible changes
-* Add `auto_update_chromedriver` as global setting option to automatically update chromedriver before cucumber 
+* Add `auto_update_chromedriver` as global setting option to automatically update chromedriver before cucumber
   tests, if Chrome and chromedriver versions don't match.
 * Dump command: Add support for multiple databases (#103 by @kajatiger)
 * Add Ruby 2.7 to list of supported Ruby versions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (12.6.0)
+    geordi (12.6.1)
       highline
       thor (~> 1)
 

data/README.md

@@ -170,11 +170,9 @@ Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
 deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
 is a file config/deploy/makandra.rb.
 
-If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable with "skip".
+If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable this with "skip".
 
-When your project is running Capistrano 3, deployment will use `cap deploy`
-instead of `cap deploy:migrations`. You can force using `deploy` by passing the
--M option: `geordi deploy -M staging`.
+If your project is running Capistrano 2, Geordi will use `cap deploy:migrations` by default. Skip migrations by passing the -M option: `geordi deploy -M staging`.
 
 **Options**
 - `-M, --no-migrations`: Run cap deploy instead of cap deploy:migrations

data/Rakefile

@@ -18,9 +18,9 @@ task :rspec do
 end
 
 task :check do
-  Geordi::Interaction.prompt('Are all specs & features green?', 'y', /y|yes/) || Geordi::Interaction.fail('Please run all tests with `rake`.')
-  Geordi::Interaction.prompt('Have you updated the README?', 'y', /y|yes/) || Geordi::Interaction.fail('Please update the README with `rake readme`.')
-  Geordi::Interaction.prompt('Have you updated the CHANGELOG', 'y', /y|yes/) || Geordi::Interaction.fail('Please update the CHANGELOG with the latest changes.')
+  Geordi::Interaction.confirm_or_cancel('Are all specs & features green?', 'Please run all tests with `rake`.', default: 'n')
+  Geordi::Interaction.confirm_or_cancel('Have you updated the README?', 'Please update the README with `rake readme`.', default: 'n')
+  Geordi::Interaction.confirm_or_cancel('Have you updated the CHANGELOG?', 'Please update the CHANGELOG with the latest changes.', default: 'n')
 end
 
 task :readme do

data/lib/geordi/commands/capistrano.rb

@@ -8,7 +8,7 @@ def capistrano(*args)
 
   Interaction.note 'Found the following deploy targets:'
   puts targets
-  Interaction.prompt('Continue?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
+  Interaction.confirm_or_cancel(default: 'n')
 
   targets << nil if targets.empty? # default target
   targets.each do |stage|

data/lib/geordi/commands/chromedriver_update.rb

@@ -5,8 +5,8 @@ Example: `geordi chromedriver_update`
 This command will find and install the matching chromedriver for the currently
 installed Chrome.
 
-Setting `auto_update_chromedriver` to `true` in your global Geordi config file 
-(`~/.config/geordi/global.yml`), will automatically update chromedriver before 
+Setting `auto_update_chromedriver` to `true` in your global Geordi config file
+(`~/.config/geordi/global.yml`), will automatically update chromedriver before
 cucumber tests if a newer chromedriver version is available.
 LONGDESC
 

data/lib/geordi/commands/console.rb

@@ -10,8 +10,8 @@ servers. When passed a number, directly connects to the selected server.
 IRB flags can be given as `irb_flags: '...'` in the global or local Geordi config file
 (`~/.config/geordi/global.yml` / `./.geordi.yml`). If you define irb_flags in both files, the local config file will be
 used. For IRB >=1.2 in combination with Ruby <3 geordi automatically sets the `--nomultiline` flag, to prevent slow
-pasting. You can override this behavior by setting `--multiline` in the global config file or by defining `irb_flags` 
-in the local config file. The latter will always turn off the automatic behavior, even if you don't set any values for 
+pasting. You can override this behavior by setting `--multiline` in the global config file or by defining `irb_flags`
+in the local config file. The latter will always turn off the automatic behavior, even if you don't set any values for
 the irb_flags key.
 
 LONGDESC

data/lib/geordi/commands/delete_dumps.rb

@@ -33,7 +33,7 @@ def delete_dumps(*locations)
     Interaction.warn 'No dump files found.'
   else
     puts deletable_dumps
-    Interaction.prompt('Delete these files?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
+    Interaction.confirm_or_cancel('Delete these files?', default: 'n')
 
     deletable_dumps.each &File.method(:delete)
     Interaction.success 'Done.'

data/lib/geordi/commands/deploy.rb

@@ -28,11 +28,9 @@ Finds available Capistrano stages by their prefix, e.g. `geordi deploy p` will
 deploy production, `geordi deploy mak` will deploy a `makandra` stage if there
 is a file config/deploy/makandra.rb.
 
-If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable with "skip".
+If Linear team ids are configured (see `geordi commit`), will offer to move deployed issues to a new state. Disable this with "skip".
 
-When your project is running Capistrano 3, deployment will use `cap deploy`
-instead of `cap deploy:migrations`. You can force using `deploy` by passing the
--M option: `geordi deploy -M staging`.
+If your project is running Capistrano 2, Geordi will use `cap deploy:migrations` by default. Skip migrations by passing the -M option: `geordi deploy -M staging`.
 LONGDESC
 
 option :no_migrations, aliases: '-M', type: :boolean,
@@ -55,7 +53,7 @@ def deploy(target_stage = nil)
     target_stage || Interaction.warn('Given deployment stage not found')
   end
 
-  # Ask for required information
+  # Retrieve required information ##############################################
   target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Git.current_branch, 'staging')
   capistrano_config = CapistranoConfig.new(target_stage)
 
@@ -82,46 +80,50 @@ def deploy(target_stage = nil)
     config_state = 'skip' if config_state.empty?
     target_state = Interaction.prompt("Move deployed Linear issues to state:", config_state)
     target_state = '' if target_state.empty? || target_state == 'skip'
-    settings.persist_linear_state_after_deploy(target_stage, target_state)
   end
 
   merge_needed = (source_branch != target_branch)
   push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
+  linear_issue_ids = []
+  if push_needed
+    commit_messages = Git.commits_between(source_branch, target_branch)
+    linear_issue_ids = LinearClient.extract_issue_ids(commit_messages)
+  end
+  move_issues = !linear_issue_ids.empty? && target_state && !target_state.empty?
 
-  Interaction.announce "Checking whether your #{source_branch} branch is ready" ############
+  # Checks #####################################################################
+  Interaction.note "Checking whether your #{source_branch} branch is ready"
   Util.run!("git checkout #{source_branch}")
   if (`git status -s | wc -l`.strip != '0') && !Util.testing?
     Interaction.warn "Your #{source_branch} branch holds uncommitted changes."
     Interaction.prompt('Continue anyway?', 'n', /y|yes/) || raise('Cancelled.')
   else
-    Interaction.note 'All good.'
+    puts 'All good.'
   end
 
   if merge_needed
-    Interaction.announce "Checking what's in your #{target_branch} branch right now" #######
+    Interaction.note "Checking what's in your #{target_branch} branch right now"
     Util.run!("git checkout #{target_branch} && git pull")
   end
 
-  Interaction.announce 'You are about to:' #################################################
+  # Confirm ####################################################################
+  Interaction.announce 'Planned actions'
   Interaction.note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
-  linear_issue_ids = []
   if push_needed
     Interaction.note 'Push these commits:'
     Util.run!("git --no-pager log origin/#{target_branch}..#{source_branch} --oneline")
-
-    commit_messages = Git.commits_between(source_branch, target_branch)
-    linear_issue_ids = linear_client.extract_issue_ids(commit_messages)
   end
   Interaction.note "Deploy to #{target_stage}"
   Interaction.note "From current branch #{source_branch}" if options.current_branch
 
-  if !linear_issue_ids.empty? && target_state && !target_state.empty?
+  if move_issues
     relevant_commits = linear_client.filter_by_issue_ids(commit_messages, linear_issue_ids)
     Interaction.note("Move these Linear issues to state \"#{target_state}\":")
     puts relevant_commits.join("\n")
   end
 
-  if Interaction.prompt('Go ahead with the deployment?', 'n', /y|yes/)
+  # Execute ####################################################################
+  if Interaction.prompt('Execute this now?', 'y', /y|yes/)
     puts
     git_call = []
     git_call << "git merge #{source_branch}" if merge_needed
@@ -140,11 +142,12 @@ def deploy(target_stage = nil)
 
     Util.run!(capistrano_call, show_cmd: true)
 
-    if !linear_issue_ids.empty? && target_state && !target_state.empty?
+    if move_issues
       linear_client.move_issues_to_state(linear_issue_ids, target_state)
+      settings.persist_linear_state_after_deploy(target_stage, target_state)
     end
 
-    Interaction.success 'Deployment complete.'
+    Interaction.success "Successfully deployed to #{target_stage}."
 
     Hint.did_you_know [
       :capistrano,
@@ -152,6 +155,6 @@ def deploy(target_stage = nil)
     ]
   else
     Util.run!("git checkout #{source_branch}")
-    Interaction.fail 'Deployment cancelled.'
+    Interaction.fail 'Cancelled.'
   end
 end

data/lib/geordi/commands/drop_databases.rb

@@ -7,8 +7,8 @@ and offer to delete them. Excluded are databases that are whitelisted. This come
 in handy when you're keeping your currently active projects in the whitelist files
 and perform regular housekeeping with Geordi.
 
-Per default, Geordi will try to connect to the databases as a local user without 
-password authorization.  
+Per default, Geordi will try to connect to the databases as a local user without
+password authorization.
 
 Geordi will ask for confirmation before actually dropping databases and will
 offer to edit the whitelist instead.

data/lib/geordi/commands/security_update.rb

@@ -18,7 +18,7 @@ def security_update(step = 'prepare')
     Interaction.announce 'Preparing for security update'
     Interaction.warn 'Please read https://makandracards.com/makandra/1587 before applying security updates!'
     Interaction.note 'About to checkout production and pull.'
-    Interaction.prompt('Continue?', 'y', /y|yes/) || Interaction.fail('Cancelled.')
+    Interaction.confirm_or_cancel
 
     Util.run!('git checkout production', show_cmd: true)
     Util.run!('git pull', show_cmd: true)
@@ -42,7 +42,7 @@ def security_update(step = 'prepare')
     Interaction.prompt('Have you successfully run all tests?', 'n', /y|yes/) || Interaction.fail('Please run tests first.')
 
     Interaction.note "About to: push production, checkout & pull #{master}, merge production, push #{master}."
-    Interaction.prompt('Continue?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
+    Interaction.confirm_or_cancel
 
     Util.run!('git push', show_cmd: true)
     Util.run!("git checkout #{master}", show_cmd: true)
@@ -58,12 +58,12 @@ def security_update(step = 'prepare')
 
     if all_deploy_targets.include?('staging')
       Interaction.note 'There is a staging environment.'
-      Interaction.prompt('Deploy staging now?', 'y', /y|yes/) || Interaction.fail('Cancelled.')
+      Interaction.confirm_or_cancel('Deploy staging now?')
 
       Interaction.announce 'Deploy staging'
       Util.run! "bundle exec cap staging #{deploy}", show_cmd: true
 
-      Interaction.prompt('Is the deployment log okay and the application is still running on staging?', 'y', /y|yes/) || Interaction.fail('Please fix the deployment issues on staging before you continue.')
+      Interaction.confirm_or_cancel('Is the deployment log okay and is the application still running on staging?', 'Please fix the deployment issues on staging before you continue.', default: 'n')
     else
       Interaction.note 'There is no staging environment.'
     end
@@ -77,14 +77,14 @@ def security_update(step = 'prepare')
       Interaction.note 'Found the following other stages:'
       puts deploy_targets_without_staging
       puts
-      Interaction.prompt('Deploy other stages now?', 'y', /y|yes/) || Interaction.fail('Cancelled.')
+      Interaction.confirm_or_cancel('Deploy other stages now?')
 
       deploy_targets_without_staging.each do |target|
         Interaction.announce "Deploy #{target}"
         Util.run!("bundle exec cap #{target} #{deploy}", show_cmd: true)
       end
 
-      Interaction.prompt('Is the application still running on all other stages and the logs are okay?', 'y', /y|yes/) || Interaction.fail('Please fix the application immediately!')
+      Interaction.confirm_or_cancel('Are *all* the deployment logs okay and is the application still running on *all* other stages?', 'Please fix the application immediately!', default: 'n')
     end
 
     Interaction.success 'Successfully pushed and deployed security update'

data/lib/geordi/commands/tests.rb

@@ -3,7 +3,7 @@ long_desc <<-LONGDESC
 When running `geordi tests` without any arguments, all unit tests, rspec specs
 and cucumber features will be run.
 
-When passing file paths or directories as arguments, Geordi will forward them to `rspec` and `cucumber`. 
+When passing file paths or directories as arguments, Geordi will forward them to `rspec` and `cucumber`.
 All rspec specs and cucumber features matching the given paths will be run.
 LONGDESC
 

data/lib/geordi/db_cleaner.rb

@@ -230,8 +230,8 @@ module Geordi
       until %w[y n].include? proceed
         deletable_dbs = filter_allowlisted(dbtype, database_list)
         if deletable_dbs.empty?
-          Interaction.note "No #{dbtype} databases found that were not allowlisted."
-          if Interaction.prompt('Edit the allowlist? [y]es or [n]o') == 'y'
+          Interaction.note "No deletable #{dbtype} databases found."
+          if Interaction.prompt('Edit the allowlist?', 'y', /y|yes/)
             proceed = 'e'
           else
             return []
@@ -245,6 +245,7 @@ module Geordi
           Interaction.note "These #{dbtype} databases are not allowlisted and can be deleted."
           proceed = Interaction.prompt('Proceed? [y]es, [n]o or [e]dit allowlist')
         end
+
         case proceed
         when 'e'
           proceed = '' # reset user selection

data/lib/geordi/interaction.rb

@@ -28,7 +28,7 @@ module Geordi
     # Also see Util.run!
     def note_cmd(text)
       message = "> #{text}"
-      puts "\e[35m#{message}\e[0m" # pink
+      puts "\e[36m#{message}\e[0m" # cyan
     end
 
     # Exit execution with status code 1 and give a short note what happened,
@@ -52,7 +52,7 @@ module Geordi
       message = "#{text} "
       message << "[#{default}] " if default
 
-      print "\e[36m#{message}\e[0m" # cyan
+      print "\e[35m#{message}\e[0m" # pink
       input = $stdin.gets.strip
       input = default if input.empty? && default
 
@@ -61,5 +61,9 @@ module Geordi
       fail 'Cancelled.'
     end
 
+    def confirm_or_cancel(message = 'Continue?', cancel_message = 'Cancelled.', default: 'y')
+      prompt(message, default, /y|yes/) or fail(cancel_message)
+    end
+
   end
 end

data/lib/geordi/linear_client.rb

@@ -11,6 +11,20 @@ module Geordi
 
     API_ENDPOINT = 'https://api.linear.app/graphql'.freeze
 
+    def self.extract_issue_ids(strings)
+      found_ids = []
+
+      regex = /^\[[A-Z]+\d*-\d+\]/
+
+      strings&.each do |string|
+        string&.scan(regex) do |match|
+          found_ids << match
+        end
+      end
+
+      found_ids.map { |id| id.delete('[]') } # [W-365] => W-365
+    end
+
     def initialize
       self.highline = HighLine.new
       self.settings = Settings.new
@@ -87,20 +101,6 @@ module Geordi
       end
     end
 
-    def extract_issue_ids(commit_messages)
-      found_ids = []
-
-      regex = /^\[[A-Z]+\d*-\d+\]/
-
-      commit_messages&.each do |line|
-        line&.scan(regex) do |match|
-          found_ids << match
-        end
-      end
-
-      found_ids.map { |id| id.delete('[]') } # [W-365] => W-365
-    end
-
     def filter_by_issue_ids(list_of_strings, issue_ids)
       list_of_strings.select do |message|
         issue_ids.any? { |id| message.start_with?("[#{id}]") }

data/lib/geordi/util.rb

@@ -21,7 +21,7 @@ module Geordi
 
         # install missing gem
         Interaction.warn 'Probably missing gem: ' + gem_name
-        Interaction.prompt('Install it now?', 'y', /y|yes/) || Interaction.fail('Missing Gems.')
+        Interaction.confirm_or_cancel('Install it now?', 'Missing Gems.')
         Util.run!(install_command, show_cmd: true)
 
         # retry
@@ -50,13 +50,12 @@ module Geordi
           show_command = [command]
         end
 
-        if show_cmd
-          # Join with spaces for better readability and copy-pasting
+        if show_cmd || confirm
           Interaction.note_cmd show_command.join(' ')
         end
 
         if confirm
-          Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
+          Interaction.confirm_or_cancel('Run this now?')
         end
 
         if testing?
@@ -130,7 +129,7 @@ module Geordi
         cmd << environment
         cmd << options[:database]
         cmd << compress
-        cmd << '--for-download' if options[:for_download]
+        cmd << '--for_download' if options[:for_download]
 
         cmd.compact.join(' ')
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '12.6.0'.freeze
+  VERSION = '12.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 12.6.0
+  version: 12.6.1
 platform: ruby
 authors:
 - Henning Koch
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-09-22 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,7 +124,7 @@ metadata:
   bug_tracker_uri: https://github.com/makandra/geordi/issues
   changelog_uri: https://github.com/makandra/geordi/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails
   and Linux at makandra.