capssh 0.0.5 → 0.0.6

data/lib/capssh.rb

@@ -4,12 +4,14 @@ module Capssh
     def execute(options={})
       config = load_capistrano_configuration(options)
       server = find_server(config, options)
-      exec ssh_command(config, server, options)
+      exec_ssh_command ssh_command(config, server, options)
     end
 
     private
 
     def load_capistrano_configuration(options)
+      display_error_and_exit("No capistrano config file could be found in ./config/deploy.rb") unless File.exist?("./config/deploy.rb")
+
       config = Capistrano::Configuration.new
       config.load(:file => "./config/deploy.rb")
 
@@ -29,36 +31,47 @@ module Capssh
     def find_server(config, options)
       servers = config.find_servers(:roles => options[:role])
       if servers.empty?
-        display_error_and_exit("no servers could be found for environment '#{options[:environment]}' and role '#{options[:role]}'")
+        display_error_and_exit("No servers could be found for environment '#{options[:environment]}' and role '#{options[:role]}'")
       end
-
       servers.first
     end
 
     def ssh_command(config, server, options)
       user = config[:user] || ENV['USER']
 
-      puts "Connecting to #{options[:environment]} #{options[:role]} at #{user}@#{server}..."
+      log "Connecting to #{options[:environment]} #{options[:role]} at #{user}@#{server}..."
       ssh_command = "ssh #{user}@#{server}"
 
       command = nil
       if options[:console]
-        command = "cd #{config[:deploy_to]}/current; bundle exec rails console #{config[:rails_env]}"
+        command = "cd #{config[:deploy_to]}/current; if [ -f script/console ]; then bundle exec script/console #{config[:rails_env]}; else bundle exec rails console #{config[:rails_env]}; fi"
       end
 
       if command
-        puts "Running command: #{command}"
+        log "Running command: #{command}"
         ssh_command += " -t \"#{command}\""
       end
 
       ssh_command
     end
 
+    def exec_ssh_command(cmd)
+      exec cmd
+    end
+
     def display_error_and_exit(error)
-      puts "ERROR: #{error}"
+      display_error(error)
       exit(1)
     end
 
+    def display_error(error)
+      log "ERROR: #{error}"
+    end
+
+    def log(message)
+      puts message
+    end
+
     def valid_environments
       Dir.entries("./config/deploy").select { |f| f =~ /.rb$/ }.map { |f| f.sub(".rb", "") }
     end

data/lib/capssh/version.rb

@@ -1,3 +1,3 @@
 module Capssh
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capssh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
-dependencies: []
+date: 2013-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A utility that allows you to easily SSH into a server defined in a capistrano
   configuration file.
 email: