geordi 9.6.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4dc434853c2c8af63e6ac18e69cca013d3a15316401f710c90deab74cd9bbb
-  data.tar.gz: c158a1f4c095120bfbd3ce9aacbd6bf13424994cdfd1ea5c2d5d8b613db5179e
+  metadata.gz: b7ba836f9a4c3651c05372c9a6f0f09cc86a4ed192020c7a0e9def2b5742b76b
+  data.tar.gz: 2668192b49eb8c16bcac3cdc1563f77b7d09c0759fa51ef7ea80288732fcb4dc
 SHA512:
-  metadata.gz: 2260516cf299c4202fbf276c36abbee42190fb9e48b0f583b1af05a457c7676f6d23ccaee7d2bd8ddc2bcdfa923a255cae706dc5c1414c97eab1be58635ad205
-  data.tar.gz: e556b2806dea5a5badbcdad1c22faad5fb56daf95923f1c5ac88f64f1a764d18aacf4d0d683ad0f2b050cbdb131482895da3d58157992af2e11d67e75d0e75bf
+  metadata.gz: 68a50772d7eca079e66034805f87362dca94fa969ee7bd3095fa5c64236af99c1e28658742fa9ff151f5930e23fed1035f57f8c432d3528545498e6f7fb58a76
+  data.tar.gz: e24dc966d01cef499829b00337bb221cc662bfe080421010c72791bb0954388fb4d2fd13a42ce689405133870b976349b42b995443b354d2c04d6239f9c4934b

data/.github/workflows/test.yml

@@ -31,6 +31,7 @@ jobs:
       run: |
         gem install bundler:2.2.26
         bundle install --no-deployment
-    - name: Run tests
-      run: bundle exec rake
-    
+    - name: Run specs
+      run: bundle exec rspec
+    - name: Run feature tests
+      run: bundle exec cucumber

data/CHANGELOG.md

@@ -10,6 +10,20 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+# 10.0.0 2024-03-07
+
+### Compatible changes
+* `console` command: IRB flags stored in the global config file are automatically passed on to IRB
+* `console` command: Improve interrupt handling in local Rails console
+* `rspec` and `cucumber` commands: Do not fail or exit if chromedriver update fails
+* Fix detection of IRB version
+* Add new hints to 'Did you know'
+
+### Breaking changes
+* `dump`-command: Drop and recreate the database before restoring a postgres dump
+* `drop_databases`-command: Use local user per default to connect to database
+
+
 # 9.6.1 2023-09-22
 
 ### Compatible changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geordi (9.6.1)
+    geordi (10.0.0)
       thor (~> 1)
 
 GEM

data/README.md

@@ -19,6 +19,8 @@ You may abbreviate commands by typing only their first letters, e.g. `geordi
 con` will boot a development console, `geordi set -t` will setup a project and
 run tests afterwards.
 
+Commands will occasionally print "did you know" hints of other Geordi features.
+
 You can always run `geordi help <command>` to quickly look up command help.
 
 ### `geordi branch`
@@ -51,9 +53,6 @@ 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.
 
-**Options**
-- `[--quiet-if-matching], [--no-quiet-if-matching]`: Suppress notification if chromedriver is already on the latest version
-
 
 ### `geordi clean`
 Remove unneeded files from the current directory.
@@ -80,6 +79,8 @@ Remote: `geordi console staging`
 Selecting the server: `geordi console staging -s` shows a menu with all available
 servers. When passed a number, directly connects to the selected server.
 
+IRB flags can be given as `irb_flags: '...'` in the global Geordi config file (`~/.config/geordi/global.yml`).
+
 **Options**
 - `-s, [--select-server=[SERVER_NUMBER]]`: Select a server to connect to
 
@@ -108,7 +109,7 @@ variable like this: `PARALLEL_TEST_PROCESSORS=6 geordi cucumber`
 
 
 ### `geordi delete-dumps [DIRECTORY]`
-Delete database dump files (*.dump).
+Help deleting database dump files (*.dump).
 
 Example: `geordi delete-dumps` or `geordi delete-dumps ~/tmp/dumps`
 
@@ -166,14 +167,18 @@ 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.  
+
 Geordi will ask for confirmation before actually dropping databases and will
 offer to edit the whitelist instead.
 
 **Options**
-- `-P, [--postgres-only], [--no-postgres-only]`: Only clean Postgres
+- `-P, [--postgres-only], [--no-postgres-only]`: Only clean PostgreSQL
 - `-M, [--mysql-only], [--no-mysql-only]`: Only clean MySQL/MariaDB
-- `[--postgres=PORT_OR_SOCKET]`: Use Postgres port or socket
+- `[--postgres=PORT_OR_SOCKET]`: Use PostgreSQL port or socket
 - `[--mysql=PORT_OR_SOCKET]`: Use MySQL/MariaDB port or socket
+- `-S, [--sudo], [--no-sudo]`: Access databases as root
 
 
 ### `geordi dump [TARGET]`
@@ -396,19 +401,25 @@ Adding a new command
 ---------------
 
 Copy `lib/geordi/COMMAND_TEMPLATE` to `lib/geordi/commands/your_command` and
-edit it to do what you need it to do. Please add a feature test for the new
-command; see features/ for inspiration.
+edit it to do what you need it to do. Please add appropriate tests for the new
+command; see existing tests for inspiration.
 
-To try Geordi locally, call it like this:
 
-    # -I means "add the following directory to load path"
-    ruby -Ilib exe/geordi
+Running Geordi locally
+----------------------
+
+To run Geordi without installation, call it like this:
+
+    ruby -I lib exe/geordi
+
+    # With debugger
+    ruby -r byebug -I lib exe/geordi
 
     # From another directory
     ruby -I ../geordi/lib ../geordi/exe/geordi
 
-    # With debugger
-    ruby -r byebug -I ../geordi/lib ../geordi/exe/geordi
+    # Run Geordi with the Ruby version of that other directory
+    RBENV_VERSION=$(<.ruby-version) ruby -I ../geordi/lib ../geordi/exe/geordi
 
 You can also *install* Geordi locally from its project directory with
 `rake install`. Make sure to switch to the expected Ruby version before.

data/Rakefile

@@ -2,10 +2,14 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: Run all tests'
-task default: :features
+task default: [:rspec, :features]
 
 task :features do
-  exec 'bundle exec cucumber'
+  system 'bundle exec cucumber'
+end
+
+task :rspec do
+  system 'bundle exec rspec'
 end
 
 task :readme do
@@ -32,6 +36,8 @@ You may abbreviate commands by typing only their first letters, e.g. `geordi
 con` will boot a development console, `geordi set -t` will setup a project and
 run tests afterwards.
 
+Commands will occasionally print "did you know" hints of other Geordi features.
+
 You can always run `geordi help <command>` to quickly look up command help.
   TEXT
 
@@ -42,12 +48,11 @@ You can always run `geordi help <command>` to quickly look up command help.
     geordi_section << "#{command.description.sub /(\.)?$/, '.'}\n\n"
     geordi_section << "#{command.long_description.strip}\n\n" if command.long_description
 
-    if command.options.any?
-      geordi_section << "**Options**\n"
-      # Taken from thor-1.0.1/lib/thor/base.rb:557
-      command.options.values.each do |option|
-        next if option.hide
+    visible_options = command.options.reject {|_option_name, option_object| option_object.hide }
 
+    if visible_options.any?
+      geordi_section << "**Options**\n"
+      visible_options.values.each do |option|
         geordi_section << "- `#{option.usage}`"
         geordi_section << ": #{option.description}" if option.description
         geordi_section << "\n"

data/lib/geordi/chromedriver_updater.rb

@@ -6,6 +6,8 @@ require 'fileutils'
 
 module Geordi
   class ChromedriverUpdater
+    class ProcessingError < StandardError; end
+
     VERSIONS_PER_MILESTONES_URL = "https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json"
 
     def run(options)
@@ -18,6 +20,10 @@ module Geordi
       else
         update_chromedriver(latest_chromedriver_version)
       end
+
+    rescue ProcessingError => e
+      interaction_method = (options[:exit_on_failure] == false) ? :warn : :fail
+      Interaction.public_send(interaction_method, e.message)
     end
 
     private
@@ -29,7 +35,7 @@ module Geordi
       end
 
       if !status.success? || chrome_version.nil?
-        Interaction.fail('Could not determine the version of Google Chrome.')
+        raise ProcessingError, 'Could not determine the version of Google Chrome.'
       else
         chrome_version
       end
@@ -44,7 +50,7 @@ module Geordi
       end
 
       if !status.success? || chromedriver_version.nil?
-        Interaction.fail('Could not determine the version of chromedriver.')
+        raise ProcessingError, 'Could not determine the version of chromedriver.'
       else
         chromedriver_version
       end
@@ -62,11 +68,11 @@ module Geordi
       unzip(chromedriver_zip, File.expand_path('~/bin'))
 
       # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-      Interaction.success "Chromedriver updated to v#{determine_chromedriver_version}."
+      Interaction.success "Chromedriver updated to #{determine_chromedriver_version}."
     end
 
     def download_chromedriver(version)
-      fetch_response(chromedriver_url(version), "Could not download chromedriver v#{version}.") do |response|
+      fetch_response(chromedriver_url(version), "Could not download chromedriver #{version}.") do |response|
         file = Tempfile.new(%w[chromedriver .zip])
         file.write(response.body)
 
@@ -81,8 +87,13 @@ module Geordi
       if response.is_a?(Net::HTTPSuccess)
         yield(response)
       else
-        Interaction.fail(error_message)
+        raise ProcessingError, error_message
       end
+
+    # Rescue Errno::NOERROR, Errno::ENOENT, Errno::EACCES, Errno::EFAULT, Errno::ECONNREFUSED, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EHOSTDOWN, Errno::EHOSTUNREACH, ...,
+    # all of which are a subclass of SystemCallError
+    rescue SystemCallError => e
+      raise ProcessingError, "Request failed: #{e.message}"
     end
 
     def chromedriver_url(chrome_version)
@@ -94,7 +105,7 @@ module Geordi
         if chromedriver && chromedriver["url"]
           chromedriver["url"]
         else
-          Interaction.fail("Could not find chromedriver download url for Chrome version v#{chrome_version}.")
+          raise ProcessingError, "Could not find chromedriver download url for Chrome #{chrome_version}."
         end
     end
 
@@ -105,7 +116,7 @@ module Geordi
         begin
           chromedriver_download_data = JSON.parse(response.body)
         rescue JSON::ParserError
-          Interaction.fail("Could not parse chromedriver download data.")
+          raise ProcessingError, "Could not parse chromedriver download data."
         end
         @chromedriver_download_data = chromedriver_download_data
       end
@@ -113,14 +124,14 @@ module Geordi
 
     def latest_version(chrome_version)
       latest_version = chromedriver_download_data.dig("milestones", milestone_version(chrome_version), "version")
