puppetdb_query 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c29a35e9a3f0273da0078d39fc360031e079559
-  data.tar.gz: c1710d74138ab02f3bbb01d1780b203a02b62924
+  metadata.gz: e8472f7c93ea4f65a4ee87ace1642691819290c3
+  data.tar.gz: e1106d8da873423d09d5b1b38a3def9e94d7d2e2
 SHA512:
-  metadata.gz: cae49d29397e9bb5be849f3018dc8432f08ffb1e950a1c5a2070bd76b53e1e1a12a1c6033b613573cee98967b83a0aae670a52a6f93fa19a5a3d753b1c95b1eb
-  data.tar.gz: 6d2e55a958dba3917214f66d87ef9882b790e1c096abafe359f39a8c4a4f32dcf06904034cdb065aeb9d0eb2f5ff3e56132414edae8916e6cdf0d3de60f8b855
+  metadata.gz: 51ab68da432386ea4e02fed4df626c56fe0a9b3ea942ca5b0dfff7944b48a2039a33b2f26236155868f193ae137a68866abea71445f39d319b4d2329fcd3e386
+  data.tar.gz: 63f8fb7e455e04b1767ba51462ad21b23175ea2cf5ae48d7063f96fb2b547b921de6cb291abf8fdeb87a695db6276930eab49fb8a29e840f4609839e87fd37f4

data/lib/puppetdb_query/mongodb.rb

@@ -29,14 +29,36 @@ module PuppetDBQuery
       @meta_collection = meta
     end
 
+    # get all nodes and their update dates
+    def node_properties
+      collection = connection[node_properties_collection]
+      result = {}
+      collection.find.batch_size(999).each do |values|
+        id = values.delete('_id')
+        result[id] = values
+      end
+      result
+    end
+
+    # get all node names
+    def all_nodes
+      collection = connection[nodes_collection]
+      collection.find.batch_size(999).projection(_id: 1).map { |k| k[:_id] }
+    end
+
     # get node names that fulfill given mongodb query
+    #
+    # @param query mongodb query
     def query_nodes(query)
       collection = connection[nodes_collection]
       collection.find(query).batch_size(999).projection(_id: 1).map { |k| k[:_id] }
     end
 
     # get nodes and their facts that fulfill given mongodb query
-    def query_facts(query, facts)
+    #
+    # @param query mongodb query
+    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
+    def query_facts(query, facts = [])
       fields = Hash[facts.collect { |fact| [fact.to_sym, 1] }]
       collection = connection[nodes_collection]
       result = {}
@@ -48,11 +70,12 @@ module PuppetDBQuery
     end
 
     # get nodes and their facts for a pattern
+    #
     # @param query mongodb query
-    # @param pattern RegExp to search for
-    # @param facts Array get these values in the result, eg ['fqdn']
-    # @param facts_found Array fact names are added to this array
-    # @param check_names Boolean also search fact names
+    # @param pattern [RegExp] search for
+    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
+    # @param facts_found [Array<String>] fact names are added to this array
+    # @param check_names [Boolean] also search fact names
     def search_facts(query, pattern, facts = [], facts_found = [], check_names = false)
       collection = connection[nodes_collection]
       result = {}
@@ -76,36 +99,26 @@ module PuppetDBQuery
       result
     end
 
-    # get all node names
-    def nodes
-      collection = connection[nodes_collection]
-      collection.find.batch_size(999).projection(_id: 1).map { |k| k[:_id] }
-    end
-
-    # get all nodes and their update dates
-    def node_properties
-      collection = connection[node_properties_collection]
-      result = {}
-      collection.find.batch_size(999).each do |values|
-        id = values.delete('_id')
-        result[id] = values
-      end
-      result
-    end
-
     # get facts for given node name
-    def node_facts(node)
+    #
+    # @param node [String] node name
+    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
+    def single_node_facts(node, facts)
+      fields = Hash[facts.collect { |fact| [fact.to_sym, 1] }]
       collection = connection[nodes_collection]
-      result = collection.find(_id: node).limit(1).batch_size(1).to_a.first
+      result = collection.find(_id: node).limit(1).batch_size(1).projection(fields).to_a.first
       result.delete("_id") if result
       result
     end
 
     # get all nodes and their facts
-    def facts
+    #
+    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
+    def facts(facts = [])
+      fields = Hash[facts.collect { |fact| [fact.to_sym, 1] }]
       collection = connection[nodes_collection]
       result = {}
-      collection.find.batch_size(999).each do |values|
+      collection.find.batch_size(999).projection(fields).each do |values|
         id = values.delete('_id')
         result[id] = values
       end
@@ -121,6 +134,9 @@ module PuppetDBQuery
     end
 
     # update or insert facts for given node name
+    #
+    # @param node [String] node name
+    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
     def node_update(node, facts)
       connection[nodes_collection].find(_id: node).replace_one(facts, upsert: true)
     rescue ::Mongo::Error::OperationFailure => e
@@ -134,6 +150,8 @@ module PuppetDBQuery
     end
 
     # delete node data for given node name
+    #
+    # @param node [String] node name
     def node_delete(node)
       connection[nodes_collection].find(_id: node).delete_one
     end

data/lib/puppetdb_query/puppetdb.rb

@@ -19,9 +19,7 @@ module PuppetDBQuery
 
     # get array of node names
     def nodes
-      # TODO: perhaps we have to ignore entries without "deactivated": null?
-      # in '/v3/nodes' we must take 'name'
-      api_nodes.map { |data| data['certname'] }
+      api_nodes.reject { |data| data['deactivated'] }.map { |data| data['certname'] }
     end
 
     # get hash of node update properties

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.24".freeze
+  VERSION = "0.0.25".freeze
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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: easy_diff
   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: Allow puppetdb access from resources like mongodb.
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -75,19 +75,19 @@ homepage: https://github.com/m-31/puppetdb_query
 licenses:
 - MIT
 metadata: {}
-post_install_message: '  Sitting quietly, doing nothing, spring comes, and grass grows
-  by itself.'
+post_install_message: "  Sitting quietly, doing nothing, spring comes, and grass grows
+  by itself."
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []