geordi 0.4.3 → 0.4.4

data/bin/console-for

@@ -1,25 +1,13 @@
 #!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/geordi"
+include Geordi
 
-def find_project_root
-  current = Dir.pwd
-  until (File.exists? 'Capfile')
-    Dir.chdir '..'
-    return nil if current == Dir.pwd
-    current = Dir.pwd
-  end
-  current
-end
-
-begin
-  stage = ARGV.shift
-  root = find_project_root or raise 'Call me from inside a Rails project!'
+catching_errors do
+  retrieve_data!
 
   if File.exists? "#{root}/script/console" # => Rails 2
-    exec "shell-for #{stage} --no-bash script/console #{stage}"
+    system "shell-for #{env} --no-bash script/console #{env}"
   else
-    exec "shell-for #{stage} --no-bash bundle exec rails console #{stage}"
+    system "shell-for #{env} --no-bash bundle exec rails console #{env}"
   end
-rescue Exception => e
-  $stderr.puts e.message
-  exit 1
-end
+end

data/bin/cuc

@@ -2,6 +2,8 @@
 
 # Print some whitespace
 4.times { puts }
+puts "Running Cucumber tests..."
+puts "========================="
 
 # Check if cucumber_spinner is available
 spinner_available = File.exists?('Gemfile') && File.open('Gemfile').read.scan(/cucumber_spinner/).any?
@@ -17,4 +19,4 @@ if use_parallel_tests
   exec *['b', 'rake', 'parallel:features', ARGV].flatten
 else
   exec *["b", "cucumber", format_args, ARGV].flatten
-end
+end

data/bin/dump-for

@@ -1,61 +1,19 @@
 #!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/geordi"
+include Geordi
 
