geordi 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcd8074a50a0c81d4e0b7e2beaef07e8508018a494ae9b3cc288bb29c0b9e796
-  data.tar.gz: a8091353e0d315e6e37f93227688a89d74b7b01abcf4d4a4339271aaaf65e50a
+  metadata.gz: 6526d69319548d39cfe259c4c62788ae997bffec2d305f5bd8ee63bef9a5e12e
+  data.tar.gz: e19060563af6fad488e1521aa3574c36499ff74dfca2e782283a35ca34f7301f
 SHA512:
-  metadata.gz: b6147e0cbddbcba812f1ea87f03544c0cefd6f40f766b6971275ec5c8efb25f307d47623508bb2990b7cdbd88ed540c51de51920faa59236e5a2034b2cfa9d68
-  data.tar.gz: '078962b0bac78764315e54f2f104354966cc775f18bd9a6d514069c8972bcf3dd4c96cb8b58e0ddf42b233032c12c7d00eb3af24b67970548bb297915d7394b7'
+  metadata.gz: 429dc10291a955e101c6ba802475d2daef6a05eaad3c5e6737853194bc4565797d86820c2b20bc97ad387b5eeebeb4bfdec4651c99f12bc325c75a9ed6eece54
+  data.tar.gz: 2196c5fb48bbc1365fbf2731441d0fac73a57944414a99a97b61f4cbff6c95ab551346ebb418c844f89ea21c96182e66110d9b842405ceaf6e1119c8c10e928a

data/CHANGELOG.md

@@ -11,6 +11,13 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ### Breaking changes
 
 
+## 3.0.1 2020-05-13
+
+### Compatible changes
+- Fix #93: Using `$CHILDSTATUS` instead of `$?` did not work properly. This affected commands like `geordi drop-databases` to fail.
+- Fix #92: Geordi fail messages were converted to exceptions by accident. Now they are printed as red error message without the backtrace again.
+
+
 ## 3.0.0 2020-05-04
 
 ### Compatible changes

data/Gemfile.lock

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

data/lib/geordi/COMMAND_TEMPLATE

@@ -21,10 +21,9 @@ def example
   # Invoke other commands like this:
   invoke_cmd 'other_command', 'argument', an: 'option'
 
-  fail 'Option missing' unless options.opt?
+  Interaction.fail 'Option missing' unless options.opt?
 
-  # For formatted output, see geordi/interaction.rb
-  success 'Done.'
+  Interaction.success 'Done.'
 end
 
 # Command mappings, usually not needed

data/lib/geordi/chromedriver_updater.rb

@@ -4,14 +4,13 @@ require 'tempfile'
 
 module Geordi
   class ChromedriverUpdater
-    include Geordi::Interaction
 
     def run
       chrome_version = determine_chrome_version
       chromedriver_version = determine_chromedriver_version
 
       if skip_update?(chrome_version, chromedriver_version)
-        warn("No update required, you are using for both executables the same version #{chrome_version}!")
+        Interaction.warn("No update required, you are using for both executables the same version #{chrome_version}!")
       else
         chromedriver_zip = download_chromedriver(chrome_version)
         unzip(chromedriver_zip, File.expand_path('~/bin'))
@@ -19,7 +18,7 @@ module Geordi
         chromedriver_zip.unlink
 
         # We need to determine the version again, as it could be nil in case no chromedriver was installed before
-        note "Chromedriver updated to version #{determine_chromedriver_version}"
+        Interaction.note "Chromedriver updated to version #{determine_chromedriver_version}"
       end
     end
 
@@ -32,7 +31,7 @@ module Geordi
       end
 
       if !status.success? || chrome_version.nil?
-        raise('Could not determine the current Google Chrome version')
+        Interaction.fail('Could not determine the current Google Chrome version')
       else
         chrome_version.to_i
       end
@@ -47,7 +46,7 @@ module Geordi
       end
 
       if !status.success? || chromedriver_version.nil?
-        raise('Could not determine the current chromedriver version')
+        Interaction.fail('Could not determine the current chromedriver version')
       else
         chromedriver_version.to_i
       end
@@ -69,7 +68,7 @@ module Geordi
 
         file
       else
-        raise("Could not download chromedriver version #{latest_version}")
+        Interaction.fail("Could not download chromedriver version #{latest_version}")
       end
     end
 
@@ -80,7 +79,7 @@ module Geordi
       if response.is_a?(Net::HTTPSuccess)
         response.body.to_s
       else
-        raise("Could not find the latest version for Google Chrome version #{chrome_version}")
+        Interaction.fail("Could not find the latest version for Google Chrome version #{chrome_version}")
       end
     end
 
@@ -88,7 +87,7 @@ module Geordi
       _stdout_str, _error_str, status = Open3.capture3('unzip', '-d', output_dir, '-o', zip.path)
 
       unless status.success?
-        raise("Could not unzip #{zip.path}")
+        Interaction.fail("Could not unzip #{zip.path}")
       end
     end
   end

data/lib/geordi/cli.rb

@@ -5,7 +5,6 @@ require 'geordi/util'
 
 module Geordi
   class CLI < Thor
-    include Geordi::Interaction
 
     def self.exit_on_failure?
       true

data/lib/geordi/commands/_setup_vnc.rb

@@ -2,33 +2,33 @@ desc '-setup-vnc', 'Setup VNC for running Selenium tests there', hide: true
 def _setup_vnc
   `clear`
 
-  note 'This script will help you install a VNC server and a VNC viewer.'
+  Interaction.note 'This script will help you install a VNC server and a VNC viewer.'
   puts
-  puts strip_heredoc <<-TEXT
+  puts Util.strip_heredoc <<-TEXT
     With those you will be able to use our cucumber script without being
     disturbed by focus-stealing Selenium windows. Instead, they will open
     inside a VNC session.
 
     You can still inspect everything with:
   TEXT
-  note_cmd 'geordi vnc'
+  Interaction.note_cmd 'geordi vnc'
   puts
-  note 'Please open a second shell to execute instructions.'
-  prompt 'Continue ...'
+  Interaction.note 'Please open a second shell to execute instructions.'
+  Interaction.prompt 'Continue ...'
 
-  announce 'Setup VNC server'
+  Interaction.announce 'Setup VNC server'
 
   vnc_server_installed = system('which vncserver > /dev/null 2>&1')
   if vnc_server_installed
-    success 'It appears you already have a VNC server installed. Good job!'
+    Interaction.success 'It appears you already have a VNC server installed. Good job!'
   else
     puts 'Please run:'
-    note_cmd 'sudo apt-get install vnc4server'
-    prompt 'Continue ...'
+    Interaction.note_cmd 'sudo apt-get install vnc4server'
+    Interaction.prompt 'Continue ...'
 
     puts
-    note 'We will now set a password for your VNC server.'
-    puts strip_heredoc <<-TEXT
+    Interaction.note 'We will now set a password for your VNC server.'
+    puts Util.strip_heredoc <<-TEXT
       When running our cucumber script, you will not actually need this
       password, and there is no security risk. However, if you start a vncserver
       without our cucumber script, a user with your password can connect to
@@ -36,31 +36,31 @@ def _setup_vnc
 
     TEXT
     puts 'Please run:'
-    note_cmd 'vncserver :20'
-    warn 'Enter a secure password!'
-    prompt 'Continue ...'
+    Interaction.note_cmd 'vncserver :20'
+    Interaction.warn 'Enter a secure password!'
+    Interaction.prompt 'Continue ...'
 
     puts 'Now stop the server again. Please run:'
-    note_cmd 'vncserver -kill :20'
-    prompt 'Continue ...'
+    Interaction.note_cmd 'vncserver -kill :20'
+    Interaction.prompt 'Continue ...'
   end
 
-  announce 'Setup VNC viewer'
+  Interaction.announce 'Setup VNC viewer'
 
   vnc_viewer_installed = system('which vncviewer > /dev/null 2>&1')
   if vnc_viewer_installed
-    success 'It appears you already have a VNC viewer installed. Good job!'
+    Interaction.success 'It appears you already have a VNC viewer installed. Good job!'
   else
     puts 'Please run:'
-    note_cmd 'sudo apt-get install xtightvncviewer'
-    prompt 'Continue ...'
+    Interaction.note_cmd 'sudo apt-get install xtightvncviewer'
+    Interaction.prompt 'Continue ...'
   end
 
   puts
-  puts strip_heredoc <<-TEXT
+  puts Util.strip_heredoc <<-TEXT
     All done. Our cucumber script will now automatically run Selenium features
     in VNC.
   TEXT
 
-  success 'Happy cuking!'
+  Interaction.success 'Happy cuking!'
 end

data/lib/geordi/commands/bundle_install.rb

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

data/lib/geordi/commands/capistrano.rb

@@ -6,16 +6,16 @@ LONGDESC
 def capistrano(*args)
   targets = Dir['config/deploy/*.rb'].map { |file| File.basename(file, '.rb') }.sort
 
-  note 'Found the following deploy targets:'
+  Interaction.note 'Found the following deploy targets:'
   puts targets
-  prompt('Continue?', 'n', /y|yes/) || raise('Cancelled.')
+  Interaction.prompt('Continue?', 'n', /y|yes/) || Interaction.fail('Cancelled.')
 
   targets << nil if targets.empty? # default target
   targets.each do |stage|
-    announce 'Target: ' + (stage || '(default)')
+    Interaction.announce 'Target: ' + (stage || '(default)')
 
     command = "bundle exec cap #{stage} " + args.join(' ')
-    note_cmd command
+    Interaction.note_cmd command
 
     Util.system!(command, fail_message: 'Capistrano failed. Have a look!')
   end

data/lib/geordi/commands/clean.rb

@@ -1,14 +1,15 @@
 desc 'clean', 'Remove unneeded files from the current directory'
 def clean
-  announce 'Removing tempfiles'
-  %w[webrat-* capybara-* tmp/webrat-* tmp/capybara-* tmp/rtex/* log/*.log].each do |pattern|
-    note pattern
+
+  Interaction.announce 'Removing tempfiles'
+  for pattern in %w[ webrat-* capybara-* tmp/webrat-* tmp/capybara-* tmp/rtex/* log/*.log ]
+    Interaction.note pattern
     puts `rm -vfR #{pattern}`
   end
 
-  announce 'Finding recursively and removing backup files'
+  Interaction.announce 'Finding recursively and removing backup files'
   %w[*~].each do |pattern|
-    note pattern
+    Interaction.note pattern
     `find . -name #{pattern} -exec rm {} ';'`
   end
 end

data/lib/geordi/commands/console.rb

@@ -14,11 +14,11 @@ def console(target = 'development', *_args)
   if target == 'development'
     invoke_cmd 'yarn_install'
 
-    announce 'Opening a local Rails console'
+    Interaction.announce 'Opening a local Rails console'
 
     Util.system! Util.console_command(target)
   else
-    announce 'Opening a Rails console on ' + target
+    Interaction.announce 'Opening a Rails console on ' + target
 
     Geordi::Remote.new(target).console(options)
   end

data/lib/geordi/commands/create_database_yml.rb

@@ -4,7 +4,7 @@ def create_database_yml
   sample_yml = 'config/database.sample.yml'
 
   if File.exist?(sample_yml) && !File.exist?(real_yml)
-    announce 'Creating ' + real_yml
+    Interaction.announce 'Creating ' + real_yml
 
     sample = File.read(sample_yml)
     adapter = sample.match(/adapter: (\w+)\n/).captures.first
@@ -15,6 +15,6 @@ def create_database_yml
     real = sample.gsub(/password:.*$/, "password: #{db_password}")
     File.open(real_yml, 'w') { |f| f.write(real) }
 
-    note "Created #{real_yml}."
+    Interaction.note "Created #{real_yml}."
   end
 end

data/lib/geordi/commands/create_databases.rb

@@ -3,7 +3,7 @@ def create_databases
   invoke_cmd 'create_database_yml'
   invoke_cmd 'bundle_install'
 
-  announce 'Creating databases'
+  Interaction.announce 'Creating databases'
 
   if File.exist?('config/database.yml')
     command = 'bundle exec rake db:create:all'

data/lib/geordi/commands/cucumber.rb

@@ -56,7 +56,7 @@ def cucumber(*args)
 
     # Serial run of @solo scenarios ############################################
     if files.any? { |f| f.include? ':' }
-      note '@solo run skipped when called with line numbers' if options.verbose
+      Interaction.note '@solo run skipped when called with line numbers' if options.verbose
     else
       solo_files = if files.empty?
         'features' # Proper grepping
@@ -70,14 +70,14 @@ def cucumber(*args)
         solo_cmd_opts = cmd_opts.dup
         solo_cmd_opts << '--tags' << '@solo'
 
-        announce 'Running @solo features'
+        Interaction.announce 'Running @solo features'
         solo_success = Geordi::Cucumber.new.run files, solo_cmd_opts, verbose: options.verbose, parallel: false
-        solo_success || raise('Features failed.')
+        solo_success || Interaction.fail('Features failed.')
       end
     end
 
     # Parallel run of all given features + reruns ##############################
-    announce 'Running features'
+    Interaction.announce 'Running features'
     normal_run_successful = Geordi::Cucumber.new.run(files, cmd_opts, verbose: options.verbose)
 
     unless normal_run_successful
@@ -85,16 +85,16 @@ def cucumber(*args)
 
       # Reruns
       (options.rerun + 1).times do |i|
-        raise 'Features failed.' if i == options.rerun # All reruns done?
+        Interaction.fail 'Features failed.' if i == options.rerun # All reruns done?
 
-        announce "Rerun ##{i + 1} of #{options.rerun}"
+        Interaction.announce "Rerun ##{i + 1} of #{options.rerun}"
         break if Geordi::Cucumber.new.run([], cmd_opts, verbose: options.verbose, parallel: false)
       end
     end
 
-    success 'Features green.'
+    Interaction.success 'Features green.'
 
   else
-    note 'Cucumber not employed.'
+    Interaction.note 'Cucumber not employed.'
   end
 end

data/lib/geordi/commands/delete_dumps.rb

@@ -20,24 +20,24 @@ def delete_dumps(dump_directory = nil)
   else
     [dump_directory]
   end
-  announce 'Looking for *.dump in ' << dump_directories.join(',')
+  Interaction.announce 'Looking for *.dump in ' << dump_directories.join(',')
   dump_directories.each do |d|
     d_2 = File.expand_path(d)
     unless File.directory? File.realdirpath(d_2)
-      warn "Directory #{d_2} does not exist"
+      Interaction.warn "Directory #{d_2} does not exist"
       next
     end
     deletable_dumps.concat(Dir.glob("#{d_2}/**/*.dump"))
   end
   if deletable_dumps.empty?
-    success 'No dumps to delete' if deletable_dumps.empty?
+    Interaction.success 'No dumps to delete' if deletable_dumps.empty?
     exit 0
   end
   deletable_dumps.uniq!.sort!
-  note 'The following dumps can be deleted:'
+  Interaction.note 'The following dumps can be deleted:'
   puts
   puts deletable_dumps
-  prompt('Delete those dumps', 'n', /y|yes/) || raise('Cancelled.')
+  Interaction.prompt('Delete those dumps', 'n', /y|yes/) || raise('Cancelled.')
   deletable_dumps.each do |dump|
     File.delete dump unless File.directory? dump
   end

data/lib/geordi/commands/deploy.rb

@@ -41,14 +41,14 @@ def deploy(target_stage = nil)
   if target_stage && (Util.deploy_targets.exclude? target_stage)
     # Target stage autocompletion from available stages
     target_stage = Util.deploy_targets.find { |t| t.start_with? target_stage }
-    target_stage || warn('Given deployment stage not found')
+    target_stage || Interaction.warn('Given deployment stage not found')
   end
 
   # Ask for required information
-  target_stage ||= prompt 'Deployment stage:', branch_stage_map.fetch(Util.current_branch, 'staging')
+  target_stage ||= Interaction.prompt 'Deployment stage:', branch_stage_map.fetch(Util.current_branch, 'staging')
   if options.current_branch
     stage_file = "config/deploy/#{target_stage}.rb"
-    Util.file_containing?(stage_file, 'DEPLOY_BRANCH') || raise(<<-ERROR)
+    Util.file_containing?(stage_file, 'DEPLOY_BRANCH') || Interaction.fail(<<-ERROR)
 To deploy from the current branch, configure #{stage_file} to respect the
 environment variable DEPLOY_BRANCH. Example:
 
@@ -57,38 +57,38 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
 
     source_branch = target_branch = Util.current_branch
   else
-    source_branch = prompt 'Source branch:', Util.current_branch
-    target_branch = prompt 'Deploy branch:', branch_stage_map.invert.fetch(target_stage, 'master')
+    source_branch = Interaction.prompt 'Source branch:', Util.current_branch
+    target_branch = Interaction.prompt 'Deploy branch:', branch_stage_map.invert.fetch(target_stage, 'master')
   end
 
   merge_needed = (source_branch != target_branch)
   push_needed = merge_needed || `git cherry -v | wc -l`.strip.to_i > 0
   push_needed = false if Util.testing? # Hard to test
 
-  announce "Checking whether your #{source_branch} branch is ready" ############
+  Interaction.announce "Checking whether your #{source_branch} branch is ready" ############
   Util.system! "git checkout #{source_branch}"
   if (`git status -s | wc -l`.strip != '0') && !Util.testing?
-    warn "Your #{source_branch} branch holds uncommitted changes."
-    prompt('Continue anyway?', 'n', /y|yes/) || raise('Cancelled.')
+    Interaction.warn "Your #{source_branch} branch holds uncommitted changes."
+    Interaction.prompt('Continue anyway?', 'n', /y|yes/) || raise('Cancelled.')
   else
-    note 'All good.'
+    Interaction.note 'All good.'
   end
 
   if merge_needed
-    announce "Checking what's in your #{target_branch} branch right now" #######
+    Interaction.announce "Checking what's in your #{target_branch} branch right now" #######
     Util.system! "git checkout #{target_branch} && git pull"
   end
 
-  announce 'You are about to:' #################################################
-  note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
+  Interaction.announce 'You are about to:' #################################################
+  Interaction.note "Merge branch #{source_branch} into #{target_branch}" if merge_needed
   if push_needed
-    note 'Push these commits:' if push_needed
+    Interaction.note 'Push these commits:' if push_needed
     Util.system! "git --no-pager log origin/#{target_branch}..#{source_branch} --oneline"
   end
-  note "Deploy to #{target_stage}"
-  note "From current branch #{source_branch}" if options.current_branch
+  Interaction.note "Deploy to #{target_stage}"
+  Interaction.note "From current branch #{source_branch}" if options.current_branch
 
-  if prompt('Go ahead with the deployment?', 'n', /y|yes/)
+  if Interaction.prompt('Go ahead with the deployment?', 'n', /y|yes/)
     puts
     git_call = []
     git_call << "git merge #{source_branch}" if merge_needed
@@ -107,9 +107,9 @@ set :branch, ENV['DEPLOY_BRANCH'] || 'master'
 
     Util.system! capistrano_call, show_cmd: true
 
-    success 'Deployment complete.'
+    Interaction.success 'Deployment complete.'
   else
     Util.system! "git checkout #{source_branch}"
-    raise 'Deployment cancelled.'
+    Interaction.fail 'Deployment cancelled.'
   end
 end

data/lib/geordi/commands/drop_databases.rb

@@ -28,7 +28,7 @@ option :mysql, banner: 'PORT_OR_SOCKET',
 
 def drop_databases
   require 'geordi/db_cleaner'
-  raise '-P and -M are mutually exclusive' if options.postgres_only && options.mysql_only
+  Interaction.fail '-P and -M are mutually exclusive' if options.postgres_only && options.mysql_only
   mysql_flags = nil
   postgres_flags = nil
 
@@ -38,7 +38,7 @@ def drop_databases
       mysql_flags = "--port=#{mysql_port} --protocol=TCP"
     rescue AttributeError
       unless File.exist? options.mysql
-        raise "Path #{options.mysql} is not a valid MySQL socket"
+        Interaction.fail "Path #{options.mysql} is not a valid MySQL socket"
       end
       mysql_flags = "--socket=#{options.mysql}"
     end
@@ -54,5 +54,5 @@ def drop_databases
   cleaner.clean_mysql unless options.postgres_only
   cleaner.clean_postgres unless options.mysql_only
 
-  success 'Done.'
+  Interaction.success 'Done.'
 end

data/lib/geordi/commands/dump.rb

@@ -30,33 +30,33 @@ def dump(target = nil, *_args)
   if target.nil?
     if options.load
       # validate load option
-      raise 'Missing a dump file.' if options.load == 'load'
+      Interaction.fail 'Missing a dump file.' if options.load == 'load'
       File.exist?(options.load) || raise('Could not find the given dump file: ' + options.load)
 
       loader = DumpLoader.new(options.load)
 
-      announce "Sourcing dump into the #{loader.config['database']} db"
+      Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
 
-      success "Your #{loader.config['database']} database has now the data of #{options.load}."
+      Interaction.success "Your #{loader.config['database']} database has now the data of #{options.load}."
 
     else
-      announce 'Dumping the development database'
+      Interaction.announce 'Dumping the development database'
       Util.system! 'dumple development'
-      success 'Successfully dumped the development database.'
+      Interaction.success 'Successfully dumped the development database.'
     end
 
   else
-    announce 'Dumping the database of ' + target
+    Interaction.announce 'Dumping the database of ' + target
     dump_path = Geordi::Remote.new(target).dump(options)
 
     if options.load
       loader = DumpLoader.new(dump_path)
 
-      announce "Sourcing dump into the #{loader.config['database']} db"
+      Interaction.announce "Sourcing dump into the #{loader.config['database']} db"
       loader.load
 
-      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}."
     end
   end
 end

