ruby-puppetdb 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ0Yjk1ZjhhYTY0NjAwZjZhNDlkZjllZWQxY2U5ZDFkOTc3NjUyOA==
+    YmEzMGI0YWE2YjMyNmE5YmJlZTM0ZTEzNWU5NzVkYTk0MWQ5NjAyZg==
   data.tar.gz: !binary |-
-    MTVkYzlkMjY4MDNjZTYwZGJlNzk4ODI1ZjQ3NjMwY2JiMDQwNmRmZA==
+    NWVjOGNiOGM2Y2EzOWFiODRhNDQ2MTliZjBjZDUxNmQ4NTMyNDg5MQ==
 SHA512:
   metadata.gz: !binary |-
-    YmY2YWM0Nzc4ZjVkZDI0OGRkYmUyNGQyZTA0NGJjNzk5YTYwZWUzNGRiNGUx
-    M2RiMjdlMDNlODQ4N2E3MDg5MjE0YjMyNGQ1YTQzMTRlNDAzMWI3OGZjZGVm
-    MzRjMGZhMWFmNzVmMGI1ZGQzOWJhYTczZDc3OWY2MTkyYjg4MTE=
+    YmE1MGQ2N2ZiNDUwODg5ZTJkOTEzMzczYWUzNjg0OTU3NDc2ZjE4MGU3MGMz
+    OGQ0YTY0OTIxYWI4ZWMzMTcwMmIxYTJlZmNjOWIzMzZkMTNmNTFiZWRiYzQ5
+    MTBhNmIxNDg1M2VkMGY2MzQ1YTc5NDQyM2EwNDA2MDExOWNiNGE=
   data.tar.gz: !binary |-
-    M2U3MTg1ZThjZWQzNjBkNjJhNDRlOGJmMmUyNjI4OTU5ZTNmYjQzNTI1NjVl
-    YTI1NzJmNTE2NjkwNTQyNmE0ZDMxZWVhZDEyZjE0OWJhZjhlYjgzNDZmNTZm
-    Njc5ZTdkNDBiZGExYjJlNTI5ZWUwZDkxZDkyZTlkOWVjZGY0MWM=
+    ZjE2YmViNDU3NDYyM2FlYzMwNzE3MDlmZDcyYjA3ZTc4NmVhNWEwNDU3YTRm
+    Zjk2NjY1ZjFmYzg3YjYyYzljZGMwYmVmMWQ2Njk0NjgzMzFmY2QxNDg3ZGY1
+    ZjkwZTJkY2U0ZGVlZjg3NWI0OTAwNmQzZjQ1ZWM1MzYzNmQyODU=

data/lib/hiera/backend/puppetdb_backend.rb

@@ -12,14 +12,16 @@ class Hiera
           uri = URI(Puppet::Util::Puppetdb.config.server_urls.first)
           host = uri.host
           port = uri.port
+          ssl = uri.scheme == 'https'
         rescue
           host = 'puppetdb'
           port = 443
+          ssl = true
         end
 
         Hiera.debug('Hiera PuppetDB backend starting')
 
-        @puppetdb = PuppetDB::Connection.new(host, port)
+        @puppetdb = PuppetDB::Connection.new(host, port, ssl)
         @parser = PuppetDB::Parser.new
       end
 

data/lib/puppet/face/query.rb

@@ -64,7 +64,7 @@ Puppet::Face.define(:query, '1.0.0') do
 
     arguments '<query>'
 
-    option '--node_info BOOLEAN' do
+    option '--node_info' do
       summary 'return full info about each node or just name'
       description <<-EOT
         If true the full information about each host is returned including fact, report and catalog timestamps.

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

@@ -29,8 +29,8 @@ EOT
   PuppetDB::Connection.check_version
 
   uri = URI(Puppet::Util::Puppetdb.config.server_urls.first)
-  puppetdb = PuppetDB::Connection.new(uri.host, uri.port)
+  puppetdb = PuppetDB::Connection.new(uri.host, uri.port, uri.scheme == 'https')
   parser = PuppetDB::Parser.new
   query = parser.facts_query query, facts if query.is_a? String
-  puppetdb.query(:facts, query)
+  parser.facts_hash(puppetdb.query(:facts, query))
 end

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

@@ -26,7 +26,7 @@ EOT
   PuppetDB::Connection.check_version
 
   uri = URI(Puppet::Util::Puppetdb.config.server_urls.first)
