owssh 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9073124d247d3d0cc868605fdd04e38e23a4e30a
-  data.tar.gz: 5b265edf9b5a0a1e373e090ff82893fd0b499ac4
+  metadata.gz: 89e29716edeb3b2a79485f179a8cb20b47ad55dd
+  data.tar.gz: c804fca44ae34a035bf0cd4ca7ffdcee96f772f4
 SHA512:
-  metadata.gz: 0e6510435b1edea2595fdf5310d42e994cdd8d5db5f00f03658615489cffba3a33346563708d4ee38d3a8192df2084fb715a9b02a4046848e68e76e30f9a6dd0
-  data.tar.gz: 3794121b2db1b4192f44600c500a8d54dfca94b0e7414acc0168a19c6bdafb0196f3e639178ccdd5b70a4fa8e7fb26a42953d22247f4a1884ce4e59b5036eaf0
+  metadata.gz: 4e10bc353e45f2459bc6a44831acceac5dc0a9b03a533ec8b0f8a0917d8fce2db1a6713d1162481770e3d6a58c0dc8e201102adeb1e7d3e96f921de9f13682e0
+  data.tar.gz: f2d4ac0f1d5d2e3a775a47ec39354a3c60a335e9fc1da3389f7e8e8d6303b64780dfa6a2919410349cc607e37bff4f94a42c10d35a15683686f6d7cfa27ed363

data/lib/owssh.rb

@@ -25,15 +25,16 @@ class Owssh
     my_instances = {}
     instances_json = JSON.parse(`AWS_CONFIG_FILE=#{$aws_config_file} aws --profile #{$aws_profile} opsworks describe-instances --stack-id #{id}`)
     instances_json['Instances'].each do |instance|
-      pub_ip = instance['ElasticIp'] || instance['PublicIp'] || "DOWN"
+      pub_ip = instance['ElasticIp'] || instance['PublicIp'] || "N/A"
       priv_ip = instance['PrivateIp'] || "N/A"
+      status = instance['Status']
       match = instance['Hostname'].match(/(.*)\d+/) rescue nil
       if !match.nil? then
         type = match[1].to_s
       else
         type = "N/A"
       end
-      my_instances[instance['Hostname'].to_s] = { "PUB_IP" => pub_ip.to_s, "PRIV_IP" => priv_ip.to_s, "TYPE" => type }
+      my_instances[instance['Hostname'].to_s] = { "PUB_IP" => pub_ip.to_s, "PRIV_IP" => priv_ip.to_s, "TYPE" => type, "STATUS" => status }
     end
     my_instances
   end
@@ -45,6 +46,7 @@ class Owssh
         column('Public IP', :width => 15, :align => 'right')
         column('Private IP', :width => 15, :align => 'right')
         column('Type', :width => 16)
+        column('Status', :width => 8)
       end
       instances.each do |instance_name, data|
         row do
@@ -52,6 +54,7 @@ class Owssh
           column(data['PUB_IP'])
           column(data['PRIV_IP'])
           column(data['TYPE'])
+          column(data['STATUS'])
         end
       end
     end
@@ -155,13 +158,13 @@ class Owssh
         # SSH to first instance of certain type
         $first_instance = ""
         $instances.each do |instance_name, data|
-          unless (instance_name =~ /#{ARGV[1].to_s}(.*)/).nil? || data["PUB_IP"] == "DOWN"
+          unless (instance_name =~ /#{ARGV[1].to_s}(.*)/).nil? || data["STATUS"] == ( "stopped" || "pending" || "requested" || "pending" )
             $first_instance = instance_name
             break
           end
         end
         if $first_instance == "" then
-          puts "Could not find host with name or type of '#{ARGV[1]}'"
+          puts "Could not find valid host with name or type of '#{ARGV[1]}'"
           exit
         else
           if ARGV[2].nil? then
@@ -174,7 +177,7 @@ class Owssh
       end
     else
       puts "I don't quite understand what you're asking me to do..."
-      puts " Try running owssh with no arguments for help!"
+      puts " Try running 'owssh help' for help!"
       exit
     end
   end

metadata

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