puppet-pssh 0.3 → 0.3.1

data/lib/puppet-pssh.rb

@@ -4,11 +4,12 @@ require 'excon'
 require 'json'
 require 'logger'
 require 'colored'
+require 'uri'
 require 'pp'
 
 module PuppetPSSH
 
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 
   if !defined? Log or Log.nil?
     Log = Logger.new($stdout)
@@ -27,7 +28,8 @@ module PuppetPSSH
 
 
   class BaseCommand < Clamp::Command
-    
+
+    option "--deactivated", :flag, "Include also deactivated nodes"
     option ["-m", "--match"], "REGEX", "Only the nodes matching the regex", :default => '.*'
     option ["-p", "--puppetmaster"], "PUPPETMASTER", "Puppet master host", :default => 'puppet'
     option ["-P", "--puppetmaster-port"], "PUPPETMASTER_PORT", "Puppet master port", :default => '8080'
@@ -40,8 +42,15 @@ module PuppetPSSH
       "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/"
     end
 
-    def get_nodes(puppetmaster)
-      url = "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/nodes"
+    def node_status(node)
+      JSON.parse(
+        Excon.get(master_url + "status/nodes/#{node}").body
+      )
+    end
+
+    def get_nodes(puppetmaster, include_deactivated = false)
+      query = URI.encode '["=", ["node", "active"], true]'
+      url = "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/nodes?query=#{query}"
       Log.debug "Puppet master host: #{puppetmaster}"
       Log.debug "Puppet master url: #{url}"
 
@@ -52,6 +61,16 @@ module PuppetPSSH
           next unless  n =~ /#{match}/
           nodes << n 
         end
+        # IF --deactivated, include also deactivated nodes
+        if deactivated?
+          query = URI.encode '["=", ["node", "active"], false]'
+          url = "#{use_ssl? ? 'https' : 'http'}://#{puppetmaster}:#{puppetmaster_port}/nodes?query=#{query}"
+          out = Excon.get url
+          JSON.parse(out.body).each do |n| 
+            next unless  n =~ /#{match}/
+            nodes << n 
+          end
+        end
       rescue TypeError => e
         raise Exception.new "Error retrieving node list from master host: #{puppetmaster}"
       rescue Excon::Errors::SocketError => e
@@ -94,12 +113,14 @@ module PuppetPSSH
             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'}"
+            status = node_status(n)
+            puts "  #{'name:'.ljust(20).yellow} #{n}"
+            if status['deactivated']
+              puts "  #{'deactivated:'.ljust(20).yellow} " +
+                 "yes (#{status['deactivated']})"
+            else
+              puts "  #{'deactivated:'.ljust(20).yellow} no"
+            end
             puts "  #{'catalog_timestamp:'.ljust(20).yellow} " + 
                  "#{status['catalog_timestamp']}"
             puts "  #{'facts_timestamp:'.ljust(20).yellow} " + 
@@ -110,6 +131,7 @@ module PuppetPSSH
         end
       rescue Exception => e
         Log.error e.message
+        Log.debug e.backtrace
         exit 1
       end
     end

metadata

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