owssh 0.0.24 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7c5df9ec5ed6e88be77d7d3c10da78e06f6ebd
-  data.tar.gz: 378312a4507c952bba9fb1bdedad5099de2b8499
+  metadata.gz: 7434709490670ead54c5b8208aeb2538aba01b05
+  data.tar.gz: 22b00f467185c3cac795fbfeff3050512d198c0f
 SHA512:
-  metadata.gz: 58e0c8b334a72df8e4262f953cd9233f2dee5e9d9c3aa37afea728ae04d00eb2ce4e94641e04a23ac54cd86c6edc61731bf46fcb31bf6daf2915db4f0eb9c347
-  data.tar.gz: 174e765b0e485b0cb71330eeaf5f464ab6f35fba8918463f36085cc8e447463a0d7fe6ee69c79e51c3c612a162a6c626329cbb6822cb94e4ab585f10aa7957fa
+  metadata.gz: 871f80bbd0ed339792a95d00b6ae2cbe1fae947ce82b2a150e27841f07d4c70258c761a2dee4983c0a28d6f6e52831d15263e145ca12c7e19571bf3e0e487487
+  data.tar.gz: fb3281260546a145b60f5961391bc48bebc9d19d02937f4758116e01f73f79f36621ed95af90c24bf29c469811eb1c328b975a8aa30c2896fc3d4c1c37ba9a8c

data/lib/owssh.rb

@@ -75,6 +75,10 @@ class Owssh
     end
   end
 
+  def ssh_connect(connect_user, su_to_user, ssh_key, command)
+
+  end
+
   def print_help
     puts "Version #{Gem.loaded_specs['owssh'].version}"
     puts ""
@@ -83,7 +87,7 @@ class Owssh
     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 "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..."
@@ -96,6 +100,7 @@ class Owssh
     $aws_profile = ENV['AWS_DEFAULT_PROFILE'] || "default"
     $ssh_key_file = ENV['OWSSH_SSH_KEY_FILE'] || "~/.ssh/id_rsa_owssh"
     $aws_config_file = ENV['OWSSH_AWS_CONFIG_FILE'] || ENV['AWS_CONFIG_FILE'] || "~/.aws/config.owssh"
+    $ssh_user = ENV['OWSSH_USER'] || "ubuntu"
 
     if ARGV.empty?
       puts "Please supply some options. Try 'owssh help' for available commands"
@@ -148,11 +153,11 @@ class Owssh
         # SSH to specific host
         if ARGV[2].nil? then
           puts "Opening SSH connection to #{ARGV[1]}..."
-          exec("ssh -i #{$ssh_key_file} ubuntu@#{$instances[ARGV[1].downcase.to_s]['PUB_IP']}")
+          exec("ssh -i #{$ssh_key_file} #{$ssh_user}@#{$instances[ARGV[1].downcase.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_key_file} ubuntu@#{$instances[ARGV[1].downcase.to_s]['PUB_IP']} '#{ARGV[2]}'")
+          exec("ssh -i #{$ssh_key_file} #{$ssh_user}@#{$instances[ARGV[1].downcase.to_s]['PUB_IP']} '#{ARGV[2]}'")
         end
       else
         # SSH to first instance of certain type
@@ -172,7 +177,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_key_file} ubuntu@#{$instances[$first_instance.to_s]['PUB_IP']} '#{ARGV[2]}'")
+          exec("ssh -i #{$ssh_key_file} #{$ssh_user}@#{$instances[$first_instance.to_s]['PUB_IP']} '#{ARGV[2]}'")
         end
       end
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owssh
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.26
 platform: ruby
 authors:
 - Philip Hutchins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command_line_reporter