geordi 4.0.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ef220369795b8dc7615505cffc05a91776cf91a46580916ab30abd7902262a
-  data.tar.gz: e030a912bd16d9e805081cf4ce3669260223a0198ea1f1d0dfaf8e7c10b75b7f
+  metadata.gz: 143cfb8cfd0cc7fb52b39eb7a41d22fb1af259f78f817fa55742cec61271b117
+  data.tar.gz: 2bde738375417d40af0545c582c290c85a67cff890679fe58521054eb9f80d67
 SHA512:
-  metadata.gz: 49df1e803163f9d602f663d29da0f0036214a5ccb571727cbd02b9951094e4aa72fa7bf2654ceae3b7af47ace8286e6c26b94933277377a1ef5b5f21d7fe6ff5
-  data.tar.gz: 6cf4fafbb0e8f8c311279d61f3ea090ee9bb44589bb9f8566ab0796b26514862d52e89f93e9f5686aa63c8350951fb147c7a967ed2270ff29bb77cb07277da2d
+  metadata.gz: 418c1c83487f4b807346a576fa3a9ee08e890c01075df6937e47bc2669cbe4031829c4a9d797223e747ed93ba209e5f689eab0fc8c722c1bb8067fd5c25af538
+  data.tar.gz: 5a979db241a56d199d496becb9a2966dbb92adfe90125a6d026b0b323f3b24111810876aaf2bc70b2d111450412230b9f00be4939dd7548bae7c311d36fe96b2

data/.travis.yml

@@ -8,12 +8,17 @@ rvm:
   - '2.4.10'
   - '2.5.8'
   - '2.6.6'
+  - '2.7.1'
 
 gemfile:
   - 'Gemfile'
 
 dist: trusty
 
+before_install:
+  - sudo apt-get install -y vnc4server
+  # Fake required password for vncserver
+  - mkdir ~/.vnc && touch ~/.vnc/passwd && chmod 700 ~/.vnc/passwd
 install:
   - gem install bundler:1.17.3
   # Replace default Travis CI bundler script with a version that doesn't

data/CHANGELOG.md

@@ -5,10 +5,68 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+
 ### Compatible changes
 ### Breaking changes
 
 
