owssh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5246505c2bfaca65a38d84873f926f898dbf7be0
-  data.tar.gz: f6485d1a241af713286c2cae25889846853caacb
+  metadata.gz: 14a2d860d3a2648cec43c800594c5c5d5013dd90
+  data.tar.gz: 5d80f0cb09a39460e001cf76b3f6e278a9273de6
 SHA512:
-  metadata.gz: e0ef6475bee232565cba57d6945a3c9093f317a1f4304bcaf913885759b70c4d73fbfff7007209d10e459e71b1043c8571573e3626c8fe03bf85d0239fa01902
-  data.tar.gz: 4a9db8b017f544bb78550f355c3d86344b3d356151780e5ea5a7d5429d8e6812ebbd92842492c4bcb208e234360bbca525cf3da502146112f0623f893b24234b
+  metadata.gz: d55539670799752744f78aabc641ff8b9cd6d9325f50c5dd9914215e66161553bbe73d9d93b9ef9d717e3c2835cd7563296b8e412dccb817bb14445e4bc75937
+  data.tar.gz: 5733a0b9ab0072a482442860299c0bc69d6a02f7e1ba8d6e2d5ad6803504e98a4b780d6ca605bfaeddfc8c7040c24034297c2dd482b03882594d71e3692624a3

data/lib/owssh.rb

@@ -110,6 +110,7 @@ class Owssh
         exit
       end
     elsif $stacks.has_key?(ARGV[0].downcase.to_s) then
+      # SSH to the host
       if ARGV[1].nil? then
         puts "Please enter an instance name. I.E. rails-app3"
         exit
@@ -120,12 +121,29 @@ class Owssh
         $instances["#{instance["Hostname"]}"] = instance["PublicIp"]
       end
       if $instances.has_key?(ARGV[1]) then
+        # Open interactive SSH connnection
         if ARGV[2].nil? then
           puts "Opening connection to #{ARGV[1]}..."
           exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[ARGV[1].to_s]}")
-        else
+        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]}'")
+        else
+          $first_instance = ""
+          $instances.each do |instance_name, data|
+            unless (instance_name =~ /#{ARGV[1].to_s}(.*)/).nil?
+              $first_instance = instance_name
+              break
+            end
+          end
+          if $first_instance == "" then
+            puts "Could not find suitable host of type #{ARGV[1]}"
+            exit
+          else
+            puts "Running comand #{ARGV[2]} on first host of type #{ARGV[1]} which is #{$first_instance}..."
+            exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$first_instance.to_s} '#{ARGV[2]}'")
+          end
         end
       else
         puts "Instance with name '#{ARGV[1]}' not found"

metadata

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