ruby-puppetdb 1.0.0.pre2 → 1.0.0.pre4

data/Modulefile

@@ -1,5 +1,5 @@
 name    'dalen-puppetdbquery'
-version '1.0.0-pre2'
+version '1.0.0-pre4'
 author 'Erik Dalén <erik.gustav.dalen@gmail.com>'
 license 'Apache License V2'
 summary 'Query functions for the PuppetDB API'

data/bin/find-nodes

@@ -1,7 +1,7 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
-require 'puppet'
 require 'rubygems'
+require 'puppet'
 require 'puppetdb/connection'
 require 'optparse'
 require 'net/http'

data/lib/puppetdb/astnode.rb

@@ -14,7 +14,6 @@ class PuppetDB::ASTNode
   # @param query the query inside the subquery
   # @return [Array] the resulting subquery
   def subquery(from_mode, to_mode, query)
-    return query if from_mode == to_mode
     return ['in', (from_mode == :nodes) ? 'name' : 'certname',
       ['extract', (to_mode == :nodes) ? 'name' : 'certname',
         ["select-#{to_mode.to_s}", query]]]
@@ -57,10 +56,8 @@ class PuppetDB::ASTNode
       end
 
       case mode
-      when :nodes # we are trying to query for facts but are in node mode, do a subquery
+      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 :facts
-        return ['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)]
       end

data/lib/puppetdb/connection.rb

@@ -55,8 +55,8 @@ class PuppetDB::Connection
     uri = "/v2/#{endpoint.to_s}"
     uri += URI.escape "?query=#{query.to_json}" unless query.nil? or query.empty?
 
-    resp, data = http.get(uri, headers)
+    resp = http.get(uri, headers)
     raise Puppet::Error, "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
-    return PSON.parse(data)
+    return JSON.parse(resp.body)
   end
 end

metadata

@@ -1,36 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-puppetdb
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 0
-  - 0
-  - pre2
-  version: 1.0.0.pre2
+version: !ruby/object:Gem::Version
+  version: 1.0.0.pre4
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Dan Bode
-- "Erik Dal\xC3\xA9n"
+- Erik Dalén
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-04 00:00:00 +02:00
-default_executable: 
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies: []
-
 description: A higher level query language for PuppetDB.
-email: 
+email:
 - dan@puppetlabs.com
 - erik.gustav.dalen@gmail.com
-executables: 
+executables:
 - find-nodes
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - COPYING
 - Modulefile
@@ -70,39 +60,31 @@ files:
 - spec/unit/puppet/parser/functions/pdbstatusquery_spec.rb
 - spec/unit/puppet/parser/functions/query_facts_spec.rb
 - spec/unit/puppet/parser/functions/query_nodes_spec.rb
-has_rdoc: true
 homepage: https://github.com/dalen/puppet-puppetdbquery
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Query functions for PuppetDB
-test_files: 
+test_files:
 - examples/nova_functions.pp
 - examples/query_node_examples.pp
 - examples/query_resource_examples.pp