data/lib/geordi/commands/firefox.rb

@@ -15,7 +15,7 @@ option :setup, banner: 'FIREFOX_VERSION',
 
 def firefox(*command)
   if options.setup
-    raise 'Firefox version required (e.g. --setup 24.0)' if options.setup == 'setup'
+    Interaction.fail 'Firefox version required (e.g. --setup 24.0)' if options.setup == 'setup'
 
     require 'geordi/firefox_for_selenium'
     Geordi::FirefoxForSelenium.install(options.setup)
@@ -27,7 +27,7 @@ def firefox(*command)
     FirefoxForSelenium.setup_firefox
 
     puts
-    note_cmd command.join(' ')
+    Interaction.note_cmd command.join(' ')
     system *command # Util.system! would reset the Firefox PATH
   end
 end

data/lib/geordi/commands/migrate.rb

@@ -10,11 +10,11 @@ LONGDESC
 def migrate
   invoke_cmd 'bundle_install'
   invoke_cmd 'yarn_install'
-  announce 'Migrating'
+  Interaction.announce 'Migrating'
 
   if File.directory?('db/migrate')
     if Util.file_containing?('Gemfile', /parallel_tests/)
-      note 'Development and parallel test databases'
+      Interaction.note 'Development and parallel test databases'
       puts
 
       Util.system! 'bundle exec rake db:migrate parallel:prepare'
@@ -22,6 +22,6 @@ def migrate
       invoke_cmd 'rake', 'db:migrate'
     end
   else
-    note 'No migrations directory found.'
+    Interaction.note 'No migrations directory found.'
   end
 end

data/lib/geordi/commands/png_optimize.rb

@@ -10,10 +10,10 @@ LONGDESC
 def png_optimize(path)
   require 'fileutils'
 
-  announce 'Optimizing .png files'
+  Interaction.announce 'Optimizing .png files'
 
   if `which pngcrush`.strip.empty?
-    raise 'Please install pngcrush first (sudo apt-get install pngcrush)'
+    Interaction.fail 'Please install pngcrush first (sudo apt-get install pngcrush)'
   end
 
   po = PngOptimizer.new
@@ -22,10 +22,10 @@ def png_optimize(path)
   elsif File.file?(path)
     po.optimize_inplace(path)
   else
-    raise 'Neither directory nor file: ' + path
+    Interaction.fail 'Neither directory nor file: ' + path
   end
 
-  success 'PNG optimization completed.'
+  Interaction.success 'PNG optimization completed.'
 end
 
 class PngOptimizer
@@ -64,7 +64,7 @@ class PngOptimizer
       FileUtils.rm(input_file)
       FileUtils.mv(temp_file.to_s, input_file.to_s)
     else
-      raise 'Error:' + $CHILD_STATUS
+      Interaction.fail 'Error:' + $?
     end
   end
 

data/lib/geordi/commands/rake.rb

@@ -13,7 +13,7 @@ def rake(*args)
   %w[development test cucumber].each do |env| # update long_desc when changing this
     if File.exist? "config/environments/#{env}.rb"
       call = %w[bundle exec rake] + args + ["RAILS_ENV=#{env}"]
-      note_cmd call.join(' ')
+      Interaction.note_cmd call.join(' ')
 
       Util.system! *call
     end

data/lib/geordi/commands/remove_executable_flags.rb

@@ -1,13 +1,13 @@
 desc 'remove-executable-flags', 'Remove executable-flags from files that should not be executable'
 def remove_executable_flags
-  announce 'Removing executable-flags'
+  Interaction.announce 'Removing executable-flags'
 
   patterns = %w[
     *.rb *.html *.erb *.haml *.yml *.css *.sass *.rake *.png *.jpg
     *.gif *.pdf *.txt *.rdoc *.feature Rakefile VERSION README Capfile
   ]
   patterns.each do |pattern|
-    note pattern
+    Interaction.note pattern
     `find . -name "#{pattern}" -exec chmod -x {} ';'`
   end
   puts 'Done.'