aws_csshx 0.1.2 → 0.1.3

data/Changelog.md

@@ -1,6 +1,10 @@
+### aws_csshx 0.1.3 2012-05-05
+
+ * Ability to add individual servers on the command line (Eric Lubow)
+
 ### aws_csshx 0.1.2 2012-05-04
 
- * Bug with listing servers
+ * Bug with listing servers (Eric Lubow)
 
 ### aws_csshx 0.1.1 2012-05-04
 

data/README.md

@@ -9,6 +9,7 @@ This is a wrapper script for ClusterSSHX (csshx).  It allows the user the abilit
 ### Configuration
 
 The easist way to configure this gem is to add the following 4 lines to your _~/.csshrc_ (replace with your values):
+
     aws_region = us-east-1
     aws_access_key = AAAAAAAAAAAAAAAAAAAA
     aws_secret_key = TaaaaaLNiYbbbbbJm6uuqphcccccXtZydddddDfd
@@ -21,3 +22,8 @@ The most common use/case of _aws_csshx_ is to just ssh into a security group.
 For instance, to SSH into the entire *utility* security group as *root*, do the following:
 
     aws_csshx -g 'utility' -l root
+
+## Authors
+
+ * Russell Bradberry <@devdazed>
+ * Eric Lubow <@elubow>

data/TODO.md

@@ -1,3 +1,7 @@
 ### TODO List for aws_csshx
 
- * Add ability to use -H/--hosts to tack on additional hosts to the SSH cluster
+ * Add testing
+ * Specify AWS secret and access key on the command
+ * Better method for system call
+ * Silence RightAws::Ec2 output
+ * Add logging for verbose output

data/lib/aws_csshx/application.rb

@@ -43,7 +43,7 @@ module AwsCsshx
           end
 
           # Deal with the option issues
-          if command_line_options[:invalid_argument]
+          if command_line_options.parsed? and command_line_options[:invalid_argument]
             $stderr.puts command_line_options[:invalid_argument]
             @options[:help] = true
           end
@@ -65,10 +65,15 @@ module AwsCsshx
 
           abort("Cannot continue without AWS security group (-g)") unless @options[:group]
           @server_list = aws_server_list_by_group @options[:group]
+          aws_server_count = @server_list.count
+
+          # Add any additional servers from the command line to the pool
+          add_servers_from_command_line if @options[:additional_servers]
 
           if has_servers? @server_list
             `csshx --login #{@options[:login]} --ssh_args='-i #{@options[:ec2_private_key]}' #{@server_list.join(' ')}`
-            puts "Opened connections to #{@server_list.count} servers in the '#{@options[:group]}' security group."
+            puts "Opened connections to #{aws_server_count} servers in the '#{@options[:group]}' security group."
+            puts "Opened connections to #{@options[:additional_servers].count} servers from command-line options." if @options[:additional_servers]
           else
             puts "No servers found...bailing out!"
           end
@@ -81,6 +86,10 @@ module AwsCsshx
         return 0
       end
 
+      def add_servers_from_command_line
+        @server_list.push(@options[:additional_servers]).flatten!.uniq! if @options[:additional_servers]
+      end
+
       def aws_server_list_by_group(group)
         @ec2_api ||= RightAws::Ec2.new(@options[:aws_access_key], @options[:aws_secret_key])
 

data/lib/aws_csshx/options.rb

@@ -1,6 +1,6 @@
 module AwsCsshx
   class Options < Hash
-    attr_reader :opts, :orig_args
+    attr_reader :opts, :orig_args, :parsed
 
     def initialize(args)
       super()
@@ -9,6 +9,7 @@ module AwsCsshx
 
       @orig_args = args.clone
 
+      @parsed = false
       options = {}
 
       require 'optparse'
@@ -31,6 +32,10 @@ module AwsCsshx
               options[:aws_region] = region
           end
 
+          o.on( '-H', '--hosts x,y,z', Array, 'Additional hosts to add to the group (comma separated)' ) do |server_list|
+              options[:additional_servers] = server_list
+          end
+
           o.separator ""
           o.separator "csshX Options"
 
@@ -84,6 +89,11 @@ module AwsCsshx
           @opts.parse(args, flags={ :delete_invalid_opts => true })
           self[:options] = options
       end
+      @parsed = true
+    end
+
+    def parsed?
+      @parsed
     end
   end
 end

data/lib/aws_csshx/version.rb

@@ -1,3 +1,3 @@
 module AwsCsshx
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_csshx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws