geordi 0.3.2 → 0.4.0

data/bin/console-for

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+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!'
+
+  if File.exists? "#{root}/script/console"
+    exec "shell-for #{stage} script/console #{stage}"
+  else
+    exec "shell-for #{stage} bundle exec rails console #{stage}"
+  end
+rescue Exception => e
+  $stderr.puts e.message
+  exit 1
+end

data/bin/dump-for

@@ -18,18 +18,16 @@ def find_project_root
 end
 
 begin
-  require 'rubygems'
-  require 'net/ssh'
-  
   stage = ARGV.shift
+  dump_name = "dump_for_download.dump"
   
-  find_project_root or raise 'Call me from inside a Rails project'
+  find_project_root or raise 'Call me from inside a Rails project!'
   
   data = if stage
     deploy_file = Dir['config/deploy/*.rb'].find do |file|
       file.match(/\/#{stage}.rb$/)
     end
-    deploy_file or raise "Unknown stage: #{stage}"
+    deploy_file or raise "Stage does not exist: #{stage}"
     
     File.open(deploy_file).readlines
   else
@@ -53,7 +51,9 @@ begin
   system command
 
   puts "Downloading dump_for_download..."
-  exec "scp #{user}@#{server}:~/dumps/dump_for_download.dump #{@project_root}"
+  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

data/bin/shell-for

@@ -19,8 +19,9 @@ end
 
 begin
   stage = ARGV.shift
+  remote_command = ARGV.join(' ').strip
   
-  find_project_root or raise 'Call me from inside a Rails project'
+  find_project_root or raise 'Call me from inside a Rails project!'
   
   data = if stage
     deploy_file = Dir['config/deploy/*.rb'].find do |file|
@@ -40,17 +41,20 @@ begin
   (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"
-  command = %(ssh #{user}@#{server})
+  ssh = %(ssh #{user}@#{server})
   
   if path.match /#\{.*\}/
     puts %(NOTE: "#{path}" is not a valid path.)
     puts %(NOTE: Connecting to deploy user home.)
+    puts
     sleep 2
+    
+    exec ssh
   else
-    command += %( -t "cd #{path} && bash --login")
+    command = remote_command.empty? ? "bash --login" : remote_command
+    
+    exec ssh + %( -t "cd #{path} && #{command}")
   end
-
-  exec command
   
 rescue Exception => e
   $stderr.puts e.message

data/lib/geordi/version.rb

@@ -1,3 +1,3 @@
 module Geordi
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 +02:00
+date: 2011-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ executables:
 - apache-site
 - b
 - cleanup-directory
+- console-for
 - cuc
 - dump-for
 - dumple
@@ -50,6 +51,7 @@ files:
 - bin/apache-site
 - bin/b
 - bin/cleanup-directory
+- bin/console-for
 - bin/cuc
 - bin/dump-for
 - bin/dumple