ruby-puppetdb 1.5.3 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTA2YjgzMzBiY2EwMzVmOTdhNzhkOTI2NzZmZWVhZTBjZTZkNTY5MA==
+    ZDI4NDc5MGUxNTllOWNlZGE2OGM1MWNhN2E4MmZjZjgwNTdmY2NkYw==
   data.tar.gz: !binary |-
-    OGRiZDc4ZDIzYTAxMzNkMGQ3ZmIwMzA5NTg1MzlkZmUyY2E0MjM1Yw==
+    YjE0ODI1ZWVlMjE2MTUxNjczYWM1MTFjYzg0ZTNjMzM5ZTZlYzc4Yg==
 SHA512:
   metadata.gz: !binary |-
-    OTQ1ZTVjYjQ1MTE0ZDczY2U3NWYxY2NjZjhkY2VhZTQ4MWY5MTI0MDRjNzlk
-    ZGU5NTkwYmFmZGY3M2Y5NmU5MmE2NmUxYTAzYjIwZGY2OTdiMzEwMzhhOTU1
-    NTFkMDcxZjgzNWQzNjBjNzg3NTZjZjdiMTdiMjJhOGQyZjg3NzY=
+    MWVhNDlhODY5ZTg4MGViMDZmMDRjNDA3ZmJlNjJlYjg3MmM2ZWQ0ODNiMmNm
+    ZDE1NzhkYmNjNTY3MzM3ODMyY2U1MmU0ZDQ3YTdjMTAxYTFkZDg0YWU4Nzcz
+    NGFlM2E1ZDY4MDQ5ODgwYjI1MTE5ZjNiZWE5ZjM2N2FjNGExYjg=
   data.tar.gz: !binary |-
-    MTk4YWY4MjgwMDdmMzFmOTYzZTJhYjBlYWM4YTEzOWExNGNhMmZiNjFlOTZk
-    ZjExNDIzY2NlNjI0OGQxMmEzNDhlZmRmZDMxOTcyY2UxMWJhMzQ5N2Q3NmNm
-    NjZiOTdhN2MyN2I0Y2YxMDM5YWUzMTkxZGNkOGMyMTM2MGQ3ZmI=
+    OTA3ZmI0NjEzYWE0Yzc1MzkxMDljODFkZjM4NWJhYzA4N2VlOTNmNTk0NjA5
+    MTk0MjUzNGY3NjhkY2U1YzE4MDM4MjJjYzk2MzBlNzllMmU0OTUxMzRjNmZh
+    N2E3YjI4MjcwNDIyNjZiZGU3YjVkOTMzN2I1YzI4ODI2YzM4YWY=

data/bin/find-nodes

@@ -29,6 +29,10 @@ opt.on("--facts [FACT]", "-f", "Comma separated list of facts") do |v|
   options[:facts] = v.split ','
 end
 
+opt.on("--timeout [SECONDS]", "-t", "PuppetDB read timeout") do |v|
+  options[:timeout] = v.to_i
+end
+
 opt.parse!
 
 options[:query] ||= ARGV[0]
@@ -39,6 +43,8 @@ puppetdb = PuppetDB::Connection.new(options[:puppetdb_host], options[:puppetdb_p
 http = Net::HTTP.new(options[:puppetdb_host], options[:puppetdb_port])
 http.use_ssl = true
 http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+http.read_timeout = options[:timeout] if options[:timeout]
+
 if options[:facts]
   query = puppetdb.parse_query(options[:query], :facts)
   facts = puppetdb.facts(options[:facts], query, http)

data/lib/hiera/backend/puppetdb_backend.rb

@@ -40,7 +40,7 @@ class Hiera
 
           if fact then
             query = @puppetdb.parse_query query, :facts if query.is_a? String
-            @puppetdb.facts([fact], query).each_value.collect { |facts| facts[fact] }
+            @puppetdb.facts([fact], query).each_value.collect { |facts| facts[fact] }.sort
           else
             query = @puppetdb.parse_query query, :nodes if query.is_a? String
             @puppetdb.query(:nodes, query).collect { |n| n['name'] }

data/lib/puppet/face/query.rb

@@ -110,7 +110,12 @@ Puppet::Face.define(:query, '1.0.0') do
     end
 
     when_invoked do |query, options|
-      require 'chronic'
+      begin
+        require 'chronic'
+      rescue LoadError
+        Puppet.err "Failed to load 'chronic' dependency. Install using `gem install chronic`"
+        raise $!
+      end
 
       puppetdb = PuppetDB::Connection.new options[:puppetdb_host], options[:puppetdb_port]
       nodes = puppetdb.query(:nodes, puppetdb.parse_query(query, :nodes)).collect { |n| n['name']}
@@ -123,7 +128,7 @@ Puppet::Face.define(:query, '1.0.0') do
       nodes.each_slice(20) do |nodeslice|
         eventquery = ['and', ['>', 'timestamp', starttime], ['<', 'timestamp', endtime], ['or', *nodeslice.collect { |n| ['=', 'certname', n]}]]
         eventquery << ['=', 'status', options[:status]] if options[:status] != 'all'
-        events.concat puppetdb.query(:events, eventquery, nil, :experimental)
+        events.concat puppetdb.query(:events, eventquery, nil, :v3)
       end
 
       events.sort_by do |e|

data/lib/puppet/parser/functions/query_resources.rb

@@ -1,13 +1,15 @@
-Puppet::Parser::Functions.newfunction(:query_resources, :type => :rvalue, :arity => 2, :doc => <<-EOT
+Puppet::Parser::Functions.newfunction(:query_resources, :type => :rvalue, :arity => -3, :doc => <<-EOT
 
-  Accepts two arguments: a query used to discover nodes, and a
+  Accepts two or three arguments: a query used to discover nodes, a
   resource query for the resources that should be returned from
-  those hosts.
+  those hosts, and optionally a boolean for whether or not to group the results by host.
 
-  The result is a hash that maps the name of the nodes to a list of
+  The result is a hash (by default) that maps the name of the nodes to a list of
   resource entries.  This is a list because there's no single
   reliable key for resource operations that's of any use to the end user.
 
+  If the third parameters is false the result will be a an array of all resources found.
+
   Examples:
 
     Returns the parameters and such for the ntp class for all CentOS nodes:
@@ -22,9 +24,13 @@ Puppet::Parser::Functions.newfunction(:query_resources, :type => :rvalue, :arity
 
       query_resources(false, 'Class["apache"]')
 
+    Returns the parameters for the apache class for all nodes in a flat array:
+
+      query_resources(false, 'Class["apache"]', false)
+
 EOT
 ) do |args|
-  nodequery, resquery = args
+  nodequery, resquery, grouphosts = args
 
   require 'puppet/util/puppetdb'
   # This is needed if the puppetdb library isn't pluginsynced to the master
@@ -38,5 +44,5 @@ EOT
   puppetdb = PuppetDB::Connection.new(Puppet::Util::Puppetdb.server, Puppet::Util::Puppetdb.port)
   nodequery = puppetdb.parse_query nodequery, :facts if nodequery and nodequery.is_a? String and ! nodequery.empty?
   resquery = puppetdb.parse_query resquery, :none if resquery and resquery.is_a? String and ! resquery.empty?
-  return puppetdb.resources(nodequery, resquery)
+  return puppetdb.resources(nodequery, resquery, nil, grouphosts)
 end

data/lib/puppetdb.rb

@@ -1,4 +1,4 @@
 module PuppetDB
   # Current version of this module
-  VERSION = [1,5,3]
+  VERSION = [1,6,0]
 end

data/lib/puppetdb/astnode.rb

@@ -72,7 +72,13 @@ class PuppetDB::ASTNode
       when :nodes,:facts # Do a subquery to match nodes matching the facts
         return subquery(mode, :facts, ['and', ['=', 'name', @children[0].evaluate(mode)], [op, 'value', @children[1].evaluate(mode)]])
       when :resources
-        return [op, ['parameter', @children[0].evaluate(mode)], @children[1].evaluate(mode)]
+        paramname = @children[0].evaluate(mode)
+        case paramname
+        when "tag"
+          return [op, paramname, @children[1].evaluate(mode)]
+        else
+          return [op, ['parameter', paramname], @children[1].evaluate(mode)]
+        end
       end
     when :string
       return @value.to_s

data/lib/puppetdb/connection.rb

@@ -4,6 +4,9 @@ class PuppetDB::Connection
   require 'rubygems'
   require 'puppetdb/parser'
   require 'uri'
+  require 'puppet/util/logging'
+
+  include Puppet::Util::Logging
 
   def initialize(host='puppetdb', port=443, use_ssl=true)
     @host = host
@@ -51,8 +54,9 @@ class PuppetDB::Connection
   #
   # @param resquery [Array] a resources query for what resources to fetch
   # @param nodequery [Array] the query to find the nodes to fetch resources for, optionally empty
-  # @return [Hash] a hash of hashes with resources for each node mathing query
-  def resources(nodequery, resquery, http=nil)
+  # @param grouphosts [Boolean] whether or not to group the results by the host they belong to
+  # @return [Hash|Array] a hash of hashes with resources for each node mathing query or array if grouphosts was false
+  def resources(nodequery, resquery, http=nil, grouphosts=true)
     if resquery and ! resquery.empty?
       if nodequery and ! nodequery.empty?
         q = ['and', resquery, nodequery]
@@ -63,12 +67,19 @@ class PuppetDB::Connection
       raise RuntimeError, "PuppetDB resources query error: at least one argument must be non empty; arguments were: nodequery: #{nodequery.inspect} and requery: #{resquery.inspect}"
     end
     resources = {}
-    query(:resources, q, http).each do |resource|
-      unless resources.has_key? resource['certname']
-        resources[resource['certname']] = []
+    results = query(:resources, q, http)
+
+    if grouphosts
+      results.each do |resource|
+        unless resources.has_key? resource['certname']
+          resources[resource['certname']] = []
+        end
+        resources[resource['certname']] << resource
       end
-      resources[resource['certname']] << resource
+    else
+      resources = results
     end
+
     return resources
   end
 
@@ -89,6 +100,8 @@ class PuppetDB::Connection
     uri = "/#{version}/#{endpoint}"
     uri += URI.escape "?query=#{query.to_json}" unless query.nil? || query.empty?
 
+    debug("PuppetDB query: #{query.to_json}")
+
     resp = http.get(uri, headers)
     raise "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
     JSON.parse(resp.body)

data/spec/unit/puppetdb/connection_spec.rb

@@ -43,6 +43,10 @@ describe PuppetDB::Connection do
       connection.parse_query('file[foo]{bar=baz}').should eq ["in", "name", ["extract", "certname", ["select-resources", ["and", ["=", "exported", false], ["=", "type", "File"], ["=", "title", "foo"], ["=", ["parameter", "bar"], "baz"]]]]]
     end
 
+    it "should parse resource queries with tags" do
+      connection.parse_query('file[foo]{tag=baz}').should eq ["in", "name", ["extract", "certname", ["select-resources", ["and", ["=", "exported", false], ["=", "type", "File"], ["=", "title", "foo"], ["=", "tag", "baz"]]]]]
+    end
+
     it "should handle precedence within resource parameter queries" do
       connection.parse_query('{foo=1 or bar=2 and baz=3}').should eq ["in", "name", ["extract", "certname", ["select-resources", ["and", ["=", "exported", false], ["or", ["=", ["parameter", "foo"], 1], ["and", ["=", ["parameter", "bar"], 2], ["=", ["parameter", "baz"], 3]]]]]]]
       connection.parse_query('{(foo=1 or bar=2) and baz=3}').should eq ["in", "name", ["extract", "certname", ["select-resources", ["and", ["=", "exported", false], ["or", ["=", ["parameter", "foo"], 1], ["=", ["parameter", "bar"], 2]], ["=", ["parameter", "baz"], 3]]]]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-puppetdb
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Dan Bode
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -143,6 +143,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet-blacksmith
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A higher level query language for PuppetDB.
 email:
 - dan@puppetlabs.com
@@ -208,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Query functions for PuppetDB