geordi 2.12.3 → 3.0.0

data/lib/geordi/commands/png_optimize.rb

@@ -13,7 +13,7 @@ def png_optimize(path)
   announce 'Optimizing .png files'
 
   if `which pngcrush`.strip.empty?
-    fail 'Please install pngcrush first (sudo apt-get install pngcrush)'
+    raise 'Please install pngcrush first (sudo apt-get install pngcrush)'
   end
 
   po = PngOptimizer.new
@@ -22,7 +22,7 @@ def png_optimize(path)
   elsif File.file?(path)
     po.optimize_inplace(path)
   else
-    fail 'Neither directory nor file: ' + path
+    raise 'Neither directory nor file: ' + path
   end
 
   success 'PNG optimization completed.'
@@ -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:' + $?
+      raise 'Error:' + $CHILD_STATUS
     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,8 +10,8 @@ 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(' ')
 

data/lib/geordi/commands/remove_executable_flags.rb

@@ -6,7 +6,7 @@ def remove_executable_flags
     *.rb *.html *.erb *.haml *.yml *.css *.sass *.rake *.png *.jpg
     *.gif *.pdf *.txt *.rdoc *.feature Rakefile VERSION README Capfile
   ]
-  for pattern in patterns
+  patterns.each do |pattern|
     note pattern
     `find . -name "#{pattern}" -exec chmod -x {} ';'`
   end

data/lib/geordi/commands/rspec.rb

@@ -7,15 +7,15 @@ 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'
 
-    if Util.file_containing?('Gemfile', /parallel_tests/) and files.empty?
+    if Util.file_containing?('Gemfile', /parallel_tests/) && files.empty?
       note 'All specs at once (using parallel_tests)'
-      Util.system! 'bundle exec rake parallel:spec', :fail_message => 'Specs failed.'
+      Util.system! 'bundle exec rake parallel:spec', fail_message: 'Specs failed.'
 
     else
       # tell which specs will be run
@@ -27,9 +27,9 @@ def rspec(*files)
       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,7 +38,7 @@ 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.'

data/lib/geordi/commands/security_update.rb

@@ -8,16 +8,16 @@ Switches branches, pulls, pushes and deploys as required by our workflow. Tells
 what it will do before it does it.
 LONGDESC
 
-def security_update(step='prepare')
+def security_update(step = 'prepare')
   case step
   when 'prepare'
     announce 'Preparing for security update'
     warn 'Please read https://makandracards.com/makandra/1587 before applying security updates!'
     note 'About to checkout production and pull'
-    prompt('Continue?', 'y', /y|yes/) or fail 'Cancelled.'
+    prompt('Continue?', 'y', /y|yes/) || raise('Cancelled.')
 
-    Util.system! 'git checkout production', :show_cmd => true
-    Util.system! 'git pull', :show_cmd => true
+    Util.system! 'git checkout production', show_cmd: true
+    Util.system! 'git pull', show_cmd: true
 
     success 'Successfully prepared for security update'
     puts
@@ -27,20 +27,20 @@ def security_update(step='prepare')
 
   when 'f', 'finish'
     # ensure everything is committed
-    `git status --porcelain`.empty? or fail('Please commit your changes before finishing the update.')
+    `git status --porcelain`.empty? || raise('Please commit your changes before finishing the update.')
 
     announce 'Finishing security update'
     note 'Working directory clean.'
-    prompt('Have you successfully run all tests?', 'n', /y|yes/) or fail 'Please run tests first.'
+    prompt('Have you successfully run all tests?', 'n', /y|yes/) || raise('Please run tests first.')
 
     note 'About to: push production, checkout & pull master, merge production, push master'
-    prompt('Continue?', 'n', /y|yes/) or fail 'Cancelled.'
+    prompt('Continue?', 'n', /y|yes/) || raise('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.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
 
     announce 'Deploying all targets'
     deploy = (Util.gem_major_version('capistrano') == 3) ? 'deploy' : 'deploy:migrations'

data/lib/geordi/commands/server.rb

@@ -1,9 +1,9 @@
 desc 'server [PORT]', 'Start a development server'
 
-option :port, :aliases => '-p', :default => '3000',
-  :desc => 'Choose a port'
-option :public, :aliases => '-P', :type => :boolean,
-  :desc => 'Make the server accessible in the local network'
+option :port, aliases: '-p', default: '3000',
+  desc: 'Choose a port'
+option :public, aliases: '-P', type: :boolean,
+  desc: 'Make the server accessible in the local network'
 
 def server(port = nil)
   invoke_cmd 'bundle_install'
@@ -12,7 +12,7 @@ def server(port = nil)
 
   announce 'Booting a development server'
   port ||= options.port
-  note "URL: http://#{ File.basename(Dir.pwd) }.vcap.me:#{port}"
+  note "URL: http://#{File.basename(Dir.pwd)}.vcap.me:#{port}"
   puts
 
   command = Util.server_command

data/lib/geordi/commands/setup.rb

@@ -19,12 +19,12 @@ After setting up, runs all tests when called with the `--test` option:
     geordi setup -t
 LONGDESC
 
-option :dump, :type => :string, :aliases => '-d', :banner => 'TARGET',
-  :desc => 'After setup, dump the TARGET db and source it into the development db'
-option :test, :type => :boolean, :aliases => '-t', :desc => 'After setup, run tests'
+option :dump, type: :string, aliases: '-d', banner: 'TARGET',
+  desc: 'After setup, dump the TARGET db and source it into the development db'
+option :test, type: :boolean, aliases: '-t', desc: 'After setup, run tests'
 
 def setup
-  if File.exists? 'bin/setup'
+  if File.exist? 'bin/setup'
     announce 'Running bin/setup'
     note "Geordi's own setup routine is skipped"
 
@@ -36,6 +36,6 @@ def setup
 
   success 'Successfully set up the project.'
 
-  invoke_cmd 'dump', options.dump, :load => true if options.dump
+  invoke_cmd 'dump', options.dump, load: true if options.dump
   invoke_cmd 'tests' if options.test
 end

data/lib/geordi/commands/shell.rb

@@ -7,11 +7,11 @@ Lets you select the server to connect to when called with `--select-server`:
     geordi shell production -s
 LONGDESC
 
-option :select_server, :default => false, :type => :boolean, :aliases => '-s'
+option :select_server, default: false, type: :boolean, aliases: '-s'
 
 # This method has a triple 'l' because :shell is a Thor reserved word. However,
 # it can still be called with `geordi shell` :)
-def shelll(target, *args)
+def shelll(target, *_args)
   require 'geordi/remote'
 
   announce 'Opening a shell on ' + target

data/lib/geordi/commands/unit.rb

@@ -1,6 +1,6 @@
 desc 'unit', 'Run Test::Unit'
 def unit
-  if File.exists?('test/test_helper.rb')
+  if File.exist?('test/test_helper.rb')
     invoke_cmd 'bundle_install'
     invoke_cmd 'yarn_install'
 

data/lib/geordi/commands/update.rb

@@ -16,18 +16,18 @@ After updating, runs all tests when called with the `--test` option:
 See `geordi help update` for details.
 LONGDESC
 
-option :dump, :type => :string, :aliases => '-d', :banner => 'TARGET',
-  :desc => 'After updating, dump the TARGET db and source it into the development db'
-option :test, :type => :boolean, :aliases => '-t', :desc => 'After updating, run tests'
+option :dump, type: :string, aliases: '-d', banner: 'TARGET',
+  desc: 'After updating, dump the TARGET db and source it into the development db'
+option :test, type: :boolean, aliases: '-t', desc: 'After updating, run tests'
 
 def update
   announce 'Updating repository'
-  Util.system! 'git pull', :show_cmd => true
+  Util.system! 'git pull', show_cmd: true
 
   invoke_cmd 'migrate'
 
   success 'Successfully updated the project.'
 
-  invoke_cmd 'dump', options.dump, :load => true if options.dump
+  invoke_cmd 'dump', options.dump, load: true if options.dump
   invoke_cmd 'tests' if options.test
 end

data/lib/geordi/commands/vnc.rb

@@ -8,7 +8,7 @@ tests.
 When called with `--setup`, will guide through the setup of VNC.
 LONGDESC
 
-option :setup, :type => :boolean
+option :setup, type: :boolean
 
 def vnc
   if options.setup

data/lib/geordi/commands/with_rake.rb

@@ -1,4 +1,4 @@
-desc 'with-rake', 'Run tests with `rake`', :hide => true
+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'

data/lib/geordi/commands/yarn_install.rb

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

data/lib/geordi/cucumber.rb

@@ -3,18 +3,17 @@ require 'tempfile'
 
 # This require-style is to prevent Ruby from loading files of a different
 # version of Geordi.
-require File.expand_path('../interaction', __FILE__)
-require File.expand_path('../firefox_for_selenium', __FILE__)
+require File.expand_path('interaction', __dir__)
+require File.expand_path('firefox_for_selenium', __dir__)
 
 module Geordi
   class Cucumber
     include Geordi::Interaction
 
-    VNC_DISPLAY = ':17'
-    VNC_SERVER_DEFAULT_OPTIONS = '-localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024'
-    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} #{ENV.fetch('GEORDI_VNC_OPTIONS', VNC_SERVER_DEFAULT_OPTIONS)}"
-    VNC_VIEWER_COMMAND = "vncviewer"
-    VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER]
+    VNC_DISPLAY = ':17'.freeze
+    VNC_SERVER_COMMAND = "vncserver #{VNC_DISPLAY} -localhost -nolisten tcp -SecurityTypes None -geometry 1280x1024".freeze
+    VNC_VIEWER_COMMAND = "vncviewer #{VNC_DISPLAY}".freeze
+    VNC_ENV_VARIABLES = %w[DISPLAY BROWSER LAUNCHY_BROWSER].freeze
 
     def run(files, cucumber_options, options = {})
       self.argv = files + cucumber_options.map { |option| option.split('=') }.flatten
@@ -30,21 +29,21 @@ module Geordi
       system command # Util.system! would reset the Firefox PATH
     end
 
