knife-cssh 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b75656ede8c6472b81c390adcd7dbb30e5a587fe
-  data.tar.gz: 95698d86e540563eaab5d69d30430454cb775e42
+  metadata.gz: 6b140d9a065370a3698b0b55e56284ebcc8cccd1
+  data.tar.gz: fb6867caba3f6a95f5786c0488162bb09100d1a1
 SHA512:
-  metadata.gz: 572f2bd3d0509286abc3d1ec1f7a5cd5bb9ff84e3fd8326d857d81d44ab75b033b663889c5c7fb8e013bd1b535462a6d5f2cf336eee9fab7ce9471786007276f
-  data.tar.gz: a1076952adf9013a75bfa3a8ee3169bb2608fb7e4bf877dd7aeeac25783af740ebfc7469dfaab8f732b4532b0a92671bb653fe8ef9dda6be821ae35e6063d53a
+  metadata.gz: 3ec2c45d19bab083ec44e801f4d1a87a487a5faba412063de10c435c8b4b9b7072fd50fc55db4e081b5f809f1b10d943e0e9d4ead609b23fb4a1150181ed372f
+  data.tar.gz: fc1fee5218d680ce6fbbf0f0fd4f3d570c5c333c3e7bed60dc3c789b6439067a87b8d8f87f3f1ae5b7a193f95248271212113ece0993eae6e9601d06bd393fbd

data/README.md

@@ -22,3 +22,8 @@ Author
 ------
 
 Nicolas Szalay : < nicolas.szalay _at_ fotolia _dot_ com >
+
+Contributors
+------------
+
+Bence Kiglics : < bence.kiglics _at_ gmail _dot_ com >

data/lib/chef/knife/cssh-summon.rb

@@ -1,19 +1,71 @@
 require 'chef/knife'
 
 module KnifeCssh
+
+  def self.which(*cmds)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+
+    cmds.each do |cmd|
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+    end
+
+    return nil
+  end
+
+  def self.find_command(*cmds)
+    cmd = self.which *cmds
+    return cmd if not cmd.nil?
+
+    nil
+  end
+
   class CsshSummon < Chef::Knife
 
     banner "knife cssh summon QUERY"
 
+    option :login,
+      :short => '-l USER',
+      :long => '--login USER',
+      :description => 'Username to use for login',
+      :default => ENV['USER']
+
+    option :cssh_command,
+      :short => '-c COMMAND',
+      :long => '--cssh-command COMMAND',
+      :description => 'Command to use instead of cssh/csshX',
+      :default => KnifeCssh::find_command('csshX', 'cssh'),
+      :proc => Proc.new { |cmd| KnifeCssh::find_command(cmd) }
+
+    SPECIFIC_OPTIONS = {
+      'tmux-cssh' => {
+        :user_switch => '-u'
+      },
+      :default => {
+        :user_switch => '-l'
+      }
+    }
+
     deps do
       require 'chef/node'
       require 'chef/environment'
       require 'chef/api_client'
       require 'chef/knife/search'
+      require 'shellwords'
     end
 
     def run
       # this chef is mainly from chef own knife search command
+      if name_args.length < 1
+        puts 'Missing argument QUERY!'
+        show_usage
+        exit 1
+      end
+
       query = name_args[0]
       q = Chef::Search::Query.new
       escaped_query = URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
@@ -21,7 +73,8 @@ module KnifeCssh
 
       begin
         q.search('node', escaped_query, 'X_CHEF_id_CHEF_X asc', 0, 100) do |item|
-          result_items.push(item["fqdn"]) if item.has_key?("fqdn")
+          remote_host = extract_host item
+          result_items.push remote_host if not remote_host.nil?
         end
       rescue Net::HTTPServerException => e
         msg = Chef::JSONCompat.from_json(e.response.body)["error"].first
@@ -29,7 +82,37 @@ module KnifeCssh
         exit 1
       end
 
-      %x[cssh #{result_items.join(" ")}]
+      call_cssh result_items
+    end
+
+    private
+
+    def extract_host(item)
+      return item[:ec2][:public_ipv4] if item.has_key? :ec2
+      return item[:ipaddress] if not item[:ipaddress].nil?
+      item[:fqdn]
+    end
+
+    def call_cssh(hosts)
+      if config[:cssh_command].nil?
+        puts "Unable to find any suitable cssh command on PATH!"
+        exit 1
+      end
+
+      %x[#{config[:cssh_command]} #{get_impl_opt :user_switch} #{config[:login].shellescape} #{hosts.join(" ")}]
+    end
+
+    def get_impl_opt(key)
+      cmdname = cssh_command_name
+      if SPECIFIC_OPTIONS.has_key?(cmdname) and SPECIFIC_OPTIONS[cmdname].has_key?(key)
+        return SPECIFIC_OPTIONS[cmdname][key]
+      end
+
+      SPECIFIC_OPTIONS[:default][key]
+    end
+
+    def cssh_command_name
+      File.basename config[:cssh_command]
     end
   end
 end

data/lib/knife-cssh.rb

@@ -1,3 +1,3 @@
 module KnifeCssh
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-cssh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nicolas Szalay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Summon cssh from a chef search
 email: nico@rottenbytes.info