geordi 2.10.1 → 3.0.3

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

data/lib/geordi/commands/security_update.rb

@@ -8,47 +8,47 @@ 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.'
+    Interaction.announce 'Preparing for security update'
+    Interaction.warn 'Please read https://makandracards.com/makandra/1587 before applying security updates!'
+    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.system! 'git checkout production', show_cmd: true
+    Util.system! 'git pull', show_cmd: true
 
-    success 'Successfully prepared for security update'
+    Interaction.success 'Successfully prepared for security update'
     puts
-    note 'Please apply the security update now and commit your changes.'
-    note 'When you are done, run `geordi security-update finish`.'
+    Interaction.note 'Please apply the security update now and commit your changes.'
+    Interaction.note 'When you are done, run `geordi security-update finish`.'
 
 
   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? || Interaction.fail('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.'
+    Interaction.announce 'Finishing security update'
+    Interaction.note 'Working directory clean.'
+    Interaction.prompt('Have you successfully run all tests?', 'n', /y|yes/) || Interaction.fail('Please run tests first.')
 
-    note 'About to: push production, checkout & pull master, merge production, push master'
-    prompt('Continue?', 'n', /y|yes/) or fail 'Cancelled.'
+    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.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'
+    Interaction.announce 'Deploying all targets'
     deploy = (Util.gem_major_version('capistrano') == 3) ? 'deploy' : 'deploy:migrations'
     invoke_cmd 'capistrano', deploy
 
-    success 'Successfully pushed and deployed security update'
+    Interaction.success 'Successfully pushed and deployed security update'
     puts
-    note 'Now send an email to customer and project lead, informing them about the update.'
-    note 'Do not forget to make a joblog on a security budget, if available.'
+    Interaction.note 'Now send an email to customer and project lead, informing them about the update.'
+    Interaction.note 'Do not forget to make a joblog on a security budget, if available.'
   end
 end

data/lib/geordi/commands/server.rb

@@ -1,18 +1,18 @@
 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'
   invoke_cmd 'yarn_install'
   require 'geordi/util'
 
-  announce 'Booting a development server'
+  Interaction.announce 'Booting a development server'
   port ||= options.port
-  note "URL: http://#{ File.basename(Dir.pwd) }.vcap.me:#{port}"
+  Interaction.note "URL: http://#{File.basename(Dir.pwd)}.vcap.me:#{port}"
   puts
 
   command = Util.server_command

data/lib/geordi/commands/setup.rb

@@ -19,14 +19,14 @@ 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'
-    announce 'Running bin/setup'
-    note "Geordi's own setup routine is skipped"
+  if File.exist? 'bin/setup'
+    Interaction.announce 'Running bin/setup'
+    Interaction.note "Geordi's own setup routine is skipped"
 
     Util.system! 'bin/setup'
   else
@@ -34,8 +34,8 @@ def setup
     invoke_cmd 'migrate'
   end
 
-  success 'Successfully set up the project.'
+  Interaction.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