-def unquote(line)
-  if line  
-    line.match(/["'](.*)["']/)
-    $1
-  end
-end
-
-def find_project_root
-  current = Dir.pwd
-  until (File.exists? 'Capfile')
-    Dir.chdir '..'
-    return nil if current == Dir.pwd
-    current = Dir.pwd
-  end
-  @project_root = current
-end
-
-begin
-  stage = ARGV.shift
-  dump_name = "dump_for_download.dump"
+catching_errors do
+  retrieve_data!
   
-  find_project_root or raise 'Call me from inside a Rails project!'
+  command = %(ssh #{user}@#{server} -t "cd #{path} && dumple #{env} --for_download")
+  success = system command
   
-  data = if stage
-    deploy_file = Dir['config/deploy/*.rb'].find do |file|
-      file.match(/\/#{stage}.rb$/)
-    end
-    deploy_file or raise "Stage does not exist: #{stage}"
-    
-    File.open(deploy_file).readlines
+  if success
+    puts "Downloading dump_for_download..."
+    system "scp #{user}@#{server}:~/dumps/dump_for_download.dump #{root}/tmp/#{env}.dump"
+    puts
+    puts "Dumped the #{env.upcase} database to: #{File.basename root}/tmp/#{env}.dump"
   else
-    []
-  end + File.open("config/deploy.rb").readlines
-
-  user        = unquote data.find{ |line| line =~ /^set :user,/}
-  server      = unquote data.find{ |line| line =~ /^server / }
-  deploy_to   = unquote data.find{ |line| line =~ /^set :deploy_to,/}
-  environment = unquote data.find{ |line| line =~ /^set :rails_env,/}
-  (user and server and deploy_to and environment) or raise "Could not find required data (user, server, deploy target and environment).\nUsage: dump-for DEPLOYMENT_STAGE"
-  
-  path = deploy_to + "/current"
-  if path.match /#\{.*\}/
-    puts %(NOTE: "#{path}" is not a valid path.)
-    puts %(NOTE: You will need to fetch the dump yourself.)
-    raise ""
+    raise "An error occurred. Aborting..."
   end
-
-  command = %(ssh #{user}@#{server} -t "cd #{path} && dumple #{environment} --for_download")
-  system command
-
-  puts "Downloading dump_for_download..."
-  system "scp #{user}@#{server}:~/dumps/#{dump_name} #{@project_root}/tmp/#{environment}.dump"
-  puts
-  puts "Dumped the #{environment.upcase} database to PROJECT_ROOT/tmp/#{environment}.dump"
-  
-rescue Exception => e
-  $stderr.puts e.message
-  exit 1
 end

data/bin/rs

@@ -2,6 +2,8 @@
 
 # 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')
@@ -25,4 +27,4 @@ if use_parallel_tests
 else
   # Run rspec behind bundler
   exec *["b", rspec_args, spinner_args, ARGV].flatten
-end
+end

data/bin/shell-for

@@ -1,63 +1,17 @@
 #!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../lib/geordi"
+include Geordi
 
-def unquote(line)
-  if line  
-    line.match(/["'](.*)["']/)
-    $1
-  end
-end
-
-def find_project_root
-  current = Dir.pwd
-  until (File.exists? 'Capfile')
-    Dir.chdir '..'
-    return nil if current == Dir.pwd
-    current = Dir.pwd
-  end
-  @project_root = current
-end
-
-begin
-  stage = ARGV.shift
-  no_bash = ARGV.shift if ARGV.first == '--no-bash'
-  remote_command = ARGV.join(' ').strip
+catching_errors do
+  retrieve_data!
+  no_bash         = ARGV.delete('--no-bash')
+  remote_command  = ARGV.join(' ').strip
   
-  find_project_root or raise 'Call me from inside a Rails project!'
-  
-  data = if stage
-    deploy_file = Dir["#{@project_root}/config/deploy/*.rb"].find do |file|
-      file.match(/\/#{stage}.rb$/)
-    end
-    deploy_file or raise "Stage does not exist: #{stage}"
-    
-    File.open(deploy_file).readlines
-  else
-    []
-  end + File.open("#{@project_root}/config/deploy.rb").readlines
-
-  user      = unquote data.find{ |line| line =~ /^set :user, /}
-  server    = unquote data.find{ |line| line =~ /^server / }
-  deploy_to = unquote data.find{ |line| line =~ /^set :deploy_to, /}
-  
-  (user and server and deploy_to) or raise "Could not find required data (user, server and deploy-target).\nUsage: shell-for DEPLOYMENT_STAGE"
-  
-  path = deploy_to + "/current"
   ssh = %(ssh #{user}@#{server})
 
-  commands = []
-  if path.match /#\{.*\}/
-    puts %(NOTE: "#{path}" is not a valid path.)
-    puts %(NOTE: Connecting to deploy user home.)
-    sleep 2
-  else
-    commands << "cd #{path}"
-  end
+  commands = [ "cd #{path}" ]
   commands << remote_command unless remote_command.empty?
   commands << "bash --login" unless no_bash
   
   exec ssh + %( -t "#{commands.join(' && ')}")
-
-rescue Exception => e
-  $stderr.puts e.message
-  exit 1
-end
+end

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/lib/geordi.rb

@@ -0,0 +1,62 @@
+module Geordi
+  
+  attr_accessor :stage, :user, :server, :path, :env, :root
+  
+  def catching_errors(&block)
+    begin
+      yield
+    rescue Exception => e
+      $stderr.puts e.message
+      exit 1
+    end
+  end
+  
+  def retrieve_data!
+    @stage = ARGV.shift
+    @root   = find_project_root!
+    
+    {}.tap do |data|
+      @lines = if stage
+        deploy_file = Dir['config/deploy/*.rb'].find do |file|
+          file.match(/\/#{stage}.rb$/)
+        end
+        deploy_file or raise "Stage does not exist: #{stage}"
+    
+        File.open(deploy_file).readlines
+      else
+        []
+      end
+      @lines += File.open("config/deploy.rb").readlines
+    
+      @user   = retrieve! "user", /^set :user,/
+      @server = retrieve! "server", /^server /
+      @path   = retrieve!("deploy_to", /^set :deploy_to,/) + '/current'
+      @env    = retrieve! "environment", /^set :rails_env,/
+    
+      # fix
+      %w[user server path env].each do |attr|
+        self.send(attr).gsub! /#\{site_id\}/, stage.sub(/_.*/, '')
+      end
+    end
+  end
+  
+  def find_project_root!
+    current = Dir.pwd
+    until (File.exists? 'Capfile')
+      Dir.chdir '..'
+      raise 'Call me from inside a Rails project!' if current == Dir.pwd
+      current = Dir.pwd
+    end
+    current
+  end
+  
+  def retrieve!(name, regex)
+    if line = @lines.find{ |line| line =~ regex }
+      line.match(/["'](.*)["']/)
+      $1
+    else
+      raise "Could not find :#{name} for stage '#{stage}'!\nAborting..."
+    end
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 +02:00
+date: 2011-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -65,6 +65,7 @@ files:
 - bin/shell-for
 - bin/tests
 - geordi.gemspec
+- lib/geordi.rb
 - lib/geordi/version.rb
 has_rdoc: true
 homepage: http://makandra.com
@@ -96,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geordi
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Collection of command line tools we use in our daily work with Ruby, Rails and Linux at makandra.