geordi 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YThiMjA2MGUwNzA4OWJiMGMyZGRlOWEzNThlM2ZlZjFiYTQ2YmU0Ng==
-  data.tar.gz: !binary |-
-    ZDIyN2Y2MTIzODZjZjhiZmUzMWRmNDVjODczYzFhNGZlYzM1MWI5NA==
+SHA1:
+  metadata.gz: ac4e04e376ff1dbe4d61f1f461ec3babc7336878
+  data.tar.gz: d116626e960d6917d0966555c9605595eff3901b
 SHA512:
-  metadata.gz: !binary |-
-    MWU0ZjMxNjVmMGI0MGUxZmM0OTA5N2ZkMDMyZTg1OGE1M2Y4NDgyZTNjOWJk
-    YTU2MWI1MGYxZjg4Mjc3NDBjM2YwMmY5YWNiNDBkOTc5M2Y5ZGY0ODAyZjAx
-    NzgyZDQzNTcyZjM4ZTU0OTY2MzllMzM5YjA3YmVhMDY3MDJhODE=
-  data.tar.gz: !binary |-
-    NGNjNmUxOGU5MzIyNmM0NWZlN2U0MGUzYmNlNDlmNzM2MjAxOTgzMzE1MmMw
-    MDIyNDZmOTZiMDIxOTBiM2Y4ZjI0YWE2ZTg2MDM5ZmMxNmIzMjA1YzYzOGY0
-    YzhiNmMyOTgwYTY3NDBlNzI1NjhjMTQ0NjRiMzc2MzVhNmQ0YTY=
+  metadata.gz: 99be3db5c23f4f7a162af265279052da96728c4e855e3bf2bf3a661a57245fda9b0cff74d0314e6d6391175f1064be3ffe7637249b1b3e0f91728243f1ce7b2f
+  data.tar.gz: 632c0ffe2b237905b1b0c0fe8c1dfbea9eb83678e3905eb26a51538d6219a5b75c1ee399fe20c985570999e5acf9574df59730d7acca45b80ce6b06984390f05

data/lib/geordi/commands/commit.rb

@@ -1,171 +1,7 @@
 desc 'commit', 'Commit using a story title from Pivotal Tracker'
 def commit
+  require 'geordi/gitpt'
+
   Gitpt.new.run
 end
 
-class Gitpt
-  include Geordi::Interaction
-  require 'yaml'
-  require 'highline'
-  require 'pivotal-tracker'
-
-  attr_reader :token, :initials, :settings_file, :deprecated_token_file,
-              :highline, :applicable_stories, :memberships
-
-  def initialize
-    @highline = HighLine.new
-    @settings_file = File.join(ENV['HOME'], '.gitpt')
-    @deprecated_token_file = File.join(ENV['HOME'], '.pt_token')
-    load_settings
-    settings_were_invalid = (not settings_valid?)
-
-    hello unless settings_valid?
-    request_settings while not settings_valid?
-    stored if settings_were_invalid
-
-    PivotalTracker::Client.use_ssl = true
-    PivotalTracker::Client.token = token
-  end
-
-  def settings_valid?
-    token and token.size > 10
-  end
-
-  def bold(string)
-    HighLine::BOLD + string + HighLine::RESET
-  end
-
-  def highlight(string)
-    bold HighLine::BLUE + string
-  end
-
-  def hello
-    highline.say HighLine::RESET
-    highline.say "Welcome to #{bold 'gitpt'}.\n\n"
-  end
-
-  def loading(message, &block)
-    print message
-    STDOUT.flush
-    yield
-    print "\r" + ' ' * message.size + "\r" # Remove loading message
-    STDOUT.flush
-  end
-
-  def stored
-    highline.say left(<<-MESSAGE)
-      Thank you. Your settings have been stored at #{highlight @settings_file}
-      You may remove that file for the wizard to reappear.
-
-      ----------------------------------------------------
-
-    MESSAGE
-  end
-
-  def request_settings
-    highline.say highlight('Your settings are missing or invalid.')
-    highline.say "Please configure your Pivotal Tracker access.\n\n"
-    token = highline.ask bold("Your API key:") + " "
-    initials = highline.ask bold("Your PT initials") + " (optional, used for highlighting your stories): "
-    highline.say "\n"
-
-    settings = { :token => token, :initials => initials }
-    File.open settings_file, 'w' do |file|
-      file.write settings.to_yaml
-    end
-    load_settings
-  end
-
-  def load_settings
-    if File.exists? settings_file
-      settings = YAML.load(File.read settings_file)
-      @initials = settings[:initials]
-      @token = settings[:token]
-    else
-      if File.exists?(deprecated_token_file)
-        highline.say left(<<-MESSAGE)
-          #{HighLine::YELLOW}You are still using #{highlight(deprecated_token_file) + HighLine::YELLOW} which will be deprecated in a future version.
-          Please migrate your settings to ~/.gitpt or remove #{deprecated_token_file} for the wizard to cast magic.
-        MESSAGE
-        @token = File.read(deprecated_token_file)
-      end
-    end
-  end
-
-  def load_projects
-    project_id_filename = '.pt_project_id'
-    if File.exists?(project_id_filename)
-      project_ids = File.read('.pt_project_id').split(/[\s]+/).map(&:to_i)
-    end
-
-    unless project_ids and project_ids.size > 0
-      highline.say left(<<-MESSAGE)
-        Sorry, I could not find a project ID in #{highlight project_id_filename} :(
-
-        Please put at least one Pivotal Tracker project id into #{project_id_filename} in this directory.
-        You may add multiple IDs, separated using white space.
-      MESSAGE
-      exit 1
-    end
-
-    loading 'Connecting to Pivotal Tracker...' do
-      projects = project_ids.collect do |project_id|
-        PivotalTracker::Project.find(project_id)
-      end
-
-      @memberships = projects.collect(&:memberships).map(&:all).flatten
-
-      @applicable_stories = projects.collect do |project|
-        project.stories.all(:state => 'started,finished,rejected')
-      end.flatten
-    end
-  end
-
-  def choose_story
-    selected_story = nil
-
-    highline.choose do |menu|
-      menu.header = "Choose a story"
-      applicable_stories.each do |story|
-        owner_name = story.owned_by
-        owner = if owner_name
-          owners = memberships.select{|member| member.name == owner_name}
-          owners.first ? owners.first.initials : '?'
-        else
-          '?'
-        end
-
-        state = story.current_state
-        if state == 'started'
-          state = HighLine::GREEN + state + HighLine::RESET
-        elsif state != 'finished'
-          state = HighLine::RED + state + HighLine::RESET
-        end
-        state += HighLine::BOLD if owner == initials
-
-        label = "(#{owner}, #{state}) #{story.name}"
-        label = bold(label) if owner == initials
-        menu.choice(label) { selected_story = story }
-      end
-      menu.hidden ''
-    end
-
-    if selected_story
-      message = highline.ask("\nAdd an optional message")
-      highline.say message
-
-      commit_message = "[##{selected_story.id}] #{selected_story.name}"
-      if message.strip != ''
-        commit_message << ' - '<< message.strip
-      end
-
-      exec('git', 'commit', '-m', commit_message)
-    end
-  end
-
-  def run
-    load_projects
-    choose_story
-  end
-
-end

data/lib/geordi/commands/deploy.rb

@@ -2,14 +2,13 @@ desc 'deploy', 'Guided deployment'
 def deploy
   ENV['PAGER'] = 'cat'
 
-  master_branch = prompt('master branch', 'master')
-  production_branch = prompt('production branch', 'production')
-  production_stage = prompt('production capistrano stage', 'production')
+  master_branch = prompt 'master branch:', 'master'
+  production_branch = prompt 'production branch:', 'production'
+  production_stage = prompt 'production capistrano stage:', 'production'
 
   announce "Checking if your #{master_branch} is up to date"
-
-  diff_size = call_or_fail("git fetch && git diff #{master_branch} origin/#{master_branch} | wc -l", true)
-  changes_size = call_or_fail('git status -s | wc -l', true)
+  diff_size = `git fetch && git diff #{master_branch} origin/#{master_branch} | wc -l`.strip
+  changes_size = `git status -s | wc -l`.strip
 
   if diff_size == '0' and changes_size == '0'
     note 'All good.'
@@ -18,48 +17,23 @@ def deploy
   end
 
   announce "Checking what's on #{production_stage} right now..."
-
-  call_or_fail "git checkout #{production_branch} && git pull"
+  Util.system! "git checkout #{production_branch} && git pull"
 
   announce "You are about to deploy the following commits from #{master_branch} to #{production_branch}:"
+  Util.system! "git log #{production_branch}..#{master_branch} --oneline"
 
-  call_or_fail "git log #{production_branch}..#{master_branch} --oneline"
-
-  if prompt('Go ahead with the deployment?', 'n').downcase == 'y'
-    puts
+  if prompt('Go ahead with the deployment?', 'n', /y|yes/)
     capistrano_call = "cap #{production_stage} deploy:migrations"
     if file_containing?('Gemfile', /capistrano/)
       capistrano_call = "bundle exec #{capistrano_call}"
     end
-    call_or_fail("git merge #{master_branch} && git push && #{capistrano_call}")
-    success 'Deployment complete.'
-  else
-    fail 'Deployment cancelled.'
-  end
 
-end
-
-private
+    puts
+    Util.system! "git merge #{master_branch} && git push && #{capistrano_call}"
 
-def call_or_fail(command, return_output = false)
-  note_cmd command
-  if return_output
-    result = `#{command}`.to_s.strip
-    $?.success? or fail "Error while calling #{command}: #{$?}"
+    success 'Deployment complete.'
   else
-    result = system(command) or fail "Error while calling #{command}: #{$?}"
-    puts
+    fail 'Deployment cancelled.'
   end
-  result
-end
 
-def prompt(message, default)
-  print "#{message}"
-  print " [#{default}]" if default
-  print ": "
-  input = $stdin.gets.strip
-  if input.empty? && default
-    input = default
-  end
-  input
 end

data/lib/geordi/commands/security_update.rb

@@ -13,11 +13,9 @@ def security_update(step='prepare')
   when 'prepare'
     announce 'Preparing for security update'
     warn 'Please read https://makandracards.com/makandra/1587 before applying security updates!'
-    note 'About to: pull master and production branches, checkout production'
-    wait 'Continue?'
+    note 'About to checkout production and pull'
+    prompt('Continue?', 'y', /y|yes/) or fail 'Cancelled.'
 
-    Util.system! 'git checkout master', :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
 
@@ -34,11 +32,10 @@ def security_update(step='prepare')
     `git status --porcelain`.empty? or fail('There are uncommitted changes.')
     note 'Working directory clean.'
 
-    print 'Have you successfully run all tests? [yN] '
-    exit unless $stdin.gets =~ /[yes]+/
+    prompt('Have you successfully run all tests?', 'n', /y|yes/) or fail 'Please run tests first.'
 
     note 'About to: push production, checkout & pull master, merge production, push master, deploy all stages'
-    wait 'Continue?'
+    prompt('Continue?', 'n', /y|yes/) or fail 'Cancelled.'
 
     Util.system! 'git push', :show_cmd => true
     Util.system! 'git checkout master', :show_cmd => true

data/lib/geordi/commands/setup_vnc.rb

@@ -1,84 +1,66 @@
-class ::String
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
-
-  def red() colorize(31) end
-  def pink() colorize(35) end
-  def green() colorize(32) end
-end
-
 desc 'setup-vnc', 'Setup VNC for running Selenium tests there'
 def setup_vnc
   `clear`
 
-  instruct <<-TEXT
-    This script will help you install a VNC server and a VNC viewer.
-
+  note 'This script will help you install a VNC server and a VNC viewer.'
+  puts
+  puts 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 #{"geordi
-    vnc_show".pink}.
+    disturbed by focus-stealing Selenium windows. Instead, they will open
+    inside a VNC session.
 
-    Please open a second shell to execute instructions.
+    You can still inspect everything with:
   TEXT
+  note_cmd 'geordi vnc-show'
+  puts
+  note 'Please open a second shell to execute instructions.'
+  prompt 'Continue ...'
 
   announce 'Setup VNC server'
 
-  if installed?('vncserver')
+  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!'
   else
-    instruct <<-TEXT
-      Please run #{'sudo apt-get install vnc4server'.pink}.
-    TEXT
-
-    instruct <<-TEXT
-      We will now set a password for your VNC server.
+    puts 'Please run:'
+    note_cmd 'sudo apt-get install vnc4server'
+    prompt 'Continue ...'
 
+    puts
+    note 'We will now set a password for your VNC server.'
+    puts 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
       your machine.
 
-      Please run #{'vncserver :20'.pink} and #{'enter a secure password'.red}.
-    TEXT
-
-    instruct <<-TEXT
-      Now stop the server again.
-      Please run #{'vncserver -kill :20'.pink}.
     TEXT
+    puts 'Please run:'
+    note_cmd 'vncserver :20'
+    warn 'Enter a secure password!'
+    prompt 'Continue ...'
+
+    puts 'Now stop the server again. Please run:'
+    note_cmd 'vncserver -kill :20'
+    prompt 'Continue ...'
   end
 
   announce 'Setup VNC viewer'
 
-  if installed?('vncviewer')
+  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!'
   else
-    instruct <<-TEXT
-      Please run #{'sudo apt-get install xtightvncviewer'.pink}.
-    TEXT
+    puts 'Please run:'
+    note_cmd 'sudo apt-get install xtightvncviewer'
+    prompt 'Continue ...'
   end
 
-  instruct <<-TEXT, false
+  puts
+  puts strip_heredoc <<-TEXT
     All done. Our cucumber script will now automatically run Selenium features
     in VNC.
-    #{"Happy cuking!".green}
   TEXT
 
-end
-
-private
-
-def instruct(text, wait = true)
-  text =~ /^( *)./
-  level = $1 ? $1.size : 0
-  text.gsub!(/^ {#{level}}/, '')
-  puts text
-
-  wait('[ENTER]') if wait
-end
-
-def installed?(app)
-  `which #{app}`
-  $?.success?
+  success 'Happy cuking!'
 end

data/lib/geordi/firefox_for_selenium.rb

@@ -70,7 +70,7 @@ module Geordi
         unless FirefoxForSelenium.binary(@version).exist?
           note "Firefox #{@version} not found."
 
-          puts left(<<-INSTRUCTIONS)
+          puts strip_heredoc(<<-INSTRUCTIONS)
           Install it with
             geordi setup_firefox_for_selenium #{@version}
 
@@ -137,7 +137,7 @@ module Geordi
       def say_hello
         execute_command('clear')
 
-        puts left(<<-HELLO)
+        puts strip_heredoc(<<-HELLO)
         Whenever Firefox updates, Selenium breaks. This is annoying. This
         script will help you create an unchanging version of Firefox for your
         Selenium tests.
@@ -154,30 +154,27 @@ module Geordi
         - It will automatically be used for your Selenium scenarios if you run
           your Cucumber using the cuc binary from the geordi gem.
         - It will live in #{path}
-
         HELLO
 
-        wait "Press ENTER when you're ready to begin."
+        prompt "Press ENTER when you're ready to begin."
       end
 
       def check_if_run_before
         if original_binary.exist?
           note 'This version seems to be already installed.'
-          puts
-          wait 'Press ENTER to continue anyway or press CTRL+C to abort.'
+          prompt 'Press ENTER to continue anyway or press CTRL+C to abort.'
         end
       end
 
       def download_firefox
         path.mkpath
 
-        puts left(<<-INSTRUCTION)
+        puts strip_heredoc(<<-INSTRUCTION)
         Please download an old version of Firefox from: #{download_url}
         Unpack it with: tar xvjf firefox-#{@version}.tar.bz2 -C #{path} --strip-components=1
         Now #{path.join('firefox')} should be the firefox binary, not a directory.
-
         INSTRUCTION
-        wait "Press ENTER when you're done."
+        prompt "Press ENTER when you're done."
 
         File.file?(binary) or raise "Could not find #{binary}"
       end
@@ -195,7 +192,7 @@ module Geordi
         execute_command("mv #{binary} #{original_binary}")
         execute_command("mv #{binary}-bin #{original_binary}-bin")
         patched_binary = Tempfile.new('firefox')
-        patched_binary.write left(<<-PATCH)
+        patched_binary.write strip_heredoc(<<-PATCH)
           #!/usr/bin/env ruby
           exec('#{original_binary}', '-no-remote', '-P', '#{FIREFOX_FOR_SELENIUM_PROFILE_NAME}', *ARGV)
           PATCH
@@ -206,7 +203,7 @@ module Geordi
       end
 
       def configure_old_firefox
-        puts left(<<-INSTRUCTION)
+        puts strip_heredoc(<<-INSTRUCTION)
         You will now have to do some manual configuration.
 
         This script will open the patched copy of Firefox when you press ENTER.
@@ -218,18 +215,17 @@ module Geordi
           Firefox profile
         - Disable all automatic updates under Edit / Preferences / Advanced /
           Update (do this quickly or Firefox will already have updated)
-
         INSTRUCTION
 
-        wait 'Open the patched copy of Firefox with ENTER.'
+        prompt 'Open the patched copy of Firefox with ENTER.'
         run_firefox_for_selenium
       end
 
       def kkthxbb
         success "Congratulations, you're done!"
 
-        puts left(<<-INSTRUCTION)
-
+        puts
+        puts strip_heredoc(<<-INSTRUCTION)
         Your patched copy of Firefox will be used when you run Cucumber using
         the cucumber script that comes with the geordi gem. If you prefer to run
         Cucumber on your own, you must call it like this:

data/lib/geordi/gitpt.rb

@@ -0,0 +1,165 @@
+class Gitpt
+  include Geordi::Interaction
+  require 'yaml'
+  require 'highline'
+  require 'pivotal-tracker'
+
+  attr_reader :token, :initials, :settings_file, :deprecated_token_file,
+              :highline, :applicable_stories, :memberships
+
+  def initialize
+    @highline = HighLine.new
+    @settings_file = File.join(ENV['HOME'], '.gitpt')
+    @deprecated_token_file = File.join(ENV['HOME'], '.pt_token')
+    load_settings
+    settings_were_invalid = (not settings_valid?)
+
+    hello unless settings_valid?
+    request_settings while not settings_valid?
+    stored if settings_were_invalid
+
+    PivotalTracker::Client.use_ssl = true
+    PivotalTracker::Client.token = token
+  end
+
+  def settings_valid?
+    token and token.size > 10
+  end
+
+  def bold(string)
+    HighLine::BOLD + string + HighLine::RESET
+  end
+
+  def highlight(string)
+    bold HighLine::BLUE + string
+  end
+
+  def hello
+    highline.say HighLine::RESET
+    highline.say "Welcome to #{bold 'gitpt'}.\n\n"
+  end
+
+  def loading(message, &block)
+    print message
+    STDOUT.flush
+    yield
+    print "\r" + ' ' * message.size + "\r" # Remove loading message
+    STDOUT.flush
+  end
+
+  def stored
+    highline.say strip_heredoc(<<-MESSAGE)
+      Thank you. Your settings have been stored at #{highlight @settings_file}
+      You may remove that file for the wizard to reappear.
+
+      ----------------------------------------------------
+
+    MESSAGE
+  end
+
+  def request_settings
+    highline.say highlight('Your settings are missing or invalid.')
+    highline.say "Please configure your Pivotal Tracker access.\n\n"
+    token = highline.ask bold("Your API key:") + " "
+    initials = highline.ask bold("Your PT initials") + " (optional, used for highlighting your stories): "
+    highline.say "\n"
+
+    settings = { :token => token, :initials => initials }
+    File.open settings_file, 'w' do |file|
+      file.write settings.to_yaml
+    end
+    load_settings
+  end
+
+  def load_settings
+    if File.exists? settings_file
+      settings = YAML.load(File.read settings_file)
+      @initials = settings[:initials]
+      @token = settings[:token]
+    else
+      if File.exists?(deprecated_token_file)
+        highline.say strip_heredoc(<<-MESSAGE)
+#{HighLine::YELLOW}You are still using #{highlight(deprecated_token_file) + HighLine::YELLOW} which will be deprecated in a future version.
+          Please migrate your settings to ~/.gitpt or remove #{deprecated_token_file} for the wizard to cast magic.
+        MESSAGE
+        @token = File.read(deprecated_token_file)
+      end
+    end
+  end
+
+  def load_projects
+    project_id_filename = '.pt_project_id'
+    if File.exists?(project_id_filename)
+      project_ids = File.read('.pt_project_id').split(/[\s]+/).map(&:to_i)
+    end
+
+    unless project_ids and project_ids.size > 0
+      warn "Sorry, I could not find a project ID in #{project_id_filename} :("
+      puts
+
+      puts "Please put at least one Pivotal Tracker project id into #{project_id_filename} in this directory."
+      puts 'You may add multiple IDs, separated using white space.'
+      exit 1
+    end
+
+    loading 'Connecting to Pivotal Tracker...' do
+      projects = project_ids.collect do |project_id|
+        PivotalTracker::Project.find(project_id)
+      end
+
+      @memberships = projects.collect(&:memberships).map(&:all).flatten
+
+      @applicable_stories = projects.collect do |project|
+        project.stories.all(:state => 'started,finished,rejected')
+      end.flatten
+    end
+  end
+
+  def choose_story
+    selected_story = nil
+
+    highline.choose do |menu|
+      menu.header = "Choose a story"
+      applicable_stories.each do |story|
+        owner_name = story.owned_by
+        owner = if owner_name
+          owners = memberships.select{|member| member.name == owner_name}
+          owners.first ? owners.first.initials : '?'
+        else
+          '?'
+        end
+
+        state = story.current_state
+        if state == 'started'
+          state = HighLine::GREEN + state + HighLine::RESET
+        elsif state != 'finished'
+          state = HighLine::RED + state + HighLine::RESET
+        end
+        state += HighLine::BOLD if owner == initials
+
+        label = "(#{owner}, #{state}) #{story.name}"
+        label = bold(label) if owner == initials
+        menu.choice(label) { selected_story = story }
+      end
+      menu.hidden ''
+    end
+
+    if selected_story
+      message = highline.ask("\nAdd an optional message")
+      highline.say message
+
+      commit_message = "[##{selected_story.id}] #{selected_story.name}"
+      if message.strip != ''
+        commit_message << ' - '<< message.strip
+      end
+
+      exec('git', 'commit', '-m', commit_message)
+    end
+  end
+
+  def run
+    load_projects
+    choose_story
+  end
+
+end

data/lib/geordi/interaction.rb

@@ -31,17 +31,25 @@ module Geordi
       puts "\e[32m#{message}\e[0m" # green
     end
 
-    def wait(text)
-      message = "#{text}"
-      puts "\e[36m#{message}\e[0m" # cyan
-      $stdin.gets
-    end
-
-    def left(string)
+    def strip_heredoc(string)
       leading_whitespace = (string.match(/\A( +)[^ ]+/) || [])[1]
       string.gsub! /^#{leading_whitespace}/, '' if leading_whitespace
       string
     end
 
+    # Returns the user's input.
+    # If agreement_regex is given, returns whether the input matches the regex.
+    def prompt(text, default = nil, agreement_regex = nil)
+      message = "#{text} "
+      message << "[#{default}] " if default
+
+      puts
+      print "\e[36m#{message}\e[0m" # cyan
+      input = $stdin.gets.strip
+      input = default if input.empty? && default
+
+      agreement_regex ? !!(input =~ agreement_regex) : input
+    end
+
   end
 end

data/lib/geordi/util.rb

@@ -11,18 +11,21 @@ module Geordi
       # Thus, we have this handy method here.
       def installing_missing_gems(&block)
         yield
-      rescue LoadError => e
-        gem_name = e.message.split('--').last.strip
+      rescue LoadError => error
+        error.message =~ /-- (\S+)\Z/
+        $1 or raise # could not extract a gem name from the error message, re-raise the error
+
+        gem_name = $1.strip
         install_command = 'gem install ' + gem_name
 
         # install missing gem
         warn 'Probably missing gem: ' + gem_name
-        wait 'Auto-install it?'
+        prompt('Install it now?', 'y', /y|yes/) or fail 'Missing Gems.'
         system! install_command, :show_cmd => true
 
         # retry
         Gem.clear_paths
-        note 'Trying again ...'
+        note 'Retrying ...'
         require gem_name
         retry
       end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: geordi
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.0
 description: Collection of command line tools we use in our daily work with Ruby,
@@ -56,8 +56,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -124,6 +124,7 @@ files:
 - lib/geordi/cucumber.rb
 - lib/geordi/dump_loader.rb
 - lib/geordi/firefox_for_selenium.rb
+- lib/geordi/gitpt.rb
 - lib/geordi/interaction.rb
 - lib/geordi/remote.rb
 - lib/geordi/run_tests.rb
@@ -133,7 +134,7 @@ homepage: http://makandra.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! "\n    ********************************************\n\n    geordi
+post_install_message: "\n    ********************************************\n\n    geordi
   1.0 moves most of the scripts to\n    the `geordi` binary. Run `geordi` and\n    `geordi
   help <cmd>` for further information.\n\n    Tip: Create an alias for geordi for
   quick \n    access. Add this to your ~/.bashrc:\n\n      alias g=\"geordi\"\n\n
@@ -143,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: geordi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Collection of command line tools we use in our daily work with Ruby, Rails