geordi 2.11.0 → 3.1.0

data/lib/geordi/commands/delete_dumps.rb

@@ -12,32 +12,32 @@ LONGDESC
 
 def delete_dumps(dump_directory = nil)
   deletable_dumps = []
-  if dump_directory.nil?
-    dump_directories = [
+  dump_directories = if dump_directory.nil?
+    [
       File.join(Dir.home, 'dumps'),
-      Dir.pwd
+      Dir.pwd,
     ]
   else
-    dump_directories = [dump_directory]
+    [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|
-    d2 = File.expand_path(d)
-    unless File.directory? File.realdirpath(d2)
-      warn "Directory #{d2} does not exist"
+    d_2 = File.expand_path(d)
+    unless File.directory? File.realdirpath(d_2)
+      Interaction.warn "Directory #{d_2} does not exist"
       next
     end
-    deletable_dumps.concat(Dir.glob("#{d2}/**/*.dump"))
+    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/ or fail '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

@@ -30,25 +30,25 @@ instead of `cap deploy:migrations`. You can force using `deploy` by passing the
 -M option: `geordi deploy -M staging`.
 LONGDESC
 
-option :no_migrations, :aliases => '-M', :type => :boolean,
-  :desc => 'Run cap deploy instead of cap deploy:migrations'
-option :current_branch, :aliases => '-c', :type => :boolean,
-  :desc => 'Set DEPLOY_BRANCH to the current branch during deploy'
+option :no_migrations, aliases: '-M', type: :boolean,
+  desc: 'Run cap deploy instead of cap deploy:migrations'
+option :current_branch, aliases: '-c', type: :boolean,
+  desc: 'Set DEPLOY_BRANCH to the current branch during deploy'
 
 def deploy(target_stage = nil)
   # Set/Infer default values
-  branch_stage_map = { 'master' => 'staging', 'production' => 'production'}
-  if target_stage and not Util.deploy_targets.include? target_stage
+  branch_stage_map = { 'master' => 'staging', 'production' => 'production' }
+  if target_stage && !Util.deploy_targets.include?(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' or fail <<-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' and not Util.testing?
-    warn "Your #{source_branch} branch holds uncommitted changes."
-    prompt('Continue anyway?', 'n', /y|yes/) or fail 'Cancelled.'
+  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.')
   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
@@ -100,17 +100,16 @@ 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.system! git_call.join(' && '), show_cmd: true
     end
 
     invoke_cmd 'bundle_install'
 
-    Util.system! capistrano_call, :show_cmd => true
+    Util.system! capistrano_call, show_cmd: true
 
-    success 'Deployment complete.'
+    Interaction.success 'Deployment complete.'
   else
     Util.system! "git checkout #{source_branch}"
-    fail 'Deployment cancelled.'
+    Interaction.fail 'Deployment cancelled.'
   end
-
 end

data/lib/geordi/commands/drop_databases.rb

@@ -17,18 +17,18 @@ Geordi will ask for confirmation before actually dropping databases and will
 offer to edit the whitelist instead.
 LONGDESC
 
-option :postgres_only, :aliases => '-P', :type => :boolean,
-  :desc => 'Only clean Postgres', :default => false
-option :mysql_only, :aliases => '-M', :type => :boolean,
-  :desc => 'Only clean MySQL/MariaDB', :default => false
-option :postgres, :banner => 'PORT_OR_SOCKET',
-  :desc => 'Use Postgres port or socket'
-option :mysql, :banner => 'PORT_OR_SOCKET',
-  :desc => 'Use MySQL/MariaDB port or socket'
+option :postgres_only, aliases: '-P', type: :boolean,
+  desc: 'Only clean Postgres', default: false
+option :mysql_only, aliases: '-M', type: :boolean,
+  desc: 'Only clean MySQL/MariaDB', default: false
+option :postgres, banner: 'PORT_OR_SOCKET',
+  desc: 'Use Postgres port or socket'
+option :mysql, banner: 'PORT_OR_SOCKET',
+  desc: 'Use MySQL/MariaDB port or socket'
 
 def drop_databases
   require 'geordi/db_cleaner'
-  fail '-P and -M are mutually exclusive' if options.postgres_only and 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
-        fail "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
@@ -48,13 +48,11 @@ def drop_databases
     postgres_flags = "--port=#{options.postgres}"
   end
 
-  extra_flags = {'mysql' => mysql_flags,
-                 'postgres' => postgres_flags
-  }
+  extra_flags = { 'mysql' => mysql_flags,
+                 'postgres' => postgres_flags }
   cleaner = DBCleaner.new(extra_flags)
   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

@@ -20,44 +20,43 @@ dump into the development database after downloading it.
     geordi dump staging -l
 DESC
 
-option :load, :aliases => ['-l'], :type => :string, :desc => 'Load a dump'
-option :select_server, :default => false, :type => :boolean, :aliases => '-s'
+option :load, aliases: ['-l'], type: :string, desc: 'Load a dump'
+option :select_server, default: false, type: :boolean, aliases: '-s'
 
-def dump(target = nil, *args)
+def dump(target = nil, *_args)
   require 'geordi/dump_loader'
   require 'geordi/remote'
 
   if target.nil?
     if options.load
       # validate load option
-      fail 'Missing a dump file.' if options.load == 'load'
-      File.exists?(options.load) or fail 'Could not find the given dump file: ' + options.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/eurest.rb

@@ -1,4 +1,4 @@
-desc 'eurest', 'Open the current Eurest cantina menu', :hide => true
+desc 'eurest', 'Open the current Eurest cantina menu', hide: true
 def eurest
-  Util.system! %{file="Speiseplan_KW`date +%V`.pdf" && wget -O/tmp/$file http://www.eurest-extranet.de/eurest/export/sites/default/sigma-technopark/de/downloads/$file && xdg-open /tmp/$file}
+  Util.system! %(file="Speiseplan_KW`date +%V`.pdf" && wget -O/tmp/$file http://www.eurest-extranet.de/eurest/export/sites/default/sigma-technopark/de/downloads/$file && xdg-open /tmp/$file)
 end

data/lib/geordi/commands/firefox.rb

@@ -10,12 +10,12 @@ Useful when you need Firefox for Selenium or the VNC set up, but can't use the
 This command is aliased `chrome` for users running Selenium in Chrome.
 LONGDESC
 
-option :setup, :banner => 'FIREFOX_VERSION',
-  :desc => 'Install a special test runner Firefox with the given version'
+option :setup, banner: 'FIREFOX_VERSION',
+  desc: 'Install a special test runner Firefox with the given version'
 
 def firefox(*command)
   if options.setup
-    fail '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?
-    fail '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
-    fail '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
@@ -35,10 +35,10 @@ class PngOptimizer
   end
 
   def optimization_default_args
-    args = ""
-    args << "-rem alla " # remove everything except transparency
-    args << "-rem text " # remove text chunks
-    args << "-reduce " # eliminate unused colors and reduce bit-depth (if possible)
+    args = ''
+    args << '-rem alla ' # remove everything except transparency
+    args << '-rem text ' # remove text chunks
+    args << '-reduce ' # eliminate unused colors and reduce bit-depth (if possible)
     args
   end
 
@@ -50,10 +50,11 @@ class PngOptimizer
     dirname = File.dirname(original)
     basename = File.basename(original)
     count = 0
-    begin
+
+    loop do
       tmp_name = "#{dirname}/#{basename}_temp_#{count += 1}.png"
-    end while File.exists?(tmp_name)
-    tmp_name
+      break tmp_name unless File.exist?(tmp_name)
+    end
   end
 
   def optimize_inplace(input_file)
@@ -61,9 +62,9 @@ class PngOptimizer
     result = optimize_file(input_file, temp_file)
     if result
       FileUtils.rm(input_file)
-      FileUtils.mv("#{temp_file}", "#{input_file}")
+      FileUtils.mv(temp_file.to_s, input_file.to_s)
     else
-      fail 'Error:' + $?
+      Interaction.fail 'Error:' + $?
     end
   end
 
@@ -71,7 +72,7 @@ class PngOptimizer
     # Dir[".png"] works case sensitive, so to catch all funky .png extensions we have to go the following way:
     png_relative_paths = []
     Dir["#{path}/*.*"].each do |file_name|
-      png_relative_paths << file_name if ends_with?(File.basename(file_name.downcase), ".png")
+      png_relative_paths << file_name if ends_with?(File.basename(file_name.downcase), '.png')
     end
     png_relative_paths.each do |png_relative_path|
       optimize_inplace(png_relative_path)

data/lib/geordi/commands/rake.rb

@@ -10,10 +10,10 @@ Example: `geordi rake db:migrate`
 LONGDESC
 
 def rake(*args)
-  for env in %w(development test cucumber) # update long_desc when changing this
-    if File.exists? "config/environments/#{env}.rb"
+  %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
   ]
-  for pattern in patterns
-    note pattern
+  patterns.each do |pattern|
+    Interaction.note pattern
     `find . -name "#{pattern}" -exec chmod -x {} ';'`
   end
   puts 'Done.'

data/lib/geordi/commands/rspec.rb

@@ -7,29 +7,29 @@ detection, etc.
 LONGDESC
 
 def rspec(*files)
-  if File.exists?('spec/spec_helper.rb')
+  if File.exist?('spec/spec_helper.rb')
     invoke_cmd 'bundle_install'
     invoke_cmd 'yarn_install'
 
-    announce 'Running specs'
+    Interaction.announce 'Running specs'
 
-    if Util.file_containing?('Gemfile', /parallel_tests/) and files.empty?
-      note 'All specs at once (using parallel_tests)'
-      Util.system! 'bundle exec rake parallel:spec', :fail_message => 'Specs failed.'
+    if Util.file_containing?('Gemfile', /parallel_tests/) && files.empty?
+      Interaction.note 'All specs at once (using parallel_tests)'
+      Util.system! 'bundle exec rake parallel:spec', fail_message: 'Specs failed.'
 
     else
       # tell which specs will be run
       if files.empty?
         files << 'spec/'
-        note 'All specs in spec/'
+        Interaction.note 'All specs in spec/'
       else
-        note 'Only: ' + files.join(', ')
+        Interaction.note 'Only: ' + files.join(', ')
       end
 
       command = ['bundle exec']
-      command << if File.exists?('script/spec')
+      command << if File.exist?('script/spec')
         'spec -c' # RSpec 1
-      elsif File.exists?('bin/rspec')
+      elsif File.exist?('bin/rspec')
         'bin/rspec'
       else
         'rspec'
@@ -38,9 +38,9 @@ def rspec(*files)
       command << files.join(' ')
 
       puts
-      Util.system! command.join(' '), :fail_message => 'Specs failed.'
+      Util.system! command.join(' '), fail_message: 'Specs failed.'
     end
   else
-    note 'RSpec not employed.'
+    Interaction.note 'RSpec not employed.'
   end
 end