geordi 0.18.0 → 1.0.0

data/bin/cuc-vnc-setup

@@ -1,116 +1,3 @@
 #!/usr/bin/env ruby
 
-class String
-  # colorization
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
-
-  def red
-    colorize(31)
-  end
-
-  def green
-    colorize(32)
-  end
-
-  def yellow
-    colorize(33)
-  end
-end
-
-def pause
-  puts
-  puts "[ENTER] to continue".yellow
-  gets
-  puts
-end
-
-def say(text)
-  text =~ /^( *)./
-  level = $1 ? $1.size : 0
-  text.gsub!(/^ {#{level}}/, '')
-  puts text
-end
-
-def installed?(app)
-  `which #{app}`
-  $?.success?
-end
-
-
-`clear`
-
-say <<-TEXT
-
-  This script will help you install a VNC server and a VNC viewer. 
-  
-  With those you will be able to use #{"cuc".green} without being disturbed by 
-  focus-stealing selenium windows.
-
-  All windows will insteads open inside a VNC session. You can still inspect 
-  everything by using the #{"cuc-show".green} command.
-TEXT
-pause
-
-say <<-TEXT
-  #{"Please open a second shell to execute any commands.".red}
-TEXT
-pause
-
-if installed?("vncserver")
-  say <<-TEXT
-    It appears #{"you already have a VNC server installed".green}. Good job.
-  TEXT
-  pause
-else
-  say <<-TEXT
-    We are going to install and configure a VNC server. 
-
-    Please run:
-    #{"sudo apt-get install vnc4server".red}
-  TEXT
-  pause
-
-  say <<-TEXT
-    We will now set a password for your VNC server. #{"Please choose a secure password.".red}
-
-    When running the #{"cuc".green} script, you will not actually need this password,
-    and there is no security risk. However if you start a vncserver without
-    #{"cuc".green}, a user with this password can connect to your machine.
-
-    Please run:
-    #{"vncserver :20".red}
-    #{"and enter a password".red}
-  TEXT
-  pause
-
-  say <<-TEXT
-    We will now stop the server again.
-
-    Please run:
-    #{"vncserver -kill :20".red}
-  TEXT
-  pause
-end
-
-if installed?("vncviewer")
-  say <<-TEXT
-    It appears #{"you already have a VNC viewer installed".green}. Good job.
-  TEXT
-  pause
-else
-  say <<-TEXT
-    We are going to install and configure a VNC viewer. 
-
-    Please run:
-    #{"sudo apt-get install xtightvncviewer".red}
-  TEXT
-  pause
-end
-
-say <<-TEXT
-  All done. #{"cuc".green} will automatically use this from now on. 
-
-  #{"Happy cuking!".green}
-TEXT
+exec 'geordi', 'setup-vnc'

data/bin/deploy-to-production

@@ -1,93 +1,3 @@
 #!/usr/bin/env ruby
 
-def color_code(color_name, background_color_name = nil)
-  colors = %w[ black red green yellow blue pink cyan white ].map(&:to_sym)
-  color = 30 + colors.index(color_name)
-  if background_code = colors.index(background_color_name)
-    background = 40 + background_code
-    bold = 1
-  end
-  [ bold, color, background ].compact.join ';'
-end
-
-def colorize(text, color_name, background_color_name = nil)
-  color_code = color_code(color_name, background_color_name)
-  "\e[#{color_code}m#{text}\e[0m"
-end
-
-def header(text)
-  puts colorize(text, :yellow, :blue), ''
-end
-
-def call_or_fail(command, return_output = false)
-  puts colorize(command, :pink), ''
-  if return_output
-    result = `#{command}`.to_s.strip
-    $?.success? or raise "Error while calling #{command}: #{$?}"
-  else
-    result = system(command) or raise "Error while calling #{command}: #{$?}"
-    puts
-  end
-  result
-end
-
-def prompt(message, default)
-  print "#{message}"
-  print " [#{default}]" if default
-  print ": "
-  input = gets.strip
-  if input.empty? && default
-    input = default
-  end
-  puts
-  input
-end
-
-def success(message)
-  puts colorize(message, :green), ''
-  exit 0
-end
-
-def error(message)
-  puts colorize(message, :red), ''
-  exit 1
-end
-
-puts
-
-ENV['PAGER'] = 'cat'
-
-master_branch = prompt('master branch', 'master')
-production_branch = prompt('production branch', 'production')
-production_stage = prompt('production capistrano stage', 'production')
-
-header("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)
-
-if diff_size == '0' and changes_size == '0'
-  puts "All good.", ''
-else
-  error "Your #{master_branch} is not the same as on origin or holds uncommitted changes. Fix that first."
-end
-
-header("Checking what's on #{production_stage} right now...")
-
-call_or_fail("git checkout #{production_branch} && git pull")
-
-header("You are about to deploy the following commits from #{master_branch} to #{production_branch}:")
-
-call_or_fail("git log #{production_branch}..#{master_branch} --oneline")
-
-if prompt("Go ahead with the deployment? (y/n)", "n").downcase == 'y'
-  capistrano_call = "cap #{production_stage} deploy:migrations"
-  if File.exists?('Gemfile') && File.open('Gemfile').read.scan(/capistrano/).any?
-    capistrano_call = "bundle exec #{capistrano_call}"
-  end
-  call_or_fail("git merge #{master_branch} && git push && #{capistrano_call}")
-  success 'Deployment complete.'
-else
-  error 'Deployment cancelled.'
-end
-
+exec 'geordi', 'deploy'

data/bin/dump-for

@@ -1,35 +1,7 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi/capistrano"
-require File.dirname(__FILE__) + "/../lib/geordi/dump_loader"
-include Geordi::Capistrano
 
-catching_errors do
-  self.stage = ARGV.shift
-  
-  success = shell_for("dumple #{config.env} --for_download", :exec => false)
-  
-  if success
-    source_path = "~/dumps/dump_for_download.dump"
-    destination_directory = "#{config.root}/tmp"
-    system "mkdir -p #{destination_directory}" # Ensure the destination directory exists
-    destination_path = "#{destination_directory}/#{stage}.dump"
-
-    puts "Downloading dump_for_download ..."
-    system "scp #{config.user}@#{config.primary_server}:#{source_path} #{destination_path}"
-    puts "Dumped the #{stage.upcase} database to RAILS_ROOT/tmp/#{stage}.dump"
-
-    # source dump if option was given
-    if ARGV.include?("-s")
-      puts
-      puts "Sourcing dump into development database..."
-      success = DumpLoader.new([destination_path]).execute
-      if success
-        puts "Your database is now sourced with a fresh #{stage} dump."
-      else
-        $stderr.puts "Could not source the downloaded #{stage} dump."
-      end
-    end
-  else
-    raise "An error occurred. Aborting..."
-  end
+if (i = ARGV.index '-s')
+  ARGV[i] = '-l'
 end
+
+exec 'geordi', 'dump', *ARGV

data/bin/dumple

@@ -60,8 +60,7 @@ begin
     dump_path = "#{dump_dir}/#{config['database']}_#{Time.now.strftime("%Y%m%d_%H%M%S")}.dump"
   end
 
-  puts
-  puts "Dumping database for \"#{environment}\" environment ..."
+  puts "> Dumping database for \"#{environment}\" environment ..."
 
   host = config['host'] || 'localhost'
 
@@ -78,8 +77,7 @@ begin
 
   dump_size_kb = (File.size(dump_path) / 1024).round
 
-  puts "Dumped to #{dump_path} (#{dump_size_kb} KB)"
-  puts
+  puts "> Dumped to #{dump_path} (#{dump_size_kb} KB)"
 rescue Exception => e
   $stderr.puts e.message
   exit 1

data/bin/geordi

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'geordi/util'
+
+Geordi::Util.installing_missing_gems do
+  require 'geordi'
+  require 'thor'
+
+  Geordi::CLI.start
+end

data/bin/gitpt

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '../lib/geordi/gitpt')
 
-Geordi::Gitpt.new.run
+exec 'geordi', 'commit'

data/bin/launchy_browser

@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '../lib/geordi/cuc')
 
-require 'rubygems'
-require 'launchy'
+# This script is a part of Geordi. It is used by the cucumber command to have
+# launchy open error pages from tests in the users browser, as apposed to
+# opening it within VNC.
 
+# For unknown reasons, #require cannot find 'geordi/cucumber', so we need to
+# require it this way. Hours have been spent trying to require 'geordi/cucumber'.
+require File.expand_path('../../lib/geordi/cucumber', __FILE__)
 Geordi::Cucumber.new.restore_env
 
+require 'rubygems'
+require 'launchy'
+
 Launchy.open(ARGV.first)

data/bin/load-dump

@@ -1,6 +1,3 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + "/../lib/geordi/dump_loader"
-
-
-DumpLoader.new(ARGV).execute!
+exec 'geordi', 'dump', '-l', *ARGV

data/bin/migrate-all

@@ -1,15 +1,3 @@
 #!/usr/bin/env ruby
 
-# Check if parallel_tests is available
-parallel_tests_available = ['rake', 'parallel:spec'] if File.exists?('Gemfile') && File.open('Gemfile').read.scan(/parallel_tests/).any?
-
-command = if parallel_tests_available
-  'b rake db:migrate parallel:prepare'
-else
-  'power-rake db:migrate'
-end
-
-4.times { puts }
-puts "Running command:\n#{command}"
-puts "============================================"
-exec command
+exec 'geordi', 'migrate'

data/bin/optimize-png

@@ -1,120 +1,3 @@
 #!/usr/bin/env ruby
-require 'fileutils'
-
-# pngcrush -rem allb -reduce -brute original.png optimized.png
-# pngcrush -d target-dir/ *.png
-#
-# -rem allb — remove all extraneous data (Except transparency and gamma; to remove everything except transparency, try -rem alla)
-# -reduce — eliminate unused colors and reduce bit-depth (If possible)
-#
-# -brute — attempt all optimization methods (Requires MUCH MORE processing time and may not improve optimization by much)
-#
-# original.png — the name of the original (unoptimized) PNG file
-# optimized.png — the name of the new, optimized PNG file
-# -d target-dir/  — bulk convert into this directory "target-dir"
-#
-# -rem cHRM -rem sRGB -rem gAMA -rem ICC — remove color profiles by name (shortcut -rem alla)
-#
-# An article explaining why removing gamma correction
-# http://hsivonen.iki.fi/png-gamma/
-
-# Rails: file activesupport/lib/active_support/core_ext/string/starts_ends_with.rb, line 27
-def ends_with?(string, suffix)
-  string[-suffix.length, suffix.length] == suffix
-end
-
-def indented_puts(str="")
-  puts "  #{str}"
-end
-
-def print_manual
-  script_name = "optimize-png"
-
-  indented_puts
-  indented_puts script_name
-  indented_puts "=" *script_name.size
-  indented_puts "- Removes color profiles: cHRM, sRGB, gAMA, ICC, etc."
-  indented_puts "- Eliminates unused colors and reduce bit-depth (If possible)"
-  indented_puts "- May reduce PNG file size lossless"
-  indented_puts
-  indented_puts "Batch-optimize all *.png in a directory:"
-  indented_puts "  #{script_name} directory"
-  indented_puts
-  indented_puts "Batch-optimize the current directory:"
-  indented_puts "  #{script_name} ."
-  indented_puts
-  indented_puts "Optimize single file:"
-  indented_puts "  #{script_name} input.png"
-  indented_puts
-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
-end
-
-def optimize_file(input_file, output_file)
-  system "pngcrush #{optimization_default_args} '#{input_file}' '#{output_file}'"
-end
-
-def unused_tempfile_path(original)
-  dirname = File.dirname(original)
-  basename = File.basename(original)
-  count = 0
-  begin
-    tmp_name = "#{dirname}/#{basename}_temp_#{count += 1}.png"
-  end while File.exists?(tmp_name)
-  tmp_name
-end
-
-def optimize_inplace(input_file)
-  temp_file = unused_tempfile_path(input_file)
-  result = optimize_file(input_file, temp_file)
-  if result.nil?
-    puts "Error was #{$?}"
-  else
-    FileUtils.rm(input_file)
-    FileUtils.mv("#{temp_file}", "#{input_file}")
-  end
-end
-
-def batch_optimize_inplace(path)
-  # 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")
-  end
-  png_relative_paths.each do |png_relative_path|
-    optimize_inplace(png_relative_path)
-  end
-end
-
-def main
-  if `which pngcrush`.strip == ""
-    indented_puts
-    indented_puts "You have to install pngcrush first: sudo apt-get install pngcrush"
-    indented_puts
-  elsif ARGV.size == 1
-    path = ARGV[0]
-    if File.directory?(path)
-      batch_optimize_inplace(path)
-    elsif File.file?(path)
-      optimize_inplace(path)
-    else
-      print_manual
-      indented_puts "*** Error: '#{path}' is neither a directory nor a file ***"
-      indented_puts
-    end
-  else
-    print_manual
-  end
-end
-
-main()
-
-
-
 
+exec 'geordi', 'png-optimize', *ARGV

data/bin/power-rake

@@ -1,9 +1,3 @@
 #!/usr/bin/env ruby
 
-for env in %w[development test cucumber performance]
-  if File.exists? "config/environments/#{env}.rb"
-    call = ['b', 'rake'] + ARGV + ["RAILS_ENV=#{env}"]
-    puts call.join(' ')
-    system *call
-  end
-end
+exec 'geordi', 'rake', *ARGV

data/bin/remove-executable-flags

@@ -1,8 +1,3 @@
 #!/usr/bin/env ruby
 
-puts "Removing executable-flags:"
-for pattern in %w[ *.rb *.html *.erb *.haml *.yml *.css *.sass *.rake *.png *.jpg *.gif *.pdf *.txt *.rdoc Rakefile VERSION README Capfile ]
-  puts "- #{pattern}"
-  `find . -name "#{pattern}" -exec chmod -x {} ';'`
-end
-puts "Done."
+exec 'geordi', 'remove-executable-flags'

data/bin/rs

@@ -1,28 +1,3 @@
 #!/usr/bin/env ruby
 
-# Print some whitespace
-4.times { puts }
-puts "Running RSpec tests..."
-puts "======================"
-
-# Check if we're looking at a Rails 2 / rspec 1 project
-rspec1 = File.exists?('script/spec')
-rspec_args = rspec1 ? ["spec", "-c"] : ["rspec"]
-
-# Check if rspec_spinner is available
-spinner_available = File.exists?('Gemfile') && File.open('Gemfile').read.scan(/rspec_spinner/).any?
-spinner_args = spinner_available ? ['-r', 'rspec_spinner', '-f', 'RspecSpinner::Bar'] : []
-
-# Check if parallel_tests is available
-parallel_tests_available = ['rake', 'parallel:spec'] if File.exists?('Gemfile') && File.open('Gemfile').read.scan(/parallel_tests/).any?
-
-use_parallel_tests = parallel_tests_available && (ARGV[0] == nil)
-
-if use_parallel_tests
-  puts "Using parallel_tests ...\n\n"
-  exec 'b rake parallel:spec'
-else
-  # Run rspec behind bundler
-  ARGV[0] ||= 'spec'
-  exec *["b", rspec_args, spinner_args, ARGV].flatten
-end
+exec 'geordi', 'rspec', *ARGV

data/bin/run_tests

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '../lib/geordi/run_tests')
 
-Geordi::RunTests.new.run
+exec 'geordi', 'with-firefox-for-selenium', *ARGV

data/bin/setup-firefox-for-selenium

@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi/firefox_for_selenium"
-require 'tempfile'
 
-Geordi::FirefoxForSelenium.install
+exec 'geordi', 'setup-firefox-for-selenium'

data/bin/shell-for

@@ -1,10 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/../lib/geordi/capistrano"
-include Geordi::Capistrano
 
-catching_errors do
-  self.stage = ARGV.shift
-  command = ARGV.any? ? ARGV.join(' ') : nil
-
-  shell_for(command, :select_server => true)
-end
+exec 'geordi', 'shell', *ARGV

data/bin/tests

@@ -1,7 +1,3 @@
 #!/usr/bin/env ruby
 
-# Delete any state from previous Cucumber failures
-File.delete 'rerun.txt' if File.exists? 'rerun.txt'
-
-# Run rspec and cucumber
-exec "rs && cuc"
+exec 'geordi', 'test'

data/geordi.gemspec

@@ -19,4 +19,23 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  # s.add_development_dependency 'debugger'
+
+  s.post_install_message = <<-ATTENTION
+
+    ********************************************
+
+    geordi 1.0.0 moves most of the scripts to
+    the `geordi` binary. Run `geordi` and
+    `geordi help <cmd>` for further information.
+
+    Tip: Create an alias for geordi for quick 
+    access. Add this to your ~/.bashrc:
+
+      alias g="geordi"
+
+    ********************************************
+
+  ATTENTION
 end

