ruby-puppetdb 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edc345d8dbd3b6b42c2739f3e834da0e3e90497
-  data.tar.gz: a525eb44570248b3c24b580d8219bf56eb2b9bbc
+  metadata.gz: c74b0b26827cba1ad77e8bf903856126ecbc9a3e
+  data.tar.gz: 0108b01dfc1a734e30e81f4b4c2affcc6b68df6f
 SHA512:
-  metadata.gz: a2d4eafc8d0a2a5337c4bb48b42652b7a26cdfe4031a991b7c4c6cf2dc3805cd8e12047955ad5454bc6b4354d7497f7e924f6f8c602ee98760eab541a73140bc
-  data.tar.gz: 20a5bbb90a78edd94c4bc9a213504a539e0303b031523a2baf41746e6c07f747331bc294bd7cbf9cc7fabbb9864a9287e1b68c4f9b2378cfb6e057ec05db805c
+  metadata.gz: c983522401d69161c433b6de753751f5183255f6f458817de023d90b196a23eb6a9138d7c0aec4de673350cf51d8fa29615a694bb92113aa64832d314e84a735
+  data.tar.gz: cf2b45587876fecaa9f9eb33667f731058353c1c164992f6b273882211abfdfcbd9f0722130a78f1073400d37d321f450b8abd421b3d767019ea641fd54b3059

data/lib/puppetdb.rb

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

data/lib/puppetdb/connection.rb

@@ -17,7 +17,7 @@ class PuppetDB::Connection
   # @param query [String] the query string to parse
   # @param endpoint [Symbol] the endpoint for which the query should be evaluated
   # @return [Array] the PuppetDB query
-  def parse_query(query, endpoint=:nodes)
+  def parse_query(query, endpoint = :nodes)
     if query = @parser.scan_str(query)
       query.optimize.evaluate endpoint
     end
@@ -29,7 +29,7 @@ class PuppetDB::Connection
   # @param facts [Array] the list of facts to fetch
   # @param nodequery [Array] the query to find the nodes to fetch facts for
   # @return [Hash] a hash of hashes with facts for each node mathing query
-  def facts(facts, nodequery, http=nil)
+  def facts(facts, nodequery, http = nil)
     if facts.empty?
       q = ['in', 'certname', ['extract', 'certname', ['select-facts', nodequery]]]
     else
@@ -37,10 +37,10 @@ class PuppetDB::Connection
     end
     facts = {}
     query(:facts, q, http).each do |fact|
-      if facts.include? fact['certname'] then
+      if facts.include? fact['certname']
         facts[fact['certname']][fact['name']] = fact['value']
       else
-        facts[fact['certname']] = {fact['name'] => fact['value']}
+        facts[fact['certname']] = { fact['name'] => fact['value'] }
       end
     end
     facts
@@ -77,20 +77,20 @@ class PuppetDB::Connection
   # @param endpoint [Symbol] :resources, :facts or :nodes
   # @param query [Array] query to execute
   # @return [Array] the results of the query
-  def query(endpoint, query=nil, http=nil, version=:v3)
+  def query(endpoint, query = nil, http = nil, version = :v3)
     require 'json'
 
-    unless http then
+    unless http
       require 'puppet/network/http_pool'
       http = Puppet::Network::HttpPool.http_instance(@host, @port, @use_ssl)
     end
-    headers = { "Accept" => "application/json" }
+    headers = { 'Accept' => 'application/json' }
 
-    uri = "/#{version.to_s}/#{endpoint.to_s}"
-    uri += URI.escape "?query=#{query.to_json}" unless query.nil? or query.empty?
+    uri = "/#{version}/#{endpoint}"
+    uri += URI.escape "?query=#{query.to_json}" unless query.nil? || query.empty?
 
     resp = http.get(uri, headers)
-    raise RuntimeError, "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
-    return JSON.parse(resp.body)
+    raise "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
+    JSON.parse(resp.body)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-puppetdb
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Dan Bode
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -57,84 +57,84 @@ dependencies:
   name: rspec-expectations
   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
     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: puppetlabs_spec_helper
   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: 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: racc
   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: rexical
   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'
 description: A higher level query language for PuppetDB.
@@ -147,6 +147,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/find-nodes
+- examples/nova_functions.pp
+- 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
@@ -160,6 +163,7 @@ files:
 - lib/puppet/parser/functions/query_facts.rb
 - lib/puppet/parser/functions/query_nodes.rb
 - lib/puppet/parser/functions/query_resources.rb
+- lib/puppetdb.rb
 - lib/puppetdb/astnode.rb
 - lib/puppetdb/connection.rb
 - lib/puppetdb/grammar.racc
@@ -167,7 +171,6 @@ files:
 - lib/puppetdb/lexer.rex
 - lib/puppetdb/parser.rb
 - lib/puppetdb/util.rb
-- lib/puppetdb.rb
 - spec/spec_helper.rb
 - spec/unit/puppet/parser/functions/pdbfactquery_spec.rb
 - spec/unit/puppet/parser/functions/pdbnodequery_all_spec.rb
@@ -179,9 +182,6 @@ files:
 - spec/unit/puppet/parser/functions/query_facts_spec.rb
 - spec/unit/puppet/parser/functions/query_nodes_spec.rb
 - spec/unit/puppetdb/connection_spec.rb
-- examples/nova_functions.pp
-- examples/query_node_examples.pp
-- examples/query_resource_examples.pp
 homepage: https://github.com/dalen/puppet-puppetdbquery
 licenses:
 - Apache v2
@@ -192,17 +192,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Query functions for PuppetDB
@@ -221,3 +221,4 @@ test_files:
 - examples/nova_functions.pp
 - examples/query_node_examples.pp
 - examples/query_resource_examples.pp
+has_rdoc: