capssh 0.0.6 → 0.0.7

data/bin/capssh

@@ -18,7 +18,7 @@ require 'optparse'
 require 'capistrano'
 
 options = {:role => :app}
-OptionParser.new do |opts|
+option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: capssh [options]"
 
   opts.on("-e ENVIRONMENT", "--environment ENVIRONMENT", "Specify the environment to connect to") do |env|
@@ -33,6 +33,10 @@ OptionParser.new do |opts|
     options[:console] = true
   end
 
+  opts.on("-l", "--list", "List the servers defined for the specified environment/role.") do
+    options[:list_servers] = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -42,7 +46,14 @@ OptionParser.new do |opts|
     puts Capssh::VERSION
     exit
   end
-end.parse!
+end
+
+begin
+  option_parser.parse!
+rescue OptionParser::InvalidOption => e
+  puts option_parser
+  exit
+end
 
 options[:environment] ||= ARGV[0]
 Capssh.execute(options)

data/lib/capssh.rb

@@ -3,8 +3,13 @@ module Capssh
 
     def execute(options={})
       config = load_capistrano_configuration(options)
-      server = find_server(config, options)
-      exec_ssh_command ssh_command(config, server, options)
+      servers = find_servers(config, options)
+
+      if options[:list_servers]
+        log servers.join(', ')
+      else
+        exec_ssh_command ssh_command(config, servers.first, options)
+      end
     end
 
     private
@@ -28,12 +33,12 @@ module Capssh
       config
     end
 
-    def find_server(config, options)
+    def find_servers(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
+      servers
     end
 
     def ssh_command(config, server, options)

data/lib/capssh/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capssh
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec