Make knife ssh cssh platform agnostic

Mathieu Sauve-Frankel added a comment - 07/May/12 7:51 AM I've uploaded an attempt at this to my fork on github. https://github.com/kisoku/chef/tree/CHEF-3085

Mathieu Sauve-Frankel added a comment - 07/May/12 8:00 AM Please review.

Mathieu Sauve-Frankel added a comment - 07/May/12 2:15 PM - edited My first attempt at this diff did not work as expected. Here is a second cut. From 65d109d327f67efe9aacd2812b826c79e0da1a40 Mon Sep 17 00:00:00 2001 From: Mathieu Sauve-Frankel <msf@kisoku.net> Date: Mon, 7 May 2012 23:09:35 +0900 Subject: [PATCH] rename knife ssh csshx to cssh make the command try a few well known names for cssh to make this subcommand more platform neutral --- chef/lib/chef/knife/ssh.rb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/chef/lib/chef/knife/ssh.rb b/chef/lib/chef/knife/ssh.rb index cb15102..06e558c 100644 --- a/chef/lib/chef/knife/ssh.rb +++ b/chef/lib/chef/knife/ssh.rb @@ -330,12 +330,24 @@ class Chef "fqdn").strip end - def csshx - csshx_cmd = "csshX" + def cssh + cssh_cmd = nil + %w[csshX cssh].each do |cmd| + begin + if Chef::Mixin::Command.run_command(:command => "which #{cmd}").success? + cssh_cmd = cmd + break + end + rescue Chef::Exceptions::Exec + end + end + raise Chef::Exceptions::Exec "no command found for cssh" unless cssh_cmd + session.servers_for.each do |server| - csshx_cmd << " #{server.user ? "#{server.user}@#{server.host}" : server.host}" + cssh_cmd << " #{server.user ? "#{server.user}@#{server.host}" : server.host}" end - exec(csshx_cmd) + Chef::Log.debug("starting cssh session with command: #{cssh_cmd}") + exec(cssh_cmd) end def get_stripped_unfrozen_value(value) @@ -372,8 +384,8 @@ class Chef tmux when "macterm" macterm - when "csshx" - csshx + when "cssh" + cssh else ssh_command(@name_args[1..-1].join(" ")) end -- 1.7.9.5

Bryan McLellan [Opscode] added a comment - 14/May/12 11:14 PM This should have an alias for csshx -> cssh with a deprecation message so folks aren't shocked by their feature disappearing. It should also use mixlib-shellout instead of run_command, as that is the new standard library for running system commands. See Chef::Mixin::ShellOut.shell_out!

Bryan McLellan [Opscode] added a comment - 14/May/12 11:16 PM Unit tests would be nice too, but it looks like 'knife ssh' doesn't have any to build on.

Mathieu Sauve-Frankel added a comment - 15/May/12 10:37 PM new version pushed to github https://github.com/kisoku/chef/commit/51fde95305c70acfe179cb60dab4df4da68431c3

Bryan McLellan [Opscode] added a comment - 21/May/12 6:59 PM Thanks msf, marked for merge.

Bryan McLellan [Opscode] added a comment - 19/Jun/12 10:07 PM Merged to master, thanks dude.