capssh 0.0.4 → 0.0.5

data/lib/capssh/version.rb

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

data/lib/capssh.rb

@@ -2,15 +2,20 @@ module Capssh
   class << self
 
     def execute(options={})
-      environment = options[:environment]
-      role = options[:role]
+      config = load_capistrano_configuration(options)
+      server = find_server(config, options)
+      exec ssh_command(config, server, options)
+    end
+
+    private
 
+    def load_capistrano_configuration(options)
       config = Capistrano::Configuration.new
       config.load(:file => "./config/deploy.rb")
 
-      if environment
-        config_file = "./config/deploy/#{environment}.rb"
-        display_error_and_exit("No stage file exists for '#{environment}'") unless File.exist?(config_file)
+      if options[:environment]
+        config_file = "./config/deploy/#{options[:environment]}.rb"
+        display_error_and_exit("No stage file exists for '#{options[:environment]}'") unless File.exist?(config_file)
         config.load(:file => config_file)
       end
 
@@ -18,25 +23,35 @@ module Capssh
         display_error_and_exit("Please specify a valid environment: #{valid_environments.join(", ")}")
       end
 
-      servers = config.find_servers(:roles => role)
-      display_error_and_exit("no servers could be found for environment '#{environment}' and role '#{role}'") if servers.empty?
+      config
+    end
+
+    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]}'")
+      end
+
+      servers.first
+    end
 
+    def ssh_command(config, server, options)
       user = config[:user] || ENV['USER']
-      server = servers.first
-      puts "Connecting to #{environment} #{role} at #{user}@#{server}..."
+
+      puts "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]}"
       end
 
-      ssh_command = "ssh #{user}@#{server}"
       if command
         puts "Running command: #{command}"
         ssh_command += " -t \"#{command}\""
       end
 
-      exec ssh_command
+      ssh_command
     end
 
     def display_error_and_exit(error)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capssh
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies: []
 description: A utility that allows you to easily SSH into a server defined in a capistrano
   configuration file.