geordi 0.4.0 → 0.4.1

data/README.md

@@ -30,11 +30,21 @@ Runs the given command under `bundle exec` if a `Gemfile` is present in your wor
 More information at http://makandra.com/notes/684-automatically-run-bundle-exec-if-required
 
 
+console-for
+-----------
+
+Opens a rails console remotely:
+
+    console-for staging
+
+More information at http://makandra.com/notes/1338-console-for-opens-a-rails-console-remotely-on-a-capistrano-deployment-target
+
+
 
 cuc
 -----
 
-Runs Cucumber with the arguments you want, bundle exec, cucumber_spinner detection, etc.:
+Runs Cucumber with the arguments you want: bundle exec, cucumber_spinner detection, etc.:
 
     cuc features/users.feature
 
@@ -55,7 +65,7 @@ More information at http://makandra.com/notes/951-shell-script-to-clean-up-a-pro
 dump-for
 --------
 
-Dumps the database on your server for a given [Capistrano multistage](https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension) deployment target, then copies the dump to your project root.
+Dumps the database on your server for a given [Capistrano multistage](https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension) deployment target.
 
     dump-for production
 
@@ -126,7 +136,7 @@ More information at http://makandra.com/notes/659-recursively-remove-unnecessary
 rs
 -----
 
-Runs RSpec with the arguments you want, RSpec 1/2 detection, bundle exec, rspec_spinner detection, etc.:
+Runs RSpec with the arguments you want: RSpec 1/2 detection, bundle exec, rspec_spinner detection, etc.:
 
     rs spec/models/user_spec.rb
 
@@ -140,13 +150,17 @@ Opens an SSH shell on the given [Capistrano multistage](https://github.com/capis
 
     shell-for production
 
+Now it can also be called with any command to be remotely executed before loading the bash. `--no-bash` skips the bash.
+
+    shell-for staging --no-bash top
+
 More information at http://makandra.com/notes/1209-script-to-open-an-ssh-shell-to-a-capistrano-deployment-target   
 
 
 tests
 --------------
 
-Runs both `rs` and `cu`. Call from any project directory:
+Runs both `rs` and `cuc`. Call from any project directory:
 
     tests
 

data/bin/console-for

@@ -14,10 +14,10 @@ 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}"
+  if File.exists? "#{root}/script/console" # => Rails 2
+    exec "shell-for #{stage} --no-bash script/console #{stage}"
   else
-    exec "shell-for #{stage} bundle exec rails console #{stage}"
+    exec "shell-for #{stage} --no-bash bundle exec rails console #{stage}"
   end
 rescue Exception => e
   $stderr.puts e.message

data/bin/shell-for

@@ -14,25 +14,26 @@ def find_project_root
     return nil if current == Dir.pwd
     current = Dir.pwd
   end
-  current
+  @project_root = current
 end
 
 begin
   stage = ARGV.shift
+  no_bash = ARGV.shift if ARGV.first == '--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['config/deploy/*.rb'].find do |file|
+    deploy_file = Dir["#{@project_root}/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
     []
-  end + File.open("config/deploy.rb").readlines
+  end + File.open("#{@project_root}/config/deploy.rb").readlines
 
   user      = unquote data.find{ |line| line =~ /^set :user, /}
   server    = unquote data.find{ |line| line =~ /^server / }
@@ -42,20 +43,20 @@ begin
   
   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.)
-    puts
     sleep 2
-    
-    exec ssh
   else
-    command = remote_command.empty? ? "bash --login" : remote_command
-    
-    exec ssh + %( -t "cd #{path} && #{command}")
+    commands << "cd #{path}"
   end
+  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

data/lib/geordi/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geordi
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Henning Koch