-  puppetdb = PuppetDB::Connection.new(uri.host, uri.port)
+  puppetdb = PuppetDB::Connection.new(uri.host, uri.port, uri.scheme == 'https')
   parser = PuppetDB::Parser.new
   if fact
     query = parser.facts_query query, [fact]

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

@@ -44,7 +44,7 @@ EOT
   PuppetDB::Connection.check_version
 
   uri = URI(Puppet::Util::Puppetdb.config.server_urls.first)
-  puppetdb = PuppetDB::Connection.new(uri.host, uri.port)
+  puppetdb = PuppetDB::Connection.new(uri.host, uri.port, uri.scheme == 'https')
   parser = PuppetDB::Parser.new
   nodequery = parser.parse nodequery, :facts if nodequery and nodequery.is_a? String
   resquery = parser.parse resquery, :none if resquery and resquery.is_a? String

data/lib/puppetdb.rb

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

data/lib/puppetdb/astnode.rb

@@ -86,7 +86,7 @@ class PuppetDB::ASTNode
       [value.to_s, *evaluate_children(mode)]
     when :subquery
       mode.push :subquery
-      ret = subquery(mode.last, value + 's', children[0].evaluate(mode))
+      ret = subquery(mode[-2], value + 's', children[0].evaluate(mode))
       mode.pop
       ret
     when :regexp_node_match
@@ -123,7 +123,7 @@ class PuppetDB::ASTNode
       else
         title = value[:title].evaluate
       end
-      ret = subquery(mode.last, :resources,
+      ret = subquery(mode[-2], :resources,
                      ['and',
                       ['=', 'type', capitalize_class(value[:type])],
                       [regexp ? '~' : '=', 'title', title],

data/spec/functions/query_facts_spec.rb

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+require 'puppetdb/connection'
+
+describe 'query_facts' do
+  it do
+    PuppetDB::Connection.any_instance.stubs(:query).returns [
+      { 'certname' => 'apache4.puppetexplorer.io', 'environment' => 'production', 'name' => 'ipaddress', 'value' => '172.31.6.80' }
+    ]
+    should run.with_params('', ['ipaddress']).and_return('apache4.puppetexplorer.io' => { 'ipaddress' => '172.31.6.80' })
+  end
+end

data/spec/functions/query_nodes_spec.rb

@@ -0,0 +1,44 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe 'query_nodes' do
+  context 'without fact parameter' do
+    it do
+      PuppetDB::Connection.any_instance.expects(:query)
+        .with(:nodes, ['in', 'certname', ['extract', 'certname', ['select_fact_contents', ['and', ['=', 'path', ['hostname']], ['=', 'value', 'apache4']]]]])
+        .returns [
+          {
+            'certname' => 'apache4.puppetexplorer.io',
+            'deactivated' => nil,
+            'latest_report_hash' => '4ff9fc5c1344c1c6ce47d923eb139a3409ef530d',
+            'facts_environment' => 'production',
+            'report_environment' => 'production',
+            'catalog_environment' => 'production',
+            'facts_timestamp' => '2015-10-13T05:35:32.511Z',
+            'expired' => nil,
+            'report_timestamp' => '2015-10-13T05:33:17.011Z',
+            'catalog_timestamp' => '2015-10-13T05:35:38.661Z',
+            'latest_report_status' => 'changed'
+          }
+        ]
+      should run.with_params('hostname="apache4"').and_return(['apache4.puppetexplorer.io'])
+    end
+  end
+
+  context 'with a fact parameter' do
+    it do
+      PuppetDB::Connection.any_instance.expects(:query)
+        .with(:facts, ['and', ['in', 'certname', ['extract', 'certname', ['select_fact_contents', ['and', ['=', 'path', ['hostname']], ['=', 'value', 'apache4']]]]], ['or', ['=', 'name', 'ipaddress']]])
+        .returns [
+          {
+            'certname' => 'apache4.puppetexplorer.io',
+            'environment' => 'production',
+            'name' => 'ipaddress',
+            'value' => '172.31.6.80'
+          }
+        ]
+      should run.with_params('hostname="apache4"', 'ipaddress').and_return(['172.31.6.80'])
+    end
+  end
+end

data/spec/functions/query_resources_spec.rb

@@ -0,0 +1,23 @@
+#! /usr/bin/env ruby -S rspec
+
+require 'spec_helper'
+
+describe 'query_resources' do
+  it do
+    resource = { 'tags' => %w(apache package class __node_regexp__apache httpd node),
+                 'file' => '/etc/puppetlabs/code/environments/production/modules/apache/manifests/init.pp',
+                 'type' => 'Package',
+                 'title' => 'httpd',
+                 'line' => 103,
+                 'resource' => 'c239274125740582bc181dfcb7dcb3e476ada592',
+                 'environment' => 'production',
+                 'certname' => 'apache4.puppetexplorer.io',
+                 'parameters' => { 'ensure' => 'installed', 'name' => 'apache2', 'notify' => 'Class[Apache::Service]' },
+                 'exported' => false }
+    PuppetDB::Connection.any_instance.expects(:query)
+      .with(:resources, ['and', ['and', ['=', 'type', 'Package'], ['=', 'title', 'httpd'], ['=', 'exported', false]], ['in', 'certname', ['extract', 'certname', ['select_fact_contents', ['and', ['=', 'path', ['hostname']], ['=', 'value', 'apache4']]]]]])
+      .returns [resource]
+    should run.with_params('hostname=apache4', 'package[httpd]')
+      .and_return([resource])
+  end
+end

data/spec/puppet/util/puppetdb.rb

@@ -0,0 +1,14 @@
+require 'uri'
+
+# Minimal mock class for PuppetDB config
+module Puppet::Util::Puppetdb
+  class Config
+    def server_urls
+      [URI('http://puppetdb.puppetexplorer.io')]
+    end
+  end
+
+  def self.config
+    Puppet::Util::Puppetdb::Config.new
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
 require 'rubygems'
 require 'rspec/expectations'
-
 require 'puppetlabs_spec_helper/module_spec_helper'
+require 'rspec-puppet'
+
+fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
+
+RSpec.configure do |c|
+  c.module_path = File.join(fixture_path, 'modules')
+  c.manifest_dir = File.join(fixture_path, 'manifests')
+end

data/spec/unit/puppetdb/parser_spec.rb

@@ -184,6 +184,10 @@ describe PuppetDB::Parser do
       date = Time.new(2014, 9, 9).iso8601
       parser.parse('#node.report_timestamp<@"Sep 9, 2014"').should eq ['in', 'certname', ['extract', 'certname', ['select_nodes', ['<', 'report_timestamp', date]]]]
     end
+
+    it 'should not wrap it in a subquery if mode is :none' do
+      parser.parse('class[apache]', :none).should eq ["and", ["=", "type", "Class"], ["=", "title", "Apache"], ["=", "exported", false]]
+    end
   end
 
   context 'facts_query' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-puppetdb
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Erik Dalen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,9 +196,11 @@ files:
 - lib/puppetdb/lexer.rex
 - lib/puppetdb/parser.rb
 - lib/puppetdb/parser_helper.rb
+- spec/functions/query_facts_spec.rb
+- spec/functions/query_nodes_spec.rb
+- spec/functions/query_resources_spec.rb
+- spec/puppet/util/puppetdb.rb
 - spec/spec_helper.rb
-- spec/unit/puppet/parser/functions/query_facts_spec.rb
-- spec/unit/puppet/parser/functions/query_nodes_spec.rb
 - spec/unit/puppetdb/parser_spec.rb
 homepage: https://github.com/dalen/puppet-puppetdbquery
 licenses:
@@ -212,9 +228,11 @@ specification_version: 4
 summary: Query functions for PuppetDB
 test_files:
 - spec/unit/puppetdb/parser_spec.rb
-- spec/unit/puppet/parser/functions/query_nodes_spec.rb
-- spec/unit/puppet/parser/functions/query_facts_spec.rb
 - spec/spec_helper.rb
+- spec/puppet/util/puppetdb.rb
+- spec/functions/query_resources_spec.rb
+- spec/functions/query_nodes_spec.rb
+- spec/functions/query_facts_spec.rb
 - examples/query_resource_examples.pp
 - examples/query_node_examples.pp
 - examples/nova_functions.pp

data/spec/unit/puppet/parser/functions/query_facts_spec.rb

@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the query_facts function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("query_facts").should == "function_query_facts"
-  end
-end

data/spec/unit/puppet/parser/functions/query_nodes_spec.rb

@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the query_nodes function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("query_nodes").should == "function_query_nodes"
-  end
-end