-    def launch_vnc_viewer(source = VNC_DISPLAY)
-      fork {
+    def launch_vnc_viewer
+      fork do
         error = capture_stderr do
-          system(VNC_VIEWER_COMMAND, source)
+          system(VNC_VIEWER_COMMAND)
         end
-        unless $?.success?
-          if $?.exitstatus == 127
-            fail 'VNC viewer not found. Install it with `geordi vnc --setup`.'
+        unless $CHILD_STATUS.success?
+          if $CHILD_STATUS.exitstatus == 127
+            raise 'VNC viewer not found. Install it with `geordi vnc --setup`.'
           else
             note 'VNC viewer could not be opened:'
             puts error
             puts
           end
         end
-      }
+      end
     end
 
     def restore_env
@@ -58,8 +57,8 @@ module Geordi
         VNC_ENV_VARIABLES.each do |variable|
           ENV["OUTER_#{variable}"] = ENV[variable] if ENV[variable]
         end
-        ENV["BROWSER"] = ENV["LAUNCHY_BROWSER"] = File.expand_path('../../../bin/launchy_browser', __FILE__)
-        ENV["DISPLAY"] = VNC_DISPLAY
+        ENV['BROWSER'] = ENV['LAUNCHY_BROWSER'] = File.expand_path('../../bin/launchy_browser', __dir__)
+        ENV['DISPLAY'] = VNC_DISPLAY
 
         note 'Run `geordi vnc` to view the Selenium test browsers'
       end
@@ -74,7 +73,7 @@ module Geordi
       unless argv.include?('--format') || argv.include?('-f')
         format_args = spinner_available? ? ['--format', 'CucumberSpinner::CuriousProgressBarFormatter'] : ['--format', 'progress']
       end
-      [use_firefox_for_selenium, "b", "cucumber", format_args, escape_shell_args(argv)].flatten.compact.join(" ")
+      [use_firefox_for_selenium, 'b', 'cucumber', format_args, escape_shell_args(argv)].flatten.compact.join(' ')
     end
 
     def parallel_execution_command
@@ -88,8 +87,8 @@ module Geordi
       [
         use_firefox_for_selenium,
         'b parallel_test -t ' + type_arg,
-        %(-o '#{ command_line_options.join(' ') } --tags "#{not_tag('@solo')}"'),
-        "-- #{ features.join(' ') }"
+        %(-o '#{command_line_options.join(' ')} --tags "#{not_tag('@solo')}"'),
+        "-- #{features.join(' ')}",
       ].compact.join(' ')
     end
 
@@ -110,7 +109,7 @@ module Geordi
 
     def escape_shell_args(*args)
       args.flatten.collect do |arg|
-        arg.gsub(/([\\ "])/) { |match| "\\#{$1}" }
+        arg.gsub(/([\\ "])/) { |_match| "\\#{Regexp.last_match(1)}" }
       end
     end
 
@@ -138,8 +137,8 @@ module Geordi
 
     def rerun_txt_features
       @rerun_txt_features ||= begin
-        if File.exists?("rerun.txt")
-          IO.read("rerun.txt").to_s.strip.split(/\s+/)
+        if File.exist?('rerun.txt')
+          IO.read('rerun.txt').to_s.strip.split(/\s+/)
         else
           []
         end
@@ -151,7 +150,7 @@ module Geordi
     end
 
     def command_line_options
-      @command_line_options ||= Array.new.tap do |args|
+      @command_line_options ||= [].tap do |args|
         # Sorry for this mess. Option parsing doesn't get much prettier.
         argv.each_cons(2) do |a, b|
           break if a == '--' # This is the common no-options-beyond marker
@@ -172,7 +171,7 @@ module Geordi
     end
 
     def consolidate_rerun_txt_files
-      parallel_rerun_files = Dir.glob("parallel_rerun*.txt")
+      parallel_rerun_files = Dir.glob('parallel_rerun*.txt')
       unless parallel_rerun_files.empty?
         note 'Consolidating parallel_rerun.txt files ...'
 
@@ -182,8 +181,8 @@ module Geordi
           File.unlink(filename)
         end
 
-        File.open("rerun.txt", "w") do |f|
-          f.puts(rerun_content.join(" "))
+        File.open('rerun.txt', 'w') do |f|
+          f.puts(rerun_content.join(' '))
         end
       end
     end
@@ -191,14 +190,14 @@ module Geordi
     def find_all_features_recursively(files_or_dirs)
       Array(files_or_dirs).map do |file_or_dir|
         if File.directory?(file_or_dir)
-          file_or_dir = Dir.glob(File.join(file_or_dir, "**", "*.feature"))
+          file_or_dir = Dir.glob(File.join(file_or_dir, '**', '*.feature'))
         end
         file_or_dir
       end.flatten.uniq.compact
     end
 
     def spinner_available?
-      @spinner_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
+      @spinner_available ||= File.exist?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
     end
 
     def use_parallel_tests?(options)
@@ -210,7 +209,7 @@ module Geordi
 
     def try_and_start_vnc
       # check if vnc is already running
-      #return true if vnc_server_running?
+      # return true if vnc_server_running?
       error = capture_stderr do
         system(VNC_SERVER_COMMAND)
       end