ruby-puppetdb 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f199ac32e1da71ed00c19f6b157660787d08a86
-  data.tar.gz: 53c9970cb340bc587b2b3cdec6aaeda8133c5e40
+  metadata.gz: 88be7794aca945016db299dffdd58a3bfbddcbc5
+  data.tar.gz: c90c01f08accf3a7ba7e66ac8b6360a63d77ed15
 SHA512:
-  metadata.gz: 385d225ca591427dde487a9d9a3232cc016b936c7c9014394361bee489109c6b963a5ab141e3dd3f76b5c0819ad04b3dea8edaae093b93236fd9c584f459d8f1
-  data.tar.gz: afbb1e20ae8091011201d092aadfb6a7696b680cac65a7d3cc49800b986d37d88398655c382ae7266b63f3b5b0e81507eebe292afca72dad29430e2f70792fc9
+  metadata.gz: ffc5acdeb4cb4066c6aea9a567774cf91dc50cf3b4e313b382f949ba5301ed2de43daf7be04c177fb049d2f28e4de7b2466ba906c3c909359be06400e883b48b
+  data.tar.gz: a75d1b296d2207410e49b3fe3e4f151f4eca44b62d5a27043a980421cdde123604150ddfec5a1deff7c98a989c7974e00c087d8ef9955e221a07fd6b9dc96c8d

data/lib/puppet/application/{query.rb → puppetdbquery.rb}

@@ -1,6 +1,6 @@
 require 'puppet/application/face_base'
 
-class Puppet::Application::Query < Puppet::Application::FaceBase
+class Puppet::Application::Puppetdbquery < Puppet::Application::FaceBase
   def self.setting
     use_ssl = true
     begin

data/lib/puppet/face/{query.rb → puppetdbquery.rb}

@@ -2,13 +2,13 @@ require 'puppet/application/query'
 require 'puppet/face'
 require 'puppet/util/colors'
 
-Puppet::Face.define(:query, '1.0.0') do
+Puppet::Face.define(:puppetdbquery, '1.0.0') do
   require 'puppetdb/connection'
   PuppetDB::Connection.check_version
 
   extend Puppet::Util::Colors
 
-  copyright 'Erik Dalen & Puppet Labs', 2012..2015
+  copyright 'Erik Dalen', 2012..2017
   license 'Apache 2 license; see COPYING'
 
   option '--host PUPPETDB' do

data/lib/puppet/functions/puppetdb_lookup_key.rb

@@ -0,0 +1,34 @@
+# The `puppetdb_lookup_key` is a hiera 5 `lookup_key` data provider function.
+# See (https://docs.puppet.com/puppet/latest/hiera_custom_lookup_key.html) for
+# more info.
+#
+# See README.md#hiera-backend for usage.
+#
+Puppet::Functions.create_function(:puppetdb_lookup_key) do
+
+  dispatch :puppetdb_lookup_key do
+    param 'String[1]', :key
+    param 'Hash[String[1],Any]', :options
+    param 'Puppet::LookupContext', :context
+  end
+
+  def puppetdb_lookup_key(key, options, context)
+    return context.cached_value(key) if context.cache_has_key(key)
+
+    if !key.end_with?('::_nodequery') && nodequery = call_function('lookup', "#{key}::_nodequery", 'merge' => 'first', 'default_value' => nil)
+      # Support specifying the query in a few different ways
+      query, fact, sort = case nodequery
+                          when Hash then [nodequery['query'], nodequery['fact'], nodequery['sort']]
+                          when Array then nodequery
+                          else [nodequery.to_s, nil, nil]
+                          end
+
+      paramz = [query, fact].compact
+      result = call_function('query_nodes', *paramz)
+      result.sort! if sort
+      context.cache(key, result)
+    else
+      context.not_found
+    end
+  end
+end

data/lib/puppetdb.rb

@@ -1,4 +1,4 @@
 module PuppetDB
   # Current version of this module
-  VERSION ||= [2, 3, 0].freeze
+  VERSION ||= [3, 0, 0].freeze
 end

data/lib/puppetdb/parser_helper.rb

@@ -46,7 +46,10 @@ module PuppetDB::ParserHelper
     fact_hash.reduce({}) do |ret, fact|
       # Array#include? only matches on values of the same type, so if we find
       # a matching string, it's not a nested query.
-      name, value = if facts.include?(fact['name']) || facts == [:all]
+      name, value = if facts.include?(fact['name']) || facts == [:all] ||
+                      # in case a regex pattern is used in the facts query
+                      facts.index{ |factname| factname =~ /^\/(.+)\/$/ && Regexp.new(factname.match(/^\/(.+)\/$/)[1]).match(fact['name']) }
+
                       [fact['name'], fact['value']]
                     else
                       # Find the set of keys where the first value is the fact name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-puppetdb
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Erik Dalen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -183,8 +183,9 @@ files:
 - examples/query_node_examples.pp
 - examples/query_resource_examples.pp
 - lib/hiera/backend/puppetdb_backend.rb
-- lib/puppet/application/query.rb
-- lib/puppet/face/query.rb
+- lib/puppet/application/puppetdbquery.rb
+- lib/puppet/face/puppetdbquery.rb
+- lib/puppet/functions/puppetdb_lookup_key.rb
 - lib/puppet/functions/query_facts.rb
 - lib/puppet/functions/query_nodes.rb
 - lib/puppet/parser/functions/query_facts.rb
@@ -224,17 +225,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Query functions for PuppetDB
 test_files:
-- spec/puppet/util/puppetdb.rb
-- spec/spec_helper.rb
 - spec/unit/puppetdb/parser_spec.rb
+- spec/spec_helper.rb
+- spec/puppet/util/puppetdb.rb
 - spec/functions/query_facts_spec.rb
-- spec/functions/query_nodes_spec.rb
 - spec/functions/query_resources_spec.rb
+- spec/functions/query_nodes_spec.rb
+- examples/query_node_examples.pp
 - examples/nova_functions.pp
 - examples/query_resource_examples.pp
-- examples/query_node_examples.pp