data/lib/geordi/COMMAND_TEMPLATE

@@ -0,0 +1,29 @@
+# This file serves as a template for adding new commands.
+# For more inspiration, see already implemented commands.
+
+# Since commands can be invoked by only typing their first letters, please try
+# to find a command name that has a unique prefix.
+
+desc 'command ARG [OPTIONAL]', 'one-line description'
+long_desc <<-LONGDESC # optional
+Start with an example: `command bla bla`
+
+Detailed description with anything the user needs to know.
+
+Short and long description are printed on the console AND included in the README
+by `rake update_readme`. Thus, please format descriptions in a way that's reader
+friendly both in Markdown and the console.
+LONGDESC
+
+option :opt, :type => :boolean, :aliases => '-o', :banner => 'VALUE_NAME',
+       :desc => 'If set, VALUE_NAME will be used for something'
+
+def setup
+  # Invoke other commands like this:
+  invoke_cmd 'other_command', 'argument', :an => 'option'
+
+  fail 'Option missing' unless options.opt?
+
+  # For formatted output, see geordi/interaction.rb
+  success 'Done.'
+end

data/lib/geordi/capistrano.rb

@@ -16,7 +16,7 @@ module Geordi
         @root = find_project_root!
         load_capistrano_config
       end
-      
+
       def user
         @capistrano_config.fetch(:user)
       end
