owssh 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119757f4df66b0ce7363d69327d32c34ed7eed12
-  data.tar.gz: 07248084f1163c85906794fd5d6a6a0bc18fac68
+  metadata.gz: 660754a1350eb09b581b100f6eddd9f0ddb17321
+  data.tar.gz: 98d3cb4b997f4315ce10549b1556e16eb9cb1ed2
 SHA512:
-  metadata.gz: de09fcb9d6dfd78287994ebc0dbc4ee5958ba9b707fc05116f16b091e2f7ea475aae200d66e2291aecfb302b535bd4768252d9749870ab36f6edf0eda4b65b0b
-  data.tar.gz: 3dce13b0fc61e967d2050cc88e2fa5aa4e621f3a4e444f1e223af5be6e09dd1470bdf93dde50c88a5c3b171f54827004b235b3b97913f45fc9a784d59e980dad
+  metadata.gz: 9efe9cc6596060271d5bdef9ff1d61d725e1903bf1ff5f7940f0937d00dc929d351a64dc5f9bb341e6e369e756d9fd7eda50d5e691325ab9430c3ef9a5c09fac
+  data.tar.gz: d75f6cf39afa3a37065607f5b22fc030ba68c6ef89058a2f4c814d4ba49584dba46e6ad1563ef224399dba5ee9c206dc16293c36d45f255e01e34deb6a8f5f45

data/lib/owssh.rb

@@ -66,6 +66,19 @@ class Owssh
     end
   end
 
+  def print_help
+    puts "Usage:"
+    puts "owssh list - List all environments"
+    puts "owssh describe - Show details of hosts in all stacks"
+    puts "owssh describe [Stack Name] - Show details of a specific stack"
+    puts "owssh [Stack Name] [Hostname or Type] - SSH to a host in a stack"
+    puts "owssh [Stack Name] [Hostname or Type] \"Your command here\" - SSH to a host in a stack and run a command"
+    puts ""
+    puts " Type - The type of host. I.E. rails-app, resque, etc..."
+    puts " Hostname - The name of the host. I.E. rails-app1, resque1, etc..."
+    exit
+  end
+
   def owssh
     # Export environment variables for AWS CLI here
     $debug = false
@@ -73,12 +86,7 @@ class Owssh
     $owssh_config = "~/.owssh_conf"
 
     if ARGV.empty?
-      puts "Usage:"
-      puts "owssh list - List all environments"
-      puts "owssh describe - Show details of hosts in all stacks"
-      puts "owssh describe [Stack Name] - Show details of a specific stack"
-      puts "owssh [Stack Name] [Hostname] - SSH to a host in a stack"
-      puts "owssh [Stack Name] [Hostname] [Command]- SSH to a host in a stack and run a command"
+      puts "Please supply some options. Try 'owssh help' for available commands"
       exit
     end
 
@@ -87,7 +95,9 @@ class Owssh
 
     $stacks = get_stacks
 
-    if ARGV[0] == "list" then
+    if ARGV[0] == "help" then
+      print_help
+    elsif ARGV[0] == "list" then
       puts "Getting list of stacks..."
       print_stacks($stacks)
       exit
@@ -142,7 +152,11 @@ class Owssh
           puts "Could not find host with name or type of '#{ARGV[1]}'"
           exit
         else
-          puts "Running comand #{ARGV[2]} on first host of type #{ARGV[1]} which is #{$first_instance}..."
+          if ARGV[2].nil? then
+            puts "Running command '#{ARGV[2]}' on first host of type '#{ARGV[1]}' which is '#{$first_instance}'..."
+          else
+            puts "Running comand #{ARGV[2]} on host #{ARGV[1]}..."
+          end
           exec("ssh -i ~/.ssh/id_rsa_dev ubuntu@#{$instances[$first_instance.to_s]} '#{ARGV[2]}'")
         end
       end

metadata

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