geordi 4.1.0 → 5.1.0

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/commit.rb

@@ -9,10 +9,6 @@ stored in `~/.config/geordi/global.yml`.
 LONGDESC
 
 def commit(*git_args)
-  raise <<-TEXT if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1')
-Unsupported Ruby Version #{RUBY_VERSION}. `geordi commit` requires Ruby 2.1+.
-  TEXT
-
   require 'geordi/gitpt'
   Gitpt.new.run(git_args)
 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.'