geordi 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69ce9156f933f0ae381e109b7359fe4da6243036028093ab9ce0f79408bfaad
-  data.tar.gz: d6d16d8a1aca0fecc4669aa0b28251c508574f7d4d5ba3fae5d82d92385894fd
+  metadata.gz: 2af11b387f28e87fc2cb89172b1ea8fdcd87dc4bc62697c18ba4a7cc8ddada28
+  data.tar.gz: c0612fe6e8f266a3b5e5a467018b5f6e484224944057ddd323c9162a0b64d858
 SHA512:
-  metadata.gz: 8d514a744b90c1d637a91db63ca3c58a36262e3493844a268eea48c920779f98ead441eeff42a9d544e0b0feb6baeb0d9314906531c1b9c3955bbb0758b2e316
-  data.tar.gz: c75477cfb8ffb09895f1b6214ef762218e85b831adb4348ea58ed4cae6dd70a213feb7e2df3dc0740a97b0e70394be4878abeff57fb4aefd47a50eed7af5f10d
+  metadata.gz: e96089335890efaf9e8ea9a0cabea1c4a6447e363513f61fa2e2fe55f43637ca24906fd3732fd3eb0b5adb752bd2a752a263a0be772bedba1b7115e69425b5d2
+  data.tar.gz: bad860e3b8a14d06970351213fda638e2b853dfbf107ea6b6f4e018cd2ecdbb767848a2ebdec34757f3c5a9d47e8a2a3181ac40c729b1b3a9cbb26e62aaf1613

data/CHANGELOG.md

@@ -9,6 +9,32 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 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

data/Gemfile.lock

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

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/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/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_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

@@ -53,8 +53,8 @@ def cucumber(*args)
   if File.directory?('features')
     require 'geordi/cucumber'
 
-    invoke_cmd 'bundle_install'
-    invoke_cmd 'yarn_install'
+    invoke_geordi 'bundle_install'
+    invoke_geordi 'yarn_install'
 
     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

@@ -33,7 +33,7 @@ def dump(target = nil, *_args)
 
     else
       Interaction.announce 'Dumping the development database'
-      Util.system! 'dumple development'
+      Util.run!('dumple development')
       Interaction.success 'Successfully dumped the development database.'
     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

@@ -43,7 +43,7 @@ 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}."
 
@@ -74,7 +74,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/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,60 @@ 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
+          printable_command = command.join(', ')
+        else
+          printable_command = command
+        end
+
+        if show_cmd
+          Interaction.note_cmd printable_command
+        end
+
+        if confirm
           Interaction.prompt('Run this now?', 'n', /y|yes/) or Interaction.fail('Cancelled.')
         end
 
         if testing?
-          puts "Util.system! #{commands.join ', '}"
+          puts "Util.run! #{printable_command}"
         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 +94,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.1.0'.freeze
+  VERSION = '4.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails