aws_csshx 0.1.3 → 0.1.4

data/Changelog.md

@@ -1,3 +1,8 @@
+### aws_csshx 0.1.4 2012-05-21
+
+ * Better error handling (Eric Lubow)
+ * Better system call checking (Eric Lubow)
+
 ### aws_csshx 0.1.3 2012-05-05
 
  * Ability to add individual servers on the command line (Eric Lubow)

data/TODO.md

@@ -2,6 +2,6 @@
 
  * 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
+ * Add ability to SSH to multiple groups

data/lib/aws_csshx/application.rb

@@ -6,6 +6,7 @@ module AwsCsshx
 
       def csshx_exists?
         `which csshx > /dev/null 2>&1`
+        $?.success?
       end
 
       def aws_settings_exist?
@@ -20,7 +21,7 @@ module AwsCsshx
         @options = {}
 
         # No need to go further unless csshX exists
-        abort('csshX file is required') unless csshx_exists?
+        raise OptionsError, "csshX file is required" unless csshx_exists?
 
         begin
           # First we load the config file and then process the command line
@@ -61,9 +62,10 @@ module AwsCsshx
           end
 
           # Stop here without all our AWS settings
-          abort("Invalid AWS settings") unless aws_settings_exist?
+          raise OptionsError, "Invalid AWS settings" unless aws_settings_exist?
+
+          raise OptionsError, "Cannot continue without AWS security group (-g)" unless @options[:group]
 
-          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
 
@@ -71,21 +73,38 @@ module AwsCsshx
           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(' ')}`
+            csshx_switches = create_csshx_switches
+            `csshx #{[csshx_switches, @server_list].join(' ')}`
             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!"
+            raise OptionsError, "No servers found in '#{@options[:group]}' group...bailing out!"
           end
+
+        rescue OptionsError => e
+          puts "Error: #{e}"
+
         rescue Exception => e
-          puts "Error: #{e.inspect}"
-          puts "Trace: #{e.backtrace.join('\n')}"
+          puts "#{e.class} Error: #{e}"
+          puts "Backtrace:\n#{e.backtrace.join("\n")}"
         end
 
         # Exit cleanly
         return 0
       end
 
+      def create_csshx_switches
+        switches = []
+
+        # Set the basics by default
+        switches.push('--login', @options[:login])
+        switches.push("--ssh_args='-i #{@options[:ec2_private_key]}'")
+
+        # Add the additional stuff specific to csshx
+        switches.push('--iterm2', @options[:iterm2]) if @options[:iterm2]
+        switches.push(@options[:csshx_opts]) if @options[:csshx_opts]
+      end
+
       def add_servers_from_command_line
         @server_list.push(@options[:additional_servers]).flatten!.uniq! if @options[:additional_servers]
       end

data/lib/aws_csshx/options.rb

@@ -1,4 +1,6 @@
 module AwsCsshx
+  class OptionsError < StandardError; end
+
   class Options < Hash
     attr_reader :opts, :orig_args, :parsed
 

data/lib/aws_csshx/version.rb

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

metadata

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