Merge pull request #23 from blom/patch-6

Add an ssh_user option to the ssh command
petems · May 1, 2013 · cf17c6b · cf17c6b
2 parents ae8a498 + dac9021
commit cf17c6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/tugboat/cli.rb b/lib/tugboat/cli.rb
@@ -64,12 +64,17 @@ def images
                   :type => :string,
                   :aliases => "-p",
                   :desc => "The custom SSH Port to connect to"
+    method_option "ssh_user",
+                  :type => :string,
+                  :aliases => "-u",
+                  :desc => "Specifies which user to log in as"
     def ssh(name=nil)
       Middleware.sequence_ssh_droplet.call({
         "user_droplet_id" => options[:id],
         "user_droplet_name" => options[:name],
         "user_droplet_fuzzy_name" => name,
-        "user_droplet_ssh_port" => options[:ssh_port]
+        "user_droplet_ssh_port" => options[:ssh_port],
+        "user_droplet_ssh_user" => options[:ssh_user]
       })
     end
 

diff --git a/lib/tugboat/middleware/ssh_droplet.rb b/lib/tugboat/middleware/ssh_droplet.rb
@@ -19,7 +19,8 @@ def call(env)
           options.push("-p", "22")
         end
 
-        host_string = "#{env["config"].ssh_user}@#{env["droplet_ip"]}"
+        ssh_user = env["user_droplet_ssh_user"] || env["config"].ssh_user
+        host_string = "#{ssh_user}@#{env["droplet_ip"]}"
 
         options << host_string