+## 4.2.0 2020-10-02
+
+### Compatible changes
+* 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
+* Fix #115: `geordi cucumber --modified` command, that corrupted filenames like:
+  ```
+  No such file or directory tures/pages.feature
+  ```
+* Avoid writing an instance of HighLine::String to Geordi config files (closes #114)
+
+
+## 4.1.1 2020-08-28
+### Compatible changes
+
+* Fixed: System calls are not executed properly if no bin stub is present. This resulted in errors like:
+
+  ```
+  % geordi rspec
+
+  # Running specs
+  > All specs at once (using parallel_tests)
+
+  x Specs failed.
+  ```
+
+  or
+
+  ```
+  % geordi migrate
+
+  # Migrating
+  > Development and parallel test databases
+
+  x Something went wrong.
+  ```
+
+
+## 4.1.0 2020-08-18
+
+### Compatible changes
+
+- Added dumple option `--compress` to compress after dumping
+
+## 4.0.1 2020-08-11
+
+### Compatible changes
+
+- Fix `geordi migrate` command, that fails with:
+
+```
+Don't know how to build task 'db:migrate parallel:prepare'
+```
+
+
 ## 4.0.0 2020-07-30
 
 ### Compatible changes
@@ -18,6 +76,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 - Removed deprecated executables
 - Removed `eurest` command
+- Respect binstubs if available, otherwise fallback to geordi's previous behaviour. Note that this might cause failures, when your binstubs are not working. Please have a look at #109 for how a failure might look like and how you can fix it.
 
 
 ## 3.2.0 2020-07-15

data/Gemfile

@@ -3,7 +3,8 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in geordi.gemspec
 gemspec
 
-gem 'aruba'
+gem 'aruba', '< 1' # Drops support for Ruby 2.2-
+gem 'rake', '< 13' # Drops support for Ruby 2.1
 gem 'rspec-mocks'
 gem 'highline'
 gem 'parallel_tests'

data/Gemfile.lock

@@ -1,76 +1,93 @@
 PATH
   remote: .
   specs:
-    geordi (4.0.0)
+    geordi (4.2.1)
       thor (~> 1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    aruba (0.14.14)
+      childprocess (>= 0.6.3, < 4.0.0)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9)
+      rspec-expectations (>= 2.99)
+      thor (>= 0.19, < 2.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
+    backports (3.18.2)
+    builder (3.2.4)
     childprocess (1.0.1)
       rake (< 13.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    cucumber (1.3.20)
+    contracts (0.16.0)
+    cucumber (3.0.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      cucumber-core (~> 3.0.0)
+      cucumber-expressions (~> 4.0.3)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (~> 1.3)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
+    cucumber-core (3.0.0)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (>= 1.0.1)
+      gherkin (>= 4.1.3)
+    cucumber-expressions (4.0.4)
+    cucumber-tag_expressions (2.0.2)
+    cucumber-wire (0.0.1)
     declarative (0.0.10)
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.4)
     equalizer (0.0.11)
-    excon (0.73.0)
+    excon (0.76.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    highline (1.6.21)
+    ffi (1.12.2)
+    gherkin (4.1.3)
+    highline (2.0.3)
     ice_nine (0.11.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    multi_json (1.13.1)
+    mimemagic (0.3.5)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    parallel (0.5.16)
-    parallel_tests (0.6.18)
+    parallel (1.13.0)
+    parallel_tests (2.23.0)
       parallel
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (10.5.0)
+    public_suffix (2.0.5)
+    rake (12.3.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    rspec-expectations (3.4.0)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tracker_api (1.10.0)
+    tracker_api (1.11.0)
       addressable
       equalizer
       excon
@@ -91,12 +108,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
+  aruba (< 1)
   geordi!
   highline
   launchy
   parallel_tests
   pry
+  rake (< 13)
   rspec-mocks
   tracker_api
 

data/README.md

@@ -39,6 +39,13 @@ 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 
+cucumber tests, in case Chrome and chromedriver versions don't match
+
+**Options**
+- `[--quiet-if-matching], [--no-quiet-if-matching]`: Suppress notification if chromedriver and chrome versions match
+
 
 ### `geordi clean`
 Remove unneeded files from the current directory.
@@ -169,10 +176,18 @@ offer to edit the whitelist instead.
 - `[--postgres=PORT_OR_SOCKET]`: Use Postgres port or socket
 - `[--mysql=PORT_OR_SOCKET]`: Use MySQL/MariaDB port or socket
 
-
 ### `geordi dump [TARGET]`
 Handle (remote) database dumps.
 
+If you are using multiple databases per environment, pass the database name like this:
+
+    geordi dump -d primary
+
+Loading a dump into one of multiple local databases is not supported yet.
+
+When called with the `--load` option, sources the specified dump into the
+development database.
+
 `geordi dump` (without arguments) dumps the development database with `dumple`.
 
 `geordi dump -l tmp/staging.dump` (with the `--load` option) sources the
@@ -382,10 +397,18 @@ browser, as opposed to opening it within the VNC window.
 Contributing
 ============
 
-* Run the tests for the oldest supported ruby version with `bundle exec rake`. Ensure that all other ruby versions in the `travis.yml` pass as well after pushing your feature branch and triggering the travis build.
-* Update this `README`. The whole `geordi` section is auto-generated from command
-  descriptions when running `rake readme`.
-* Document your changes in the `CHANGELOG.md` file.
+When making changes to Geordi, please make sure your code is tested. Not all,
+but most features of Geordi can be tested. See other tests for inspiration.
+
+Once you have completed your modifications, please update CHANGELOG and README
+as needed. Use `rake readme` to regenerate the Geordi section of the README from
+the command documentations.
+
+Make sure tests are green in the default Ruby *plus* in the oldest Ruby > 1.8
+that you have installed on your system (1.8.7 support has been dropped).
+
+Before releasing your changes, wait for the Travis results to see that tests
+passed in all Ruby versions.
 
 
 Adding a new command
@@ -399,7 +422,7 @@ To try Geordi locally, call it like this:
 
     # -I means "add the following directory to load path"
     ruby -Ilib exe/geordi
-    
+
     # From another directory
     ruby -I ../geordi/lib ../geordi/exe/geordi
 

data/Rakefile

@@ -5,7 +5,7 @@ desc 'Default: Run all tests'
 task default: :features
 
 task :features do
-  system 'bundle exec cucumber'
+  exec 'bundle exec cucumber'
 end
 
 task :readme do

data/exe/dumple

@@ -3,6 +3,7 @@
 require 'erb'
 
 fail_gently = ARGV.include?("--fail-gently")
+compress = ARGV.include?("--compress")
 
 if ARGV.include?("-i")
   puts "*******************************************************"
@@ -44,9 +45,13 @@ begin
   end
 
   config = YAML::load(ERB.new(File.read(config_path)).result)
+  environment, database = ARGV.reject{ |arg| arg[0].chr == '-' }
+  environment ||= 'production'
+  config = config[environment] or raise "No #{environment} database found.\nUsage: dumple ENVIRONMENT [DATABASE]"
 
-  environment = ARGV.reject{ |arg| arg[0].chr == '-' }.first || 'production'
-  config = config[environment] or raise "No #{environment} database found.\nUsage: dumple ENVIRONMENT"
+  if database
+    config = config[database] or raise %(Unknown #{environment} database "#{database}")
+  end
 
   dump_dir = "#{ENV['HOME']}/dumps"
   unless File.directory?(dump_dir)
@@ -60,7 +65,8 @@ begin
     dump_path = "#{dump_dir}/#{config['database']}_#{Time.now.strftime("%Y%m%d_%H%M%S")}.dump"
   end
 
-  puts "> Dumping database for \"#{environment}\" environment ..."
+  given_database = database ? %(#{database} ) : ""
+  puts "> Dumping #{given_database}database for \"#{environment}\" environment ..."
 
   host = config['host']
   port = config['port']
@@ -89,13 +95,22 @@ begin
     command << " --port=#{port}" if port
     command
   else
-    raise "Adapter \"#{config['adapter']} is not supported"
+    raise "Adapter \"#{config['adapter']}\" is not supported"
   end
   success = system(dump_command)
   success or raise "Creating the dump failed"
 
   system "chmod 600 #{dump_path}"
 
+  if compress
+    puts "> Compressing the dump ..."
+
+    # gzip compresses in place
+    compress_success = system("gzip #{dump_path}")
+    compress_success or raise "Compressing the dump failed"
+    dump_path << ".gz"
+  end
+
   dump_size_kb = (File.size(dump_path) / 1024).round
 
   puts "> Dumped to #{dump_path} (#{dump_size_kb} KB)"

data/geordi.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |spec|
 
   spec.summary = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
   spec.description = 'Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.'
-  spec.homepage = 'http://makandra.com'
+  spec.homepage = 'https://makandra.com'
   spec.license = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features)/}) }
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = <<-ATTENTION
 * Binary `geordi` installed
-* Geordi 4.0.0 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
+* Geordi 4 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
   ATTENTION
 end

data/lib/geordi/COMMAND_TEMPLATE

@@ -21,7 +21,7 @@ option :opt, type: :boolean, aliases: '-o', banner: 'VALUE_NAME', desc: 'If set,
 
 def example
   # Invoke other commands like this:
-  invoke_cmd 'other_command', 'argument', an: 'option'
+  invoke_geordi 'other_command', 'argument', an: 'option'
 
   Interaction.fail 'Option missing' unless options.opt?
 

data/lib/geordi/chromedriver_updater.rb

@@ -5,12 +5,12 @@ require 'tempfile'
 module Geordi
   class ChromedriverUpdater
 
-    def run
+    def run(options)
       chrome_version = determine_chrome_version
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        Interaction.warn("No update required, you are using for both executables the same version #{chrome_version}!")
+        Interaction.note("No update required, you are using for both executables the same version #{chrome_version}!") unless options[:quiet_if_matching]
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))

data/lib/geordi/cli.rb

@@ -18,7 +18,7 @@ module Geordi
     private
 
     # fix weird implementation of #invoke
-    def invoke_cmd(name, *args)
+    def invoke_geordi(name, *args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       invoke(name, args, options)
     end

data/lib/geordi/commands/bundle_install.rb

@@ -2,6 +2,6 @@ desc 'bundle-install', 'Run bundle install if required', hide: true
 def bundle_install
   if File.exist?('Gemfile') && !system('bundle check > /dev/null 2>&1')
     Interaction.announce 'Bundling'
-    Util.system! 'bundle install'
+    Util.run!('bundle install')
   end
 end

data/lib/geordi/commands/capistrano.rb

@@ -17,6 +17,6 @@ def capistrano(*args)
     command = "bundle exec cap #{stage} " + args.join(' ')
     Interaction.note_cmd command
 
-    Util.system!(command, fail_message: 'Capistrano failed. Have a look!')
+    Util.run!(command, fail_message: 'Capistrano failed. Have a look!')
   end
 end

data/lib/geordi/commands/chromedriver_update.rb

@@ -4,10 +4,17 @@ 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 
+cucumber tests, in case Chrome and chromedriver versions don't match
 LONGDESC
 
+option :quiet_if_matching, type: :boolean, default: false,
+  desc: 'Suppress notification if chromedriver and chrome versions match'
+
 def chromedriver_update
   require 'geordi/chromedriver_updater'
 
-  ChromedriverUpdater.new.run
+  ChromedriverUpdater.new.run(options)
 end

data/lib/geordi/commands/console.rb

@@ -14,14 +14,15 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 
 def console(target = 'development', *_args)
   require 'geordi/remote'
-  invoke_cmd 'bundle_install'
+  invoke_geordi 'bundle_install'
 
   if target == 'development'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Opening a local Rails console'
 
-    Util.system! Util.console_command(target)
+    command = Util.console_command(target)
+    Util.run!(command)
   else
     Interaction.announce 'Opening a Rails console on ' + target
 

data/lib/geordi/commands/create_database_yml.rb

@@ -7,7 +7,7 @@ def create_database_yml
     Interaction.announce 'Creating ' + real_yml
 
     sample = File.read(sample_yml)
-    adapter = sample.match(/adapter: (\w+)\n/).captures.first
+    adapter = sample.match(/adapter: (\w+)/).captures.first
 
     print "Please enter your #{adapter} password: "
     db_password = STDIN.gets.strip

data/lib/geordi/commands/create_databases.rb

@@ -1,16 +1,17 @@
 desc 'create-databases', 'Create all databases', hide: true
 def create_databases
-  invoke_cmd 'create_database_yml'
-  invoke_cmd 'bundle_install'
+  invoke_geordi 'create_database_yml'
+  invoke_geordi 'bundle_install'
 
   Interaction.announce 'Creating databases'
 
   if File.exist?('config/database.yml')
-    command = Util.binstub 'rake'
-    command << ' db:create:all'
-    command << ' parallel:create' if Util.file_containing?('Gemfile', /parallel_tests/)
+    command = []
+    command << Util.binstub_or_fallback('rake')
+    command << 'db:create:all'
+    command << 'parallel:create' if Util.file_containing?('Gemfile', /parallel_tests/)
 
-    Util.system! command
+    Util.run!(command)
   else
     puts 'config/database.yml does not exist. Nothing to do.'
   end

data/lib/geordi/commands/cucumber.rb

@@ -37,7 +37,7 @@ def cucumber(*args)
   if args.empty?
     # This is not testable as there is no way to stub `git` :(
     if options.modified?
-      modified_features = `git status --short`.split($INPUT_RECORD_SEPARATOR).map do |line|
+      modified_features = `git status --short`.split("\n").map do |line|
         indicators = line.slice!(0..2) # Remove leading indicators
         line if line.include?('.feature') && !indicators.include?('D')
       end.compact
@@ -45,7 +45,7 @@ def cucumber(*args)
     end
 
     if options.containing
-      matching_features = `grep -lri '#{options.containing}' --include=*.feature features/`.split($INPUT_RECORD_SEPARATOR)
+      matching_features = `grep -lri '#{options.containing}' --include=*.feature features/`.split("\n")
       args = matching_features.uniq
     end
   end
@@ -53,8 +53,13 @@ def cucumber(*args)
   if File.directory?('features')
     require 'geordi/cucumber'
 
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    settings = Geordi::Settings.new
+
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
+    if settings.auto_update_chromedriver
+      invoke_geordi 'chromedriver_update', quiet_if_matching: true
+    end
 
     cmd_opts, files = args.partition { |f| f.start_with? '-' }
     cmd_opts << '--format' << 'pretty' << '--backtrace' if options.debug

data/lib/geordi/commands/deploy.rb

@@ -66,7 +66,7 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
   push_needed = false if Util.testing? # Hard to test
 
   Interaction.announce "Checking whether your #{source_branch} branch is ready" ############
-  Util.system! "git checkout #{source_branch}"
+  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.')
@@ -76,14 +76,14 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
 
   if merge_needed
     Interaction.announce "Checking what's in your #{target_branch} branch right now" #######
-    Util.system! "git checkout #{target_branch} && git pull"
+    Util.run!("git checkout #{target_branch} && git pull")
   end
 
   Interaction.announce 'You are about to:' #################################################
   Interaction.note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
   if push_needed
     Interaction.note 'Push these commits:' if push_needed
-    Util.system! "git --no-pager log origin/#{target_branch}..#{source_branch} --oneline"
+    Util.run!("git --no-pager log origin/#{target_branch}..#{source_branch} --oneline")
   end
   Interaction.note "Deploy to #{target_stage}"
   Interaction.note "From current branch #{source_branch}" if options.current_branch
@@ -94,7 +94,7 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
     git_call << "git merge #{source_branch}" if merge_needed
     git_call << 'git push' if push_needed
 
-    invoke_cmd 'bundle_install'
+    invoke_geordi 'bundle_install'
 
     capistrano_call = "cap #{target_stage} deploy"
     capistrano_call << ':migrations' unless Util.gem_major_version('capistrano') == 3 || options.no_migrations
@@ -102,14 +102,14 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
     capistrano_call = "DEPLOY_BRANCH=#{source_branch} #{capistrano_call}" if options.current_branch
 
     if git_call.any?
-      Util.system! git_call.join(' && '), show_cmd: true
+      Util.run!(git_call.join(' && '), show_cmd: true)
     end
 
-    Util.system! capistrano_call, show_cmd: true
+    Util.run!(capistrano_call, show_cmd: true)
 
     Interaction.success 'Deployment complete.'
   else
-    Util.system! "git checkout #{source_branch}"
+    Util.run!("git checkout #{source_branch}")
     Interaction.fail 'Deployment cancelled.'
   end
 end

data/lib/geordi/commands/dump.rb

@@ -10,13 +10,21 @@ specified target's database and downloads it to `tmp/`.
 
 `geordi dump staging -l` (with a Capistrano deploy target and the `--load`
 option) sources the dump into the development database after downloading it.
+
+If you are using multiple databases per environment, pass the database name like this:
+
+    geordi dump -d primary
+
+Loading a dump into one of multiple local databases is not supported yet.
 DESC
 
 option :load, aliases: '-l', type: :string, desc: 'Load a dump', banner: '[DUMP_FILE]'
+option :database, aliases: '-d', type: :string, desc: 'Database name, if there are multiple databases', banner: 'NAME'
 
 def dump(target = nil, *_args)
   require 'geordi/dump_loader'
   require 'geordi/remote'
+  database = options[:database] ? "#{options[:database]} " : ''
 
   if target.nil?
     if options.load
@@ -33,12 +41,14 @@ def dump(target = nil, *_args)
 
     else
       Interaction.announce 'Dumping the development database'
-      Util.system! 'dumple development'
-      Interaction.success 'Successfully dumped the development database.'
+      Util.run!("dumple development #{database}")
+      Interaction.success "Successfully dumped the #{database}development database."
     end
 
   else
-    Interaction.announce 'Dumping the database of ' + target
+    database_label = options[:database] ? " (#{database}database)" : ""
+
+    Interaction.announce "Dumping the database of #{target}#{database_label}"
     dump_path = Geordi::Remote.new(target).dump(options)
 
     if options.load
@@ -47,7 +57,7 @@ def dump(target = nil, *_args)
       Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
 
-      Interaction.success "Your #{loader.config['database']} database has now the data of #{target}."
+      Interaction.success "Your #{loader.config['database']} database has now the data of #{target}#{database_label}."
     end
   end
 end

data/lib/geordi/commands/firefox.rb

@@ -25,7 +25,7 @@ def firefox(*command)
 
     puts
     Interaction.note_cmd command.join(' ')
-    system *command # Util.system! would reset the Firefox PATH
+    system *command # Util.run! would reset the Firefox PATH
   end
 end
 

data/lib/geordi/commands/migrate.rb

@@ -8,8 +8,8 @@ with `db:migrate`.
 LONGDESC
 
 def migrate
-  invoke_cmd 'bundle_install'
-  invoke_cmd 'yarn_install'
+  invoke_geordi 'bundle_install'
+  invoke_geordi 'yarn_install'
   Interaction.announce 'Migrating'
 
   if File.directory?('db/migrate')
@@ -17,9 +17,9 @@ def migrate
       Interaction.note 'Development and parallel test databases'
       puts
 
-      Util.system! Util.binstub('rake'), 'db:migrate parallel:prepare'
+      Util.run!([Util.binstub_or_fallback('rake'), 'db:migrate', 'parallel:prepare'])
     else
-      invoke_cmd 'rake', 'db:migrate'
+      invoke_geordi 'rake', 'db:migrate'
     end
   else
     Interaction.note 'No migrations directory found.'

data/lib/geordi/commands/rake.rb

@@ -10,14 +10,16 @@ Example: `geordi rake db:migrate`
 LONGDESC
 
 def rake(*args)
-  invoke_cmd 'bundle_install'
+  invoke_geordi 'bundle_install'
 
   %w[development test cucumber].each do |env| # update long_desc when changing this
     if File.exist? "config/environments/#{env}.rb"
-      call = [Util.binstub('rake')] + args + ["RAILS_ENV=#{env}"]
-      Interaction.note_cmd call.join(' ')
+      command = []
+      command << Util.binstub_or_fallback('rake')
+      command += args
+      command << "RAILS_ENV=#{env}"
 
-      Util.system! *call
+      Util.run!(command, show_cmd: true)
     end
   end
 end

data/lib/geordi/commands/rspec.rb

@@ -7,14 +7,14 @@ LONGDESC
 
 def rspec(*files)
   if File.exist?('spec/spec_helper.rb')
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running specs'
 
     if Util.file_containing?('Gemfile', /parallel_tests/) && files.empty?
       Interaction.note 'All specs at once (using parallel_tests)'
-      Util.system! Util.binstub('rake'), 'parallel:spec', fail_message: 'Specs failed.'
+      Util.run!([Util.binstub_or_fallback('rake'), 'parallel:spec'], fail_message: 'Specs failed.')
 
     else
       # tell which specs will be run
@@ -28,13 +28,13 @@ def rspec(*files)
       command = if File.exist?('script/spec')
         ['bundle exec spec -c'] # RSpec 1
       else
-        [Util.binstub('rspec')]
+        [Util.binstub_or_fallback('rspec')]
       end
       command << '-r rspec_spinner -f RspecSpinner::Bar' if Util.file_containing?('Gemfile', /rspec_spinner/)
       command << files.join(' ')
 
       puts
-      Util.system! command.join(' '), fail_message: 'Specs failed.'
+      Util.run!(command.join(' '), fail_message: 'Specs failed.')
     end
   else
     Interaction.note 'RSpec not employed.'

data/lib/geordi/commands/security_update.rb

@@ -35,8 +35,8 @@ def security_update(step = 'prepare')
     Interaction.note 'About to checkout production and pull.'
     Interaction.prompt('Continue?', 'y', /y|yes/) || Interaction.fail('Cancelled.')
 
-    Util.system! 'git checkout production', show_cmd: true
-    Util.system! 'git pull', show_cmd: true
+    Util.run!('git checkout production', show_cmd: true)
+    Util.run!('git pull', show_cmd: true)
 
     Interaction.success 'Successfully prepared for security update'
     puts
@@ -47,7 +47,7 @@ def security_update(step = 'prepare')
   when 'f', 'finish'
     # ensure everything is committed
     if Util.testing?
-      puts 'Util.system! git status --porcelain'
+      puts 'Util.run! git status --porcelain'
     else
       `git status --porcelain`.empty? || Interaction.fail('Please commit your changes before finishing the update.')
     end
@@ -59,11 +59,11 @@ def security_update(step = 'prepare')
     Interaction.note 'About to: push production, checkout & pull master, merge production, push master.'
     Interaction.prompt('Continue?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
 
-    Util.system! 'git push', show_cmd: true
-    Util.system! 'git checkout master', show_cmd: true
-    Util.system! 'git pull', show_cmd: true
-    Util.system! 'git merge production', show_cmd: true
-    Util.system! 'git push', show_cmd: true
+    Util.run!('git push', show_cmd: true)
+    Util.run!('git checkout master', show_cmd: true)
+    Util.run!('git pull', show_cmd: true)
+    Util.run!('git merge production', show_cmd: true)
+    Util.run!('git push', show_cmd: true)
 
     Interaction.announce 'Deployment'
     deploy = (Util.gem_major_version('capistrano') == 3) ? 'deploy' : 'deploy:migrations'
@@ -76,7 +76,7 @@ def security_update(step = 'prepare')
       Interaction.prompt('Deploy staging now?', 'y', /y|yes/) || Interaction.fail('Cancelled.')
 
       Interaction.announce 'Deploy staging'
-      Util.system! "bundle exec cap staging #{deploy}", show_cmd: true
+      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.')
     else
@@ -96,7 +96,7 @@ def security_update(step = 'prepare')
 
       deploy_targets_without_staging.each do |target|
         Interaction.announce "Deploy #{target}"
-        Util.system! "bundle exec cap #{target} #{deploy}", show_cmd: true
+        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!')

data/lib/geordi/commands/server.rb

@@ -6,8 +6,8 @@ option :public, aliases: '-P', type: :boolean,
   desc: 'Make the server accessible from the local network'
 
 def server(port = nil)
-  invoke_cmd 'bundle_install'
-  invoke_cmd 'yarn_install'
+  invoke_geordi 'bundle_install'
+  invoke_geordi 'yarn_install'
   require 'geordi/util'
 
   Interaction.announce 'Booting a development server'
@@ -18,7 +18,7 @@ def server(port = nil)
   command = Util.server_command
   command << ' -b 0.0.0.0' if options.public
   command << ' -p ' << port
-  Util.system! command
+  Util.run!(command)
 end
 
 map 'devserver' => 'server'

data/lib/geordi/commands/setup.rb

@@ -19,14 +19,14 @@ def setup
     Interaction.announce 'Running bin/setup'
     Interaction.note "Geordi's own setup routine is skipped"
 
-    Util.system! 'bin/setup'
+    Util.run!('bin/setup')
   else
-    invoke_cmd 'create_databases'
-    invoke_cmd 'migrate'
+    invoke_geordi 'create_databases'
+    invoke_geordi 'migrate'
   end
 
   Interaction.success 'Successfully set up the project.'
 
-  invoke_cmd 'dump', options.dump, load: true if options.dump
-  invoke_cmd 'tests' if options.test
+  invoke_geordi 'dump', options.dump, load: true if options.dump
+  invoke_geordi 'tests' if options.test
 end

data/lib/geordi/commands/shell.rb

@@ -15,7 +15,7 @@ option :select_server, type: :string, aliases: '-s', banner: '[SERVER_NUMBER]',
 def shelll(target, *_args)
   require 'geordi/remote'
 
-  invoke_cmd 'bundle_install'
+  invoke_geordi 'bundle_install'
 
   Interaction.announce 'Opening a shell on ' + target
   Geordi::Remote.new(target).shell(options)

data/lib/geordi/commands/tests.rb

@@ -1,13 +1,13 @@
 desc 'tests', 'Run all employed tests'
 def tests
-  rake_result = invoke_cmd 'with_rake'
+  rake_result = invoke_geordi 'with_rake'
 
   # Since `rake` usually is configured to run all tests, only run them if `rake`
   # did not perform
   if rake_result == :did_not_perform
-    invoke_cmd 'unit'
-    invoke_cmd 'rspec'
-    invoke_cmd 'cucumber'
+    invoke_geordi 'unit'
+    invoke_geordi 'rspec'
+    invoke_geordi 'cucumber'
   end
 
   Interaction.success 'Successfully ran tests.'

data/lib/geordi/commands/unit.rb

@@ -1,11 +1,11 @@
 desc 'unit', 'Run Test::Unit'
 def unit
   if File.exist?('test/test_helper.rb')
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running Test::Unit'
-    Util.system! Util.binstub('rake'), 'test'
+    Util.run!([Util.binstub_or_fallback('rake'), 'test'])
   else
     Interaction.note 'Test::Unit not employed.'
   end

data/lib/geordi/commands/update.rb

@@ -11,12 +11,12 @@ option :test, type: :boolean, aliases: '-t', desc: 'After updating, run tests'
 
 def update
   Interaction.announce 'Updating repository'
-  Util.system! 'git pull', show_cmd: true
+  Util.run!('git pull', show_cmd: true)
 
-  invoke_cmd 'migrate'
+  invoke_geordi 'migrate'
 
   Interaction.success 'Successfully updated the project.'
 
-  invoke_cmd 'dump', options.dump, load: true if options.dump
-  invoke_cmd 'tests' if options.test
+  invoke_geordi 'dump', options.dump, load: true if options.dump
+  invoke_geordi 'tests' if options.test
 end

data/lib/geordi/commands/vnc.rb

@@ -10,7 +10,7 @@ option :setup, type: :boolean, desc: 'Guide through the setup of VNC'
 
 def vnc
   if options.setup
-    invoke_cmd :_setup_vnc
+    invoke_geordi :_setup_vnc
   else
     require 'geordi/cucumber'
     Geordi::Cucumber.new.launch_vnc_viewer

data/lib/geordi/commands/with_rake.rb

@@ -1,11 +1,11 @@
 desc 'with-rake', 'Run tests with `rake`', hide: true
 def with_rake
   if Util.file_containing?('Rakefile', /^task.+default.+(spec|test|feature)/)
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     Interaction.announce 'Running tests with `rake`'
-    Util.system! Util.binstub('rake')
+    Util.run!(Util.binstub_or_fallback('rake'))
   else
     Interaction.note '`rake` does not run tests.'
     :did_not_perform

data/lib/geordi/commands/yarn_install.rb

@@ -3,6 +3,6 @@ desc 'yarn-install', 'Runs yarn install if required', hide: true
 def yarn_install
   if File.exist?('package.json') && !system('yarn check --integrity > /dev/null 2>&1')
     Interaction.announce 'Yarn install'
-    Util.system! 'yarn install'
+    Util.run!('yarn install')
   end
 end

data/lib/geordi/cucumber.rb

@@ -27,7 +27,7 @@ module Geordi
       Interaction.note_cmd(command) if options[:verbose]
 
       puts # Make newline
-      system command # Util.system! would reset the Firefox PATH
+      system command # Util.run! would reset the Firefox PATH
     end
 
     def launch_vnc_viewer
@@ -74,7 +74,7 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
-      [use_firefox_for_selenium, Util.binstub('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
+      [use_firefox_for_selenium, Util.binstub_or_fallback('cucumber'), format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command

data/lib/geordi/dump_loader.rb

@@ -57,7 +57,7 @@ module Geordi
       Interaction.note 'Source file: ' + dump_file
 
       source_command = send("#{config['adapter']}_command")
-      Util.system! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
+      Util.run! source_command, fail_message: "An error occured loading #{File.basename(dump_file)}"
     end
 
   end

data/lib/geordi/gitpt.rb

@@ -89,7 +89,7 @@ No staged changes. Will create an empty commit.
     extra = highline.ask("\nAdd an optional message").strip
     message << ' - ' << extra if extra != ''
 
-    Geordi::Util.system! 'git', 'commit', '--allow-empty', '-m', message, *git_args
+    Geordi::Util.run!(['git', 'commit', '--allow-empty', '-m', message, *git_args])
   end
 
   def bold(string)

data/lib/geordi/interaction.rb

@@ -24,7 +24,7 @@ module Geordi
     end
 
     # Like `note`, but pink. Use to print (bash) commands.
-    # Also see Util.system!
+    # Also see Util.run!
     def note_cmd(text)
       message = "> #{text}"
       puts "\e[35m#{message}\e[0m" # pink

data/lib/geordi/remote.rb

@@ -31,9 +31,10 @@ module Geordi
     end
 
     def dump(options = {})
+      database = options[:database] ? " #{options[:database]}" : ''
       # Generate dump on the server
       shell options.merge({
-        remote_command: "dumple #{@config.env} --for_download",
+        remote_command: "dumple #{@config.env}#{database} --for_download",
       })
 
       destination_directory = File.join(@config.root, 'tmp')
@@ -43,9 +44,9 @@ module Geordi
 
       Interaction.note "Downloading remote dump to #{relative_destination} ..."
       server = @config.primary_server
-      Util.system! "scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}"
+      Util.run!("scp -C #{@config.user(server)}@#{server}:#{REMOTE_DUMP_PATH} #{destination_path}")
 
-      Interaction.success "Dumped the #{@stage} database to #{relative_destination}."
+      Interaction.success "Dumped the#{database} #{@stage} database to #{relative_destination}."
 
       destination_path
     end
@@ -74,7 +75,7 @@ module Geordi
       remote_command << " -c '#{options[:remote_command]}'" if options[:remote_command]
 
       Interaction.note 'Connecting to ' + server.to_s
-      Util.system! 'ssh', "#{@config.user(server)}@#{server}", '-t', remote_command
+      Util.run!(['ssh', "#{@config.user(server)}@#{server}", '-t', remote_command])
     end
 
   end

data/lib/geordi/settings.rb

@@ -8,7 +8,7 @@ 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 ].freeze
+    ALLOWED_GLOBAL_SETTINGS = %w[ pivotal_tracker_api_key auto_update_chromedriver ].freeze
     ALLOWED_LOCAL_SETTINGS = %w[ use_vnc pivotal_tracker_project_ids ].freeze
 
     def initialize
@@ -25,6 +25,15 @@ module Geordi
       save_global_settings
     end
 
+    def auto_update_chromedriver
+      @global_settings["auto_update_chromedriver"] || false
+    end
+
+    def auto_update_chromedriver=(value)
+      @global_settings['auto_update_chromedriver'] = value
+      save_global_settings
+    end
+
     # Local settings
     # They should not be changed by geordi to avoid unexpected diffs, therefore
     # there are no setters for these settings
@@ -129,7 +138,7 @@ module Geordi
     def inquire_pt_api_key
       Geordi::Interaction.warn 'Your settings are missing or invalid.'
       Geordi::Interaction.warn "Please configure your Pivotal Tracker access."
-      token = Geordi::Interaction.prompt 'Your API key:'
+      token = Geordi::Interaction.prompt('Your API key:').to_s # Just be sure
       self.pivotal_tracker_api_key = token
       puts
 

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.')
-        system! install_command, show_cmd: true
+        Util.run!(install_command, show_cmd: true)
 
         # retry
         Gem.clear_paths
@@ -33,50 +33,62 @@ module Geordi
       # Run a command with a clean environment.
       # Print an error message and exit if the command fails.
       #
-      # @option show_cmd: Whether to print the command
-      # @option confirm: Whether to ask for confirmation before running it
-      # @option fail_message: The text to print on command failure
-      def system!(*commands)
-        options = commands.last.is_a?(Hash) ? commands.pop : {}
-        Interaction.note_cmd commands.join(' ') if options[:show_cmd]
-
-        if options[:confirm]
+      # 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.')
+        # 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.
+        if command.is_a?(Array)
+          real_command, *arguments = *command
+          command = [real_command.split(' '), arguments].flatten
+          show_command = command
+        else
+          show_command = [command]
+        end
+
+        if show_cmd
+          # Join with spaces for better readability and copy-pasting
+          Interaction.note_cmd show_command.join(' ')
+        end
+
+        if confirm
           Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
         end
 
         if testing?
-          puts "Util.system! #{commands.join ', '}"
+          # Join with commas for precise argument distinction
+          puts "Util.run! #{show_command.join(', ')}"
         else
           # Remove Geordi's Bundler environment when running commands.
           success = if !defined?(Bundler)
-            system(*commands)
+            system(*command)
           elsif Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.1.2')
             Bundler.with_original_env do
-              system(*commands)
+              system(*command)
             end
           else
-            Bundler.clean_system(*commands)
+            Bundler.clean_system(*command)
           end
 
-          success || Interaction.fail(options[:fail_message] || 'Something went wrong.')
+          success || Interaction.fail(fail_message)
         end
       end
 
-      def binstub(executable, *arguments)
+      def binstub_or_fallback(executable)
         binstub_file = "bin/#{executable}"
 
-        command = File.exists?(binstub_file) ? [binstub_file] : ['bundle exec', executable]
-        command.push(*arguments)
-        command.join(' ')
+        File.exists?(binstub_file) ? binstub_file : "bundle exec #{executable}"
       end
 
       def console_command(environment)
         if gem_major_version('rails') == 2
           'script/console ' + environment
         elsif gem_major_version('rails') == 3
-          binstub 'rails', 'console', environment
+          "#{binstub_or_fallback('rails')} console #{environment}"
         else
-          binstub 'rails', 'console -e', environment
+          "#{binstub_or_fallback('rails')} console -e #{environment}"
         end
       end
 
@@ -84,7 +96,7 @@ module Geordi
         if gem_major_version('rails') == 2
           'script/server ""'
         else
-          binstub 'rails', 'server'
+          "#{binstub_or_fallback('rails')} server"
         end
       end
 

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -97,13 +97,13 @@ files:
 - lib/geordi/settings.rb
 - lib/geordi/util.rb
 - lib/geordi/version.rb
-homepage: http://makandra.com
+homepage: https://makandra.com
 licenses:
 - MIT
 metadata: {}
 post_install_message: |
   * Binary `geordi` installed
-  * Geordi 4.0.0 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
+  * Geordi 4 has removed its deprecated executables. If you want to invoke these commands like before, you may create aliases on your machine. For the alias mapping, please refer to https://github.com/makandra/geordi/commit/68fa92acb146ebde3acb92d7b9556bd4eaa2b4ff
 rdoc_options: []
 require_paths:
 - lib