puppet-pssh 0.2 → 0.3

data/lib/puppet-pssh.rb

@@ -4,10 +4,11 @@ require 'excon'
 require 'json'
 require 'logger'
 require 'colored'
+require 'pp'
 
 module PuppetPSSH
 
-  VERSION = "0.2"
+  VERSION = "0.3"
 
   if !defined? Log or Log.nil?
     Log = Logger.new($stdout)
@@ -29,12 +30,16 @@ module PuppetPSSH
     
     option ["-m", "--match"], "REGEX", "Only the nodes matching the regex", :default => '.*'
     option ["-p", "--puppetmaster"], "PUPPETMASTER", "Puppet master host", :default => 'puppet'
-    option "--puppetmaster-port", "PUPPETMASTER_PORT", "Puppet master port", :default => '8080'
+    option ["-P", "--puppetmaster-port"], "PUPPETMASTER_PORT", "Puppet master port", :default => '8080'
     option "--use-ssl", :flag, "Use SSL (https) to communicate with the puppetmaster", :default => false
     option "--debug", :flag, "Print debugging output", :default => false do |o|
       Log.level = Logger::DEBUG 
     end
 
+    def master_url
+      "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/"
+    end
+
     def get_nodes(puppetmaster)
       url = "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/nodes"
       Log.debug "Puppet master host: #{puppetmaster}"
@@ -59,9 +64,50 @@ module PuppetPSSH
 
   class List < BaseCommand 
 
+    option ["-a", "--all-facts"], :flag, "Print node facts", :default => false
+    option ["-f", "--fact"], "FACT", "Print fact value"
+    option "--with-facts", "FACTS", "Comman separated list of facts to look for"
+    option "--status", :flag, "Print node status"
+
     def execute
       begin
-        get_nodes(puppetmaster).each { |n| puts n }
+        get_nodes(puppetmaster).each do |n| 
+          next unless n =~ /#{match}/
+          if all_facts?
+            pp JSON.parse(Excon.get(master_url + "facts/#{n}").body)
+          elsif fact
+            value = JSON.parse(
+              Excon.get(master_url + "facts/#{n}").body
+            )['facts'][fact] || 'fact_not_found'
+            puts n 
+            puts "  #{fact.yellow}: " + value
+          elsif with_facts
+            facts = JSON.parse(
+              Excon.get(master_url + "facts/#{n}").body
+            )['facts']
+            keys = facts.keys
+            with_facts.split(',').each do |f|
+              if keys.include?(f)
+                puts n
+                break
+              end
+            end
+          elsif status?
+            puts n
+            status = JSON.parse(
+              Excon.get(master_url + "status/nodes/#{n}").body
+            )
+            puts "  #{'name:'.ljust(20).yellow} #{status['name']}"
+            puts "  #{'deactivated:'.ljust(20).yellow} " +
+                 "#{status['deactivated'] || 'no'}"
+            puts "  #{'catalog_timestamp:'.ljust(20).yellow} " + 
+                 "#{status['catalog_timestamp']}"
+            puts "  #{'facts_timestamp:'.ljust(20).yellow} " + 
+                 "#{status['facts_timestamp']}"
+          else
+            puts n 
+          end
+        end
       rescue Exception => e
         Log.error e.message
         exit 1
@@ -162,9 +208,14 @@ module PuppetPSSH
         Log.warn 'Disabled host key verification'
         ssh_opts = '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
       end
-      full_cmd = "#{pssh_path} #{extra_opts} -p #{threads} -o #{node_output_path} -t 300 -h #{hostlist_path} -x '#{ssh_opts}' " + "'#{command} 2>&1'"
-      Log.debug full_cmd
-      system full_cmd
+      if nodes.empty?
+        Log.warn 'The node list is empty.'
+        Log.warn 'If you are using --match, the regexp didn\'t match any node.'
+      else
+        full_cmd = "#{pssh_path} #{extra_opts} -p #{threads} -o #{node_output_path} -t 300 -h #{hostlist_path} -x '#{ssh_opts}' " + "'#{command} 2>&1'"
+        Log.debug full_cmd
+        system full_cmd
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-pssh
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored