owssh 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbad1df96654c2af9c216fe0af06b623adf63652
-  data.tar.gz: fa33bd9074851c888457763bf5407ab1005d884e
+  metadata.gz: 2df64e2216c65698450a4a8fa57ade6fa4cc7363
+  data.tar.gz: 9f77ada909874de1672a6c05399f50c5ac0e4dac
 SHA512:
-  metadata.gz: 8406a2465bc01976a8196ecf5a9445a64fdca3e4d18a62f0c5fad16be8caad99fff3c26a539dae4b60998231e4d98ffacc32c9c65761fcfb64d3752392c0c957
-  data.tar.gz: 4ff18a9b927446a6db604ce44cbc755b25ad1c41e1c88428ab4f74d8fadd86f32dd23534896a14dba90bb2b2d2e8128558a4cb974a04dfb87d556e628b81fe1e
+  metadata.gz: ce5d5b484168ce151401e26a4040289e0a541fffb1a7364a6b2e977b5641326ad412e1dc1454b80323246b00500592d24258917941921c12a3edbed34d14d14a
+  data.tar.gz: 842a10853d7a5fc135462027530fe63acfb27651dacaaed128e21091cc69fdd4561909cdcb81f9cfa2b13af346ee2f5e34a6e331bafaba42eaf25115fec830b2

data/lib/owssh.rb

@@ -130,25 +130,24 @@ class Owssh
         puts "Please enter an instance name. I.E. rails-app3"
         exit
       end
-      stack_arg = ARGV[0].downcase
-      instances_json = JSON.parse(`aws opsworks describe-instances --stack-id #{$stacks[stack_arg]}`)
-      instances_json['Instances'].each do |instance|
-        $instances["#{instance["Hostname"]}"] = instance["PublicIp"]
-      end
+
+      stack_name = ARGV[0].downcase
+      $instances = get_instances($stacks[stack_name])
+
       if $instances.has_key?(ARGV[1]) then
         # Open interactive SSH connnection
         if ARGV[2].nil? then
           puts "Opening SSH connection to #{ARGV[1]}..."
-          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[ARGV[1].to_s]}")
+          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[ARGV[1].to_s]['PUB_IP']}")
         elsif ARGV[3].nil? then
           # Run command through SSH on host
           puts "Running comand #{ARGV[2]} on host #{ARGV[1]}..."
-          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[ARGV[1].to_s]} '#{ARGV[2]}'")
+          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[ARGV[1].to_s]['PUB_IP']} '#{ARGV[2]}'")
         end
       else
         $first_instance = ""
         $instances.each do |instance_name, data|
-          unless (instance_name =~ /#{ARGV[1].to_s}(.*)/).nil?
+          unless (instance_name =~ /#{ARGV[1].to_s}(.*)/).nil? || data["PublicIp"] == "DOWN"
             $first_instance = instance_name
             break
           end
@@ -162,7 +161,7 @@ class Owssh
           else
             puts "Running command '#{ARGV[2]}' on first host of type '#{ARGV[1]}' which is '#{$first_instance}'..."
           end
-          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[$first_instance.to_s]} '#{ARGV[2]}'")
+          exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[$first_instance.to_s]['PUB_IP']} '#{ARGV[2]}'")
         end
       end
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: owssh
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Philip Hutchins