@@ -24,7 +24,7 @@ module Geordi
       def servers
         @capistrano_config.find_servers(:roles => [:app])
       end
-      
+
       def primary_server
         @capistrano_config.find_servers(:roles => [:app], :only => { :primary => true }).first
       end
@@ -40,7 +40,7 @@ module Geordi
       def shell
         @capistrano_config.fetch(:default_shell, 'bash --login')
       end
-      
+
 
       private
 
@@ -49,7 +49,9 @@ module Geordi
         config.load('deploy')
         config.load('config/deploy')
         if @stage and @stage != ''
+          puts ::Capistrano::Version.to_s
           config.stage = @stage
+
           config.find_and_execute_task(stage)
         end
 
@@ -83,7 +85,7 @@ module Geordi
         exit 1
       end
     end
-    
+
     def select_server
       choose do |menu|
         config.servers.each do |server|
@@ -99,11 +101,11 @@ module Geordi
 
     def shell_for(command, options = {})
       server = options[:select_server] ? select_server : config.primary_server
-      
+
       remote_commands = [ 'cd', config.path ]
       remote_commands << '&&' << config.shell
       remote_commands << "-c '#{command}'" if command
-      
+
       args = [ 'ssh', %(#{config.user}@#{server}), '-t', remote_commands.join(' ') ]
       if options.fetch(:exec, true)
         exec(*args)
@@ -111,6 +113,6 @@ module Geordi
         system(*args)
       end
     end
-  
+
   end
 end