-      latest_version || Interaction.fail("Could not find matching chromedriver for Chrome v#{chrome_version}.")
+      latest_version || raise(ProcessingError, "Could not find matching chromedriver for Chrome #{chrome_version}.")
     end
 
     def unzip(zip, output_dir)
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        Interaction.fail("Could not unzip #{zip.path}.")
+        raise ProcessingError, "Could not unzip #{zip.path}."
       end
 
       # the archive contains a folder in which the relevant files are located. These files must be moved to ~/bin.

data/lib/geordi/commands/capistrano.rb

@@ -19,4 +19,9 @@ def capistrano(*args)
 
     Util.run!(command, fail_message: 'Capistrano failed. Have a look!')
   end
+
+  Hint.did_you_know [
+    :deploy,
+    :rake,
+  ]
 end

data/lib/geordi/commands/chromedriver_update.rb

@@ -10,11 +10,17 @@ Setting `auto_update_chromedriver` to `true` in your global Geordi config file
 cucumber tests if a newer chromedriver version is available.
 LONGDESC
 
-option :quiet_if_matching, type: :boolean, default: false,
+option :quiet_if_matching, type: :boolean, default: false, hide: true,
   desc: 'Suppress notification if chromedriver is already on the latest version'
+option :exit_on_failure, type: :boolean, default: true, hide: true,
+  desc: "Exit with status code 1, if an error occurs."
 
 def chromedriver_update
   require 'geordi/chromedriver_updater'
 
   ChromedriverUpdater.new.run(options)
+
+  Hint.did_you_know [
+    'Geordi can automatically keep chromedriver up-to-date. See `geordi help chromedriver-update`.',
+  ] unless options.quiet_if_matching
 end

data/lib/geordi/commands/clean.rb

@@ -14,6 +14,6 @@ def clean
   end
 
   Hint.did_you_know [
-    :remove_executable_flags
+    :remove_executable_flags,
   ]
 end

data/lib/geordi/commands/commit.rb

@@ -13,6 +13,7 @@ def commit(*git_args)
   Gitpt.new.run_commit(git_args)
 
   Hint.did_you_know [
-    :branch
+    :branch,
+    :deploy,
   ]
 end

data/lib/geordi/commands/console.rb

@@ -6,6 +6,8 @@ Remote: `geordi console staging`
 
 Selecting the server: `geordi console staging -s` shows a menu with all available
 servers. When passed a number, directly connects to the selected server.
+
+IRB flags can be given as `irb_flags: '...'` in the global Geordi config file (`~/.config/geordi/global.yml`).
 LONGDESC
 
 # This option is duplicated in shelll.rb
@@ -18,6 +20,7 @@ def console(target = 'development', *_args)
   Hint.did_you_know [
     :shelll,
     [:console, :select_server],
+    'You only need to type the unique prefix of a command to run it. `geordi con` will work as well.',
   ]
 
   if target == 'development'
@@ -27,7 +30,8 @@ def console(target = 'development', *_args)
     Interaction.announce 'Opening a local Rails console'
 
     command = Util.console_command(target)
-    Util.run!(command)
+    # Exec has better behavior on Ctrl + C
+    Util.run!(command, exec: true)
   else
     Interaction.announce 'Opening a Rails console on ' + target
 

data/lib/geordi/commands/cucumber.rb

@@ -49,7 +49,7 @@ def cucumber(*args)
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
     if settings.auto_update_chromedriver
-      invoke_geordi 'chromedriver_update', quiet_if_matching: true
+      invoke_geordi 'chromedriver_update', quiet_if_matching: true, exit_on_failure: false
     end
 
     arguments = args
@@ -77,7 +77,9 @@ def cucumber(*args)
       [:cucumber, :modified],
       [:cucumber, :containing],
       [:cucumber, :debug],
-      'Geordi can automatically update chromedriver before Cucumber tests. See `geordi help chromedriver-update`.'
+      [:cucumber, :rerun],
+      'Geordi can automatically keep chromedriver up-to-date. See `geordi help chromedriver-update`.',
+      'You only need to type the unique prefix of a command to run it. `geordi cuc` will work as well.',
     ]
   else
     Interaction.note 'Cucumber not employed.'

data/lib/geordi/commands/delete_dumps.rb

@@ -1,4 +1,4 @@
-desc 'delete-dumps [DIRECTORY]', 'Delete database dump files (*.dump)'
+desc 'delete-dumps [DIRECTORY]', 'Help deleting database dump files (*.dump)'
 long_desc <<-LONGDESC
 Example: `geordi delete-dumps` or `geordi delete-dumps ~/tmp/dumps`
 
@@ -41,6 +41,7 @@ def delete_dumps(*locations)
 
   Hint.did_you_know [
     :clean,
-    :drop_databases
+    :drop_databases,
+    :dump,
   ]
 end

data/lib/geordi/commands/deploy.rb

@@ -111,7 +111,7 @@ def deploy(target_stage = nil)
 
     Hint.did_you_know [
       :capistrano,
-      :security_update
+      :security_update,
     ]
   else
     Util.run!("git checkout #{source_branch}")

data/lib/geordi/commands/drop_databases.rb

@@ -7,18 +7,23 @@ 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.  
+
 Geordi will ask for confirmation before actually dropping databases and will
 offer to edit the whitelist instead.
 LONGDESC
 
 option :postgres_only, aliases: '-P', type: :boolean,
-  desc: 'Only clean Postgres', default: false
+  desc: 'Only clean PostgreSQL', default: false
 option :mysql_only, aliases: '-M', type: :boolean,
   desc: 'Only clean MySQL/MariaDB', default: false
 option :postgres, banner: 'PORT_OR_SOCKET',
-  desc: 'Use Postgres port or socket'
+  desc: 'Use PostgreSQL port or socket'
 option :mysql, banner: 'PORT_OR_SOCKET',
   desc: 'Use MySQL/MariaDB port or socket'
+option :sudo, aliases: '-S',  type: :boolean, default: false,
+ desc: 'Access databases as root'
 
 def drop_databases
   require 'geordi/db_cleaner'
@@ -42,13 +47,19 @@ def drop_databases
     postgres_flags = "--port=#{options.postgres}"
   end
 
-  extra_flags = { 'mysql' => mysql_flags,
-                 'postgres' => postgres_flags }
-  cleaner = DBCleaner.new(extra_flags)
+  unless options.sudo
+    Interaction.note 'Assuming your local user has permission to drop databases. Run with `--sudo` to use sudo.'
+  end
+
+  extra_flags = {
+    'mysql' => mysql_flags,
+    'postgres' => postgres_flags,
+  }
+  cleaner = DBCleaner.new(extra_flags, sudo: options.sudo)
   cleaner.clean_mysql unless options.postgres_only
   cleaner.clean_postgres unless options.mysql_only
 
   Hint.did_you_know [
-    :delete_dumps
+    :delete_dumps,
   ]
 end

data/lib/geordi/commands/dump.rb

@@ -73,6 +73,6 @@ def dump(target = nil, *_args)
     :delete_dumps,
     :drop_databases,
     :migrate,
-    'Geordi can load a dump directly into the local database if passed a Capistrano stage and the option -l. See `geordi help dump`.'
+    'Geordi can load a dump directly into the local database if passed a Capistrano stage and the option -l. See `geordi help dump`.',
   ]
 end

data/lib/geordi/commands/rake.rb

@@ -24,6 +24,6 @@ def rake(*args)
   end
 
   Hint.did_you_know [
-    :capistrano
+    :capistrano,
   ]
 end

data/lib/geordi/commands/remove_executable_flags.rb

@@ -14,6 +14,6 @@ def remove_executable_flags
   Interaction.success 'Done.'
 
   Hint.did_you_know [
-    :clean
+    :clean,
   ]
 end

data/lib/geordi/commands/rspec.rb

@@ -17,7 +17,7 @@ def rspec(*files)
     invoke_geordi 'bundle_install'
     invoke_geordi 'yarn_install'
     if settings.auto_update_chromedriver && Util.gem_available?('selenium-webdriver')
-      invoke_geordi 'chromedriver_update', quiet_if_matching: true
+      invoke_geordi 'chromedriver_update', quiet_if_matching: true, exit_on_failure: false
     end
 
     Interaction.announce 'Running specs'
@@ -46,10 +46,13 @@ def rspec(*files)
       puts
       Util.run!(command.join(' '), fail_message: 'Specs failed.')
 
-      Hint.did_you_know [
-        :cucumber
-      ]
     end
+
+    Hint.did_you_know [
+      :cucumber,
+      'Geordi can automatically keep chromedriver up-to-date. See `geordi help chromedriver-update`.',
+      'You only need to type the unique prefix of a command to run it. `geordi rs` will work as well.',
+    ]
   else
     Interaction.note 'RSpec not employed.'
   end

data/lib/geordi/commands/server.rb

@@ -7,7 +7,7 @@ option :public, aliases: '-P', type: :boolean,
 
 def server(port = nil)
   Hint.did_you_know [
-    [:server, :public]
+    [:server, :public],
   ]
 
   invoke_geordi 'bundle_install'

data/lib/geordi/commands/setup.rb

@@ -28,7 +28,10 @@ def setup
   Interaction.success 'Successfully set up the project.'
 
   Hint.did_you_know [
-    :update
+    :update,
+    :security_update,
+    [:setup, :dump],
+    [:setup, :test],
   ] unless options.dump || options.test
 
   invoke_geordi 'dump', options.dump, load: true if options.dump

data/lib/geordi/commands/shell.rb

@@ -16,7 +16,8 @@ def shelll(target, *_args)
   require 'geordi/remote'
 
   Hint.did_you_know [
-    :console
+    :console,
+    'You only need to type the unique prefix of a command to run it. `geordi sh` will work as well.',
   ]
 
   Interaction.announce 'Opening a shell on ' + target

data/lib/geordi/commands/tests.rb

@@ -37,6 +37,6 @@ def tests(*args)
   end
 
   Hint.did_you_know [
-    :deploy
+    :deploy,
   ]
 end

data/lib/geordi/commands/update.rb

@@ -28,7 +28,9 @@ def update
     Interaction.success 'Successfully updated the project.'
 
     Hint.did_you_know [
-      :setup
+      :setup,
+      [:update, :dump],
+      [:update, :test],
     ] unless options.dump || options.test
 
     invoke_geordi 'dump', options.dump, load: true if options.dump

data/lib/geordi/db_cleaner.rb

@@ -3,37 +3,48 @@ require 'open3'
 require 'tempfile'
 
 module Geordi
+
+  DatabaseError = Class.new(StandardError)
+
   class DBCleaner
 
-    def initialize(extra_flags)
-      puts 'Please enter your sudo password if asked, for db operations as system users'
-      puts "We're going to run `sudo -u postgres psql` for PostgreSQL"
-      puts '               and `sudo mysql`            for MariaDB (which uses PAM auth)'
-      `sudo true`
-      Interaction.fail 'sudo access is required for database operations as database users' if $? != 0
+    def initialize(extra_flags, sudo: false)
+      @sudo = sudo
+
+      if @sudo
+        Interaction.note 'Please enter your sudo password when asked.'
+        puts "We're going to run `sudo -u postgres psql` for PostgreSQL"
+        puts '               and `sudo mysql`            for MariaDB (which uses PAM auth)'
+        `sudo true`
+        Interaction.fail 'sudo access is required for database operations as database users' if $? != 0
+      end
+
       @derivative_dbname = /_(test\d*|development|cucumber)$/
-      base_directory = ENV['XDG_CONFIG_HOME']
-      base_directory = Dir.home.to_s if base_directory.nil?
-      @whitelist_directory = File.join(base_directory, '.config', 'geordi', 'whitelists')
-      FileUtils.mkdir_p(@whitelist_directory) unless File.directory? @whitelist_directory
+      @base_directory = ENV['XDG_CONFIG_HOME']
+      @base_directory ||= Dir.home.to_s
+      @allowlist_directory = File.join(@base_directory, '.config', 'geordi', 'allowlists')
+      FileUtils.mkdir_p(@allowlist_directory) unless File.directory? @allowlist_directory
+      if File.directory?(legacy_allowlist_directory)
+        move_allowlist_files
+      end
       @mysql_command = decide_mysql_command(extra_flags['mysql'])
       @postgres_command = decide_postgres_command(extra_flags['postgres'])
     end
 
-    def edit_whitelist(dbtype)
-      whitelist = whitelist_fname(dbtype)
-      whitelisted_dbs = if File.exist? whitelist
-        Geordi::Util.stripped_lines(File.read(whitelist))\
+    def edit_allowlist(dbtype)
+      allowlist = allowlist_fname(dbtype)
+      allowlisted_dbs = if File.exist? allowlist
+        Geordi::Util.stripped_lines(File.read(allowlist))\
           .delete_if { |l| l.start_with? '#' }
       else
         []
       end
       all_dbs = list_all_dbs(dbtype)
-      tmp = Tempfile.open("geordi_whitelist_#{dbtype}")
+      tmp = Tempfile.open("geordi_allowlist_#{dbtype}")
       tmp.write <<~HEREDOC
-        # Put each whitelisted database on a new line.
+        # Put each allowlisted database on a new line.
         # System databases will never be deleted.
-        # When you whitelist foo, foo_development and foo_test\\d* are whitelisted, too.
+        # When you allowlist foo, foo_development and foo_test\\d* are allowlisted, too.
         # This works even if foo does not exist. Also, you will only see foo in this list.
         #
         # Syntax: keep foo
@@ -41,32 +52,32 @@ module Geordi
       HEREDOC
       tmpfile_content = Array.new
       all_dbs.each do |db|
-        next if is_whitelisted?(dbtype, db)
+        next if is_allowlisted?(dbtype, db)
         next if is_protected?(dbtype, db)
         db.sub!(@derivative_dbname, '')
         tmpfile_content.push(['drop', db])
       end
-      warn_manual_whitelist = false
-      whitelisted_dbs.each do |db_name|
-        # Remove 'keep' word from whitelist entries. This is not normally required since geordi
-        # does not save 'keep' or 'drop' to the whitelist file on disk but rather saves a list
-        # of all whitelisted db names and just presents the keep/drop information while editing
-        # the whitelist to supply users a list of databases they can whitelist by changing the
-        # prefix to 'keep'. Everything prefixed 'drop' is not considered whitelisted and thus
-        # not written to the whitelist file on disk.
+      warn_manual_allowlist = false
+      allowlisted_dbs.each do |db_name|
+        # Remove 'keep' word from allowlist entries. This is not normally required since geordi
+        # does not save 'keep' or 'drop' to the allowlist file on disk but rather saves a list
+        # of all allowlisted db names and just presents the keep/drop information while editing
+        # the allowlist to supply users a list of databases they can allowlist by changing the
+        # prefix to 'keep'. Everything prefixed 'drop' is not considered allowlisted and thus
+        # not written to the allowlist file on disk.
         #
-        # However, if users manually edit their whitelist files they might use the keep/drop
+        # However, if users manually edit their allowlist files they might use the keep/drop
         # syntax they're familiar with.
         if db_name.start_with? 'keep '
           db_name.gsub!(/keep /, '')
           db_name = db_name.split[1..-1].join(' ')
-          warn_manual_whitelist = true
+          warn_manual_allowlist = true
         end
         tmpfile_content.push(['keep', db_name]) unless db_name.empty?
       end
-      if warn_manual_whitelist
+      if warn_manual_allowlist
         Interaction.warn <<~ERROR_MSG
-          Your whitelist #{whitelist} seems to have been generated manually.
+          Your allowlist #{allowlist} seems to have been generated manually.
           In that case, make sure to use only one database name per line and omit the 'keep' prefix."
 
           Launching the editor.
@@ -81,29 +92,29 @@ module Geordi
       texteditor = Geordi::Util.decide_texteditor
       system("#{texteditor} #{tmp.path}")
       File.open(tmp.path, 'r') do |wl_edited|
-        whitelisted_dbs = []
-        whitelist_storage = File.open(whitelist, 'w')
+        allowlisted_dbs = []
+        allowlist_storage = File.open(allowlist, 'w')
         lines = Geordi::Util.stripped_lines(wl_edited.read)
         lines.each do |line|
           next if line.start_with?('#')
           unless line.split.length == 2
-            Interaction.fail "Invalid edit to whitelist file: \`#{line}\` - Syntax is: ^[keep|drop] dbname$"
+            Interaction.fail "Invalid edit to allowlist file: \`#{line}\` - Syntax is: ^[keep|drop] dbname$"
           end
           unless %w[keep drop k d].include? line.split.first
-            Interaction.fail "Invalid edit to whitelist file: \`#{line}\` - must start with either drop or keep."
+            Interaction.fail "Invalid edit to allowlist file: \`#{line}\` - must start with either drop or keep."
           end
           db_status, db_name = line.split
           if db_status == 'keep'
-            whitelisted_dbs.push db_name
-            whitelist_storage.write(db_name << "\n")
+            allowlisted_dbs.push db_name
+            allowlist_storage.write(db_name << "\n")
           end
         end
-        whitelist_storage.close
+        allowlist_storage.close
       end
     end
 
     def decide_mysql_command(extra_flags)
-      cmd = 'sudo mysql'
+      cmd = @sudo ? 'sudo mysql' : 'mysql'
       unless extra_flags.nil?
         if extra_flags.include? 'port'
           port = Integer(extra_flags.split('=')[1].split[0])
@@ -111,24 +122,27 @@ module Geordi
         end
         cmd << " #{extra_flags}"
       end
-      Open3.popen3("#{cmd} -e 'QUIT'") do |_stdin, _stdout, stderr, thread|
-        break if thread.value.exitstatus == 0
-        # sudo mysql was not successful, switching to mysql-internal user management
-        mysql_error = stderr.read.lines[0].chomp.strip.split[1]
-        if %w[1045 1698].include? mysql_error # authentication failed
-          cmd = 'mysql -uroot'
-          cmd << " #{extra_flags}" unless extra_flags.nil?
-          unless File.exist? File.join(Dir.home, '.my.cnf')
-            puts "Please enter your MySQL/MariaDB password for account 'root'."
-            Interaction.warn "You should create a ~/.my.cnf file instead, or you'll need to enter your MySQL root password for each db."
-            Interaction.warn 'See https://makandracards.com/makandra/50813-store-mysql-passwords-for-development for more information.'
-            cmd << ' -p' # need to ask for password now
-          end
-          Open3.popen3("#{cmd} -e 'QUIT'") do |_stdin_2, _stdout_2, _stderr_2, thread_2|
-            Interaction.fail 'Could not connect to MySQL/MariaDB' unless thread_2.value.exitstatus == 0
+
+      if @sudo
+        Open3.popen3("#{cmd} -e 'QUIT'") do |_stdin, _stdout, stderr, thread|
+          break if thread.value.exitstatus == 0
+          # sudo mysql was not successful, switching to mysql-internal user management
+          mysql_error = stderr.read.lines[0].chomp.strip.split[1]
+          if %w[1045 1698].include? mysql_error # authentication failed
+            cmd = 'mysql -uroot'
+            cmd << " #{extra_flags}" unless extra_flags.nil?
+            unless File.exist? File.join(Dir.home, '.my.cnf')
+              Interaction.note "Please enter your MySQL/MariaDB password for account 'root'."
+              Interaction.warn "You should create a ~/.my.cnf file instead, or you'll need to enter your MySQL root password for each db."
+              Interaction.note 'See https://makandracards.com/makandra/50813-store-mysql-passwords-for-development for more information.'
+              cmd << ' -p' # need to ask for password now
+            end
+            Open3.popen3("#{cmd} -e 'QUIT'") do |_stdin_2, _stdout_2, _stderr_2, thread_2|
+              Interaction.fail 'Could not connect to MySQL/MariaDB' unless thread_2.value.exitstatus == 0
+            end
+          elsif mysql_error == '2013' # connection to port or socket failed
+            Interaction.fail 'MySQL/MariaDB connection failed, is this the correct port?'
           end
-        elsif mysql_error == '2013' # connection to port or socket failed
-          Interaction.fail 'MySQL/MariaDB connection failed, is this the correct port?'
         end
       end
       cmd
@@ -136,7 +150,7 @@ module Geordi
     private :decide_mysql_command
 
     def decide_postgres_command(extra_flags)
-      cmd = 'sudo -u postgres psql'
+      cmd = @sudo ? 'sudo -u postgres psql' : 'psql'
       unless extra_flags.nil?
         begin
           port = Integer(extra_flags.split('=')[1])
@@ -157,28 +171,38 @@ module Geordi
       else
         list_all_mysql_dbs
       end
+    rescue DatabaseError
+      Interaction.fail 'Connection to database could not be established. Try running again with --sudo.'
     end
 
     def list_all_postgres_dbs
-      `#{@postgres_command} -t -A -c 'SELECT DATNAME FROM pg_database WHERE datistemplate = false'`.split
+      output, _error, status = Open3.capture3("#{@postgres_command} -t -A -c 'SELECT DATNAME FROM pg_database WHERE datistemplate = false'")
+
+      raise DatabaseError unless status.success?
+
+      output.split
     end
 
     def list_all_mysql_dbs
       if @mysql_command.include? '-p'
-        puts "Please enter your MySQL/MariaDB account 'root' for: list all databases"
+        Interaction.note "Please enter your MySQL/MariaDB account 'root' for: list all databases"
       end
-      `#{@mysql_command} -B -N -e 'show databases'`.split
+      output, _error, status = Open3.capture3("#{@mysql_command} -B -N -e 'show databases'")
+
+      raise DatabaseError unless status.success?
+
+      output.split
     end
 
     def clean_mysql
       Interaction.announce 'Checking for MySQL databases'
       database_list = list_all_dbs('mysql')
-      # confirm_deletion includes option for whitelist editing
+      # confirm_deletion includes option for allowlist editing
       deletable_dbs = confirm_deletion('mysql', database_list)
       return if deletable_dbs.nil?
       deletable_dbs.each do |db|
         if @mysql_command.include? '-p'
-          puts "Please enter your MySQL/MariaDB account 'root' for: DROP DATABASE #{db}"
+          Interaction.note "Please enter your MySQL/MariaDB account 'root' for: DROP DATABASE #{db}"
         else
           puts "Dropping MySQL/MariaDB database #{db}"
         end
@@ -187,7 +211,7 @@ module Geordi
     end
 
     def clean_postgres
-      Interaction.announce 'Checking for Postgres databases'
+      Interaction.announce 'Checking for PostgreSQL databases'
       database_list = list_all_dbs('postgres')
       deletable_dbs = confirm_deletion('postgres', database_list)
       return if deletable_dbs.nil?
@@ -197,36 +221,36 @@ module Geordi
       end
     end
 
-    def whitelist_fname(dbtype)
-      File.join(@whitelist_directory, dbtype) << '.txt'
+    def allowlist_fname(dbtype)
+      File.join(@allowlist_directory, dbtype) << '.txt'
     end
 
     def confirm_deletion(dbtype, database_list)
       proceed = ''
       until %w[y n].include? proceed
-        deletable_dbs = filter_whitelisted(dbtype, database_list)
+        deletable_dbs = filter_allowlisted(dbtype, database_list)
         if deletable_dbs.empty?
-          Interaction.note "No #{dbtype} databases found that were not whitelisted."
-          if Interaction.prompt('Edit the whitelist? [y]es or [n]o') == 'y'
+          Interaction.note "No #{dbtype} databases found that were not allowlisted."
+          if Interaction.prompt('Edit the allowlist? [y]es or [n]o') == 'y'
             proceed = 'e'
           else
             return []
           end
         end
         if proceed.empty?
-          Interaction.note "The following #{dbtype} databases are not whitelisted and can be deleted:"
+          Interaction.note "The following #{dbtype} databases are not allowlisted and can be deleted:"
           deletable_dbs.sort.each do |db|
             puts db
           end
-          Interaction.note "These #{dbtype} databases are not whitelisted and can be deleted."
-          proceed = Interaction.prompt('Proceed? [y]es, [n]o or [e]dit whitelist')
+          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
-          edit_whitelist dbtype
+          edit_allowlist dbtype
         when 'n'
-          Interaction.success 'Nothing deleted.'
+          Interaction.note 'Nothing deleted.'
           return []
         when 'y'
           return deletable_dbs
@@ -243,31 +267,49 @@ module Geordi
       protected[dbtype].include? database_name
     end
 
-    def is_whitelisted?(dbtype, database_name)
-      whitelist_content = if File.exist? whitelist_fname(dbtype)
-        Geordi::Util.stripped_lines(File.open(whitelist_fname(dbtype), 'r').read)
+    def is_allowlisted?(dbtype, database_name)
+      allowlist_content = if File.exist? allowlist_fname(dbtype)
+        Geordi::Util.stripped_lines(File.open(allowlist_fname(dbtype), 'r').read)
       else
         []
       end
-      # Allow explicit whitelisting of derivative databases like projectname_test2
-      if whitelist_content.include? database_name
+      # Allow explicit allowlisting of derivative databases like projectname_test2
+      if allowlist_content.include? database_name
         true
-      # whitelisting `projectname` also whitelists `projectname_test\d*`, `projectname_development`
-      elsif whitelist_content.include? database_name.sub(@derivative_dbname, '')
+      # allowlisting `projectname` also allowlists `projectname_test\d*`, `projectname_development`
+      elsif allowlist_content.include? database_name.sub(@derivative_dbname, '')
         true
       else
         false
       end
     end
 
-    def filter_whitelisted(dbtype, database_list)
+    def filter_allowlisted(dbtype, database_list)
       # n.b. `delete` means 'delete from list of dbs that should be deleted in this context
       # i.e. `delete` means 'keep this database'
       deletable_dbs = database_list.dup
-      deletable_dbs.delete_if { |db| is_whitelisted?(dbtype, db) if File.exist? whitelist_fname(dbtype) }
+      deletable_dbs.delete_if { |db| is_allowlisted?(dbtype, db) if File.exist? allowlist_fname(dbtype) }
       deletable_dbs.delete_if { |db| is_protected?(dbtype, db) }
       deletable_dbs.delete_if { |db| db.start_with? '#' }
     end
-    private :filter_whitelisted
+    private :filter_allowlisted
+
+    def legacy_allowlist_directory
+      @legacy_allowlist_directory ||= File.join(@base_directory, '.config', 'geordi', 'whitelists')
+    end
+
+    def move_allowlist_files
+      %w[postgres mysql].each do |dbtype|
+        new_path = allowlist_fname(dbtype)
+        next if File.exist?(new_path)
+
+        legacy_path = File.join(legacy_allowlist_directory, dbtype) << '.txt'
+        FileUtils.mv(legacy_path, new_path)
+
+        if Dir.exist?(legacy_allowlist_directory) && Dir.empty?(legacy_allowlist_directory)
+          Dir.delete(legacy_allowlist_directory)
+        end
+      end
+    end
   end
 end

data/lib/geordi/dump_loader.rb

@@ -62,12 +62,16 @@ module Geordi
 
     def postgresql_command
       ENV['PGPASSWORD'] = config['password']
-      command = 'pg_restore --no-owner --clean --no-acl'
-      command << ' --username=' << config['username'].to_s if config['username']
-      command << ' --port=' << config['port'].to_s if config['port']
-      command << ' --host=' << config['host'].to_s if config['host']
-      command << ' --dbname=' << config['database'].to_s
-      command << ' ' << dump_file
+      drop_command = 'dropdb --if-exists ' << config['database'].to_s
+      create_command = 'createdb ' << config['database'].to_s
+      restore_command = 'pg_restore --no-owner --no-acl'
+      restore_command << ' --username=' << config['username'].to_s if config['username']
+      restore_command << ' --port=' << config['port'].to_s if config['port']
+      restore_command << ' --host=' << config['host'].to_s if config['host']
+      restore_command << ' --dbname=' << config['database'].to_s
+      restore_command << ' ' << dump_file
+
+      drop_command + ' && ' + create_command + ' && ' + restore_command
     end
 
     def dump_file

data/lib/geordi/hint.rb

@@ -14,7 +14,7 @@ module Geordi
         if generated_hints.any? && should_print_hint
           puts
           puts generated_hints.sample
-          puts 'You can configure the probability for these hints by setting hint_probability to a unitless percent number in ~/.config/geordi/global.yml' unless settings_probability
+          puts "You can configure the probability for these hints by setting hint_probability to a unitless percent number in #{Settings::GLOBAL_SETTINGS_FILE_NAME}" unless settings_probability
         end
 
         generated_hints

data/lib/geordi/settings.rb

@@ -8,7 +8,15 @@ module Geordi
     GLOBAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/global_settings.yml'.freeze : File.join(ENV['HOME'], '.config/geordi/global.yml').freeze
     LOCAL_SETTINGS_FILE_NAME = Util.testing? ? './tmp/local_settings.yml'.freeze : './.geordi.yml'.freeze
 
-    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver pivotal_tracker_project_ids git_initials hint_probability ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[
+      auto_update_chromedriver
+      git_initials
+      hint_probability
+      irb_flags
+      pivotal_tracker_api_key
+      pivotal_tracker_project_ids
+    ].freeze
+
     ALLOWED_LOCAL_SETTINGS = %w[ pivotal_tracker_project_ids ].freeze
 
     SETTINGS_WARNED = 'GEORDI_INVALID_SETTINGS_WARNED'
@@ -18,6 +26,10 @@ module Geordi
     end
 
     # Global settings
+    def irb_flags
+      @global_settings['irb_flags']
+    end
+
     def pivotal_tracker_api_key
       @global_settings['pivotal_tracker_api_key'] || gitpt_api_key_old || inquire_pt_api_key
     end

data/lib/geordi/util.rb

@@ -37,7 +37,8 @@ module Geordi
       # show_cmd: Whether to print the command
       # confirm: Whether to ask for confirmation before running it
       # fail_message: The text to print on command failure
-      def run!(command, show_cmd: false, confirm: false, fail_message: 'Something went wrong.')
+      # exec: Whether to run the command with `exec` instead of `system`
+      def run!(command, show_cmd: false, confirm: false, fail_message: 'Something went wrong.', exec: false)
         # Disable shell features for arrays https://stackoverflow.com/questions/13338147/ruby-system-method-arguments
         # Conversion: ['ls *', 'some arg'] => ['ls', '*', 'some arg']
         # If you need shell features, you need to pass in a String instead of an array.
@@ -60,19 +61,23 @@ module Geordi
 
         if testing?
           # Join with commas for precise argument distinction
-          puts "Util.run! #{show_command.join(', ')}"
+          puts "Util.run!#{' (exec)' if exec} #{show_command.join(', ')}"
         else
+          method = exec ? :exec : :system
+
           # Remove Geordi's Bundler environment when running commands.
           success = if !defined?(Bundler)
-            system(*command)
+            Kernel.public_send(method, *command)
           elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('1.17.3')
             Bundler.with_original_env do
-              system(*command)
+              Kernel.public_send(method, *command)
             end
           else
-            Bundler.clean_system(*command)
+            method = exec ? :clean_exec : :clean_system
+            Bundler.public_send(method, *command)
           end
 
+          # This part will never be reached when `exec` is true
           success || Interaction.fail(fail_message)
         end
       end
@@ -89,14 +94,15 @@ module Geordi
         elsif gem_major_version('rails') == 3
           "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          "#{binstub_or_fallback('rails')} console -e #{environment} #{use_multiline_flag}"
-        end
-      end
+          use_multiline = if irb_version >= Gem::Version.new('1.2') && ruby_version < Gem::Version.new('3.0')
+            Interaction.note 'Using --nomultiline switch for faster pasting'
+            '--nomultiline'
+          end
+
+          irb_flags = [use_multiline, Settings.new.irb_flags].join(' ').strip
+          irb_flags.prepend('-- ') unless irb_flags.empty?
 
-      def use_multiline_flag
-        if irb_version >= Gem::Version.new('1.2') && ruby_version < Gem::Version.new('3.0')
-          Interaction.note 'Using --nomultiline switch for faster pasting'
-          '-- --nomultiline'
+          "#{binstub_or_fallback('rails')} console -e #{environment} #{irb_flags}"
         end
       end
 
@@ -193,7 +199,7 @@ module Geordi
         version_string = if testing?
           ENV['GEORDI_TESTING_IRB_VERSION']
         else
-          `irb --version`[/irb (\d\.\d\.\d)/, 1]
+          `irb --version`[/irb (\d+\.\d+\.\d+)/, 1]
         end
 
         Gem::Version.new(version_string)

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '9.6.1'.freeze
+  VERSION = '10.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 9.6.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails