ruby-puppetdb 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392d7e62e4de4fab8893322d3b1566af2115decc
-  data.tar.gz: b7352a764dac57a95abaabbe444fa87d7fd7dae6
+  metadata.gz: b8b23502fed021f532f01055c3ca02a633bd113a
+  data.tar.gz: 02b21821bbf0e4f9cd90db15c50ede416abb09cd
 SHA512:
-  metadata.gz: d7c7160494a09d173209981e627c09c615d33d472033fdbe0b1034ef6734aff3deaff8471c58a99b75310746faf3177ebda3874f7d7193b507752b7d9ddcae77
-  data.tar.gz: 6139c779e2ba9057e00cccce7de0adecd5c7568b5fa8283450d1f5b95a8056f3c81a1c47b8e812e702e1289134d5cae0fcc19a8eed3a3c6627510cad4a13d514
+  metadata.gz: b2c15fe26908deb2751fa3c08cacb8ff06fb934ca4c101f86e21ae3489d244269bc12b8f5628186e9e0f696bf2d5d99de3b7c03af4c0d46ed5d525cd7296b560
+  data.tar.gz: ac6703ed8f562b5bb7a6803c37d009a91e6cc18b478df6b238758d1d9bc2c66d78a10b7008828a75c9b0c5fd40d84ec2fd782a930f779b6896729a279e24782c

data/lib/puppet/face/query.rb

@@ -66,10 +66,11 @@ Puppet::Face.define(:query, '1.0.0') do
     when_invoked do |query, options|
       puppetdb = PuppetDB::Connection.new options[:puppetdb_host], options[:puppetdb_port]
       nodes = puppetdb.query(:nodes, puppetdb.parse_query(query, :nodes))
+
       if options[:node_info]
-        nodes
+        Hash[nodes.collect { |node| [node['name'], node.reject{|k,v| k == "name"}] }]
       else
-        nodes.collect { |node| node['name'] } unless options[:node_info]
+        nodes.collect { |node| node['name'] }
       end
     end
 

data/lib/puppetdb.rb

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

data/lib/puppetdb/astnode.rb

@@ -9,6 +9,7 @@ class PuppetDB::ASTNode
 
   def capitalize!
     @value=@value.to_s.split("::").collect { |s| s.capitalize }.join("::")
+    @children.each { |c| c.capitalize! }
     return self
   end
 
@@ -73,7 +74,7 @@ class PuppetDB::ASTNode
     when :boolean
       return @value
     when :resourcetitle
-      return ['=', 'title', @value]
+      return [@value, 'title', @children[0].evaluate(mode)]
     when :resourcetype
       return ['=', 'type', @value]
     when :resexported

data/lib/puppetdb/connection.rb

@@ -4,7 +4,6 @@ class PuppetDB::Connection
   require 'rubygems'
   require 'puppetdb/parser'
   require 'uri'
-  require 'json'
 
   def initialize(host='puppetdb', port=443, use_ssl=true)
     @host = host
@@ -19,7 +18,9 @@ class PuppetDB::Connection
   # @param endpoint [Symbol] the endpoint for which the query should be evaluated
   # @return [Array] the PuppetDB query
   def parse_query(query, endpoint=:nodes)
-    @parser.scan_str(query).optimize.evaluate endpoint
+    if query = @parser.scan_str(query)
+      query.optimize.evaluate endpoint
+    end
   end
 
   # Get the listed facts for all nodes matching query
@@ -51,6 +52,8 @@ class PuppetDB::Connection
   # @param query [Array] query to execute
   # @return [Array] the results of the query
   def query(endpoint, query=nil, http=nil, version=:v2)
+    require 'json'
+
     unless http then
       require 'puppet/network/http_pool'
       http = Puppet::Network::HttpPool.http_instance(@host, @port, @use_ssl)

data/lib/puppetdb/grammar.y

@@ -16,7 +16,8 @@ class PuppetDB::Parser
   preclow
 
 rule
-  query: exp
+  query:
+     |exp
 
   exp: LPAREN exp RPAREN			{ result = val[1] }
      | NOT exp					{ result = ASTNode.new :booleanop, :not, [val[1]] }
@@ -46,7 +47,8 @@ rule
 
   resexported: EXPORTED
   restype: STRING				{ result = ASTNode.new(:resourcetype, val[0]).capitalize! }
-  restitle: LBRACK STRING RBRACK		{ result = ASTNode.new :resourcetitle, val[1] }
+  restitle: LBRACK STRING RBRACK		{ result = ASTNode.new :resourcetitle, '=', [ASTNode.new(:string, val[1])] }
+  restitle: LBRACK MATCH STRING RBRACK		{ result = ASTNode.new :resourcetitle, '~', [ASTNode.new(:string, val[2])] }
   resparams: LBRACE exp RBRACE			{ result = val[1] }
 
   string: STRING				{ result = ASTNode.new :string, val[0] }
@@ -58,4 +60,3 @@ end
 require 'puppetdb'
 require 'puppetdb/lexer'
 require 'puppetdb/astnode'
-

data/lib/puppetdb/lexer.l

@@ -26,6 +26,7 @@ rule
 	-?\d+\.\d+		{ [:NUMBER, text.to_f] }
 	-?\d+			{ [:NUMBER, text.to_i] }
 	\"(\\.|[^\\"])*\"	{ [:STRING, YAML.load(text)] }
+	\'(\\.|[^\\'])*\'	{ [:STRING, YAML.load(text)] }
 	{STR}+			{ [:STRING, text] }
 	@@			{ [:EXPORTED, text] }
 end

data/lib/puppetdb/lexer.rb

@@ -117,6 +117,9 @@ class Lexer < Racc::Parser
         when (text = ss.scan(/\"(\\.|[^\\"])*\"/))
            @rex_tokens.push action { [:STRING, YAML.load(text)] }
 
+        when (text = ss.scan(/\'(\\.|[^\\'])*\'/))
+           @rex_tokens.push action { [:STRING, YAML.load(text)] }
+
         when (text = ss.scan(/[\w_:]+/))
            @rex_tokens.push action { [:STRING, text] }
 

data/lib/puppetdb/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
+# This file is automatically generated by Racc 1.4.11
 # from Racc grammer file "".
 #
 
@@ -14,65 +14,65 @@ module PuppetDB
 ##### State transition tables begin ###
 
 racc_action_table = [
-     4,     4,     5,     5,     8,     8,   -29,   -29,   -29,   -29,
-   -29,     3,     3,    36,    47,     9,     9,    12,    12,     4,
-     4,     5,     5,     8,     8,    16,    17,     5,    36,     8,
-     3,     3,    16,    17,     9,     9,    12,    12,     4,     4,
-     5,     5,     8,     8,     5,    32,     8,    41,     8,     3,
-     3,    49,    48,     9,     9,    12,    12,    28,    16,    17,
-    20,    21,    22,    18,    19,    36,    41,    42,    36,    41,
-    42,    25,     8,    51,    16 ]
+     3,     3,    14,    14,    15,    15,    32,    42,    41,    43,
+    15,     4,     4,    31,    37,    13,    13,    12,    12,     3,
+     3,    14,    14,    15,    15,    17,    18,    14,    42,    15,
+     4,     4,    17,    18,    13,    13,    12,    12,     3,     3,
+    14,    14,    15,    15,    14,    42,    15,    41,    34,     4,
+     4,    53,    16,    13,    13,    12,    12,    27,    17,    18,
+    21,    25,    24,    23,    22,   -31,   -31,   -31,   -31,   -31,
+    42,    41,    43,    51,    52,    15,    17,    54 ]
 
 racc_action_check = [
-     0,    17,     0,    17,     0,    17,     9,     9,     9,     9,
-     9,     0,    17,    19,    24,     0,    17,     0,    17,     8,
-     3,     8,     3,     8,     3,    24,    24,    11,    18,    11,
-     8,     3,     1,     1,     8,     3,     8,     3,     4,    16,
-     4,    16,     4,    16,    10,    15,    10,    22,    13,     4,
-    16,    26,    25,     4,    16,     4,    16,    10,    26,    26,
-     2,     2,     2,     2,     2,    21,    21,    21,    20,    20,
-    20,     5,    29,    32,    34 ]
+     0,    18,     0,    18,     0,    18,    14,    25,    25,    25,
+    28,     0,    18,    14,    19,     0,    18,     0,    18,    15,
+     3,    15,     3,    15,     3,    19,    19,     9,    22,     9,
+    15,     3,     2,     2,    15,     3,    15,     3,     4,    17,
+     4,    17,     4,    17,     8,    23,     8,    24,    16,     4,
+    17,    33,     1,     4,    17,     4,    17,     8,    33,    33,
+     5,     5,     5,     5,     5,    13,    13,    13,    13,    13,
+    21,    21,    21,    31,    32,    10,    36,    52 ]
 
 racc_action_pointer = [
-    -2,    18,    52,    18,    36,    54,   nil,   nil,    17,    -2,
-    40,    23,   nil,    42,   nil,    45,    37,    -1,    12,    -3,
-    52,    49,    30,   nil,    11,    47,    44,   nil,   nil,    66,
-   nil,   nil,    73,   nil,    60,   nil,   nil,   nil,   nil,   nil,
+    -2,    52,    18,    18,    36,    52,   nil,   nil,    40,    23,
+    69,   nil,   nil,    57,    -4,    17,    48,    37,    -1,    11,
+   nil,    54,    12,    29,    30,    -9,   nil,   nil,     4,   nil,
+   nil,    68,    57,    44,   nil,   nil,    62,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+   nil,   nil,    72,   nil,   nil ]
 
 racc_action_default = [
-   -32,    -1,   -32,   -32,   -32,   -32,   -15,   -16,   -32,   -26,
-   -32,   -18,   -25,   -19,   -20,   -32,   -32,   -32,   -32,   -32,
-   -32,   -32,   -32,    -3,   -32,   -32,   -32,   -17,   -26,   -21,
-   -23,   -22,   -32,    -4,    -5,   -10,   -30,    -9,    -6,    -7,
-    -8,   -29,   -31,   -14,   -13,   -12,   -11,    -2,   -27,   -28,
-   -24,    52 ]
+    -1,   -34,    -2,   -34,   -34,   -34,   -16,   -17,   -34,   -19,
+   -20,   -21,   -26,   -27,   -34,   -34,   -34,   -34,   -34,   -34,
+    -4,   -34,   -34,   -34,   -34,   -34,   -18,   -27,   -22,   -24,
+   -23,   -34,   -34,   -34,    55,    -5,    -6,    -3,    -7,    -8,
+    -9,   -31,   -32,   -33,   -10,   -11,   -12,   -13,   -14,   -15,
+   -25,   -28,   -34,   -30,   -29 ]
 
 racc_goto_table = [
-    30,    27,    31,     1,    39,    44,    23,    24,    38,    43,
-    46,    26,    35,    37,    40,    45,    29,    15,    50,    33,
-    34 ]
+    29,    30,    26,     2,    28,    38,    19,    20,    46,    49,
+    39,    40,    44,    45,    48,    47,     1,   nil,    33,    50,
+    35,    36 ]
 
 racc_goto_check = [
-    11,     7,    11,     2,     4,     4,     2,     2,     3,     3,
-     3,     2,     5,     5,     5,     5,    10,     1,    11,     2,
-     2 ]
+    11,    11,     7,     2,    10,     3,     2,     2,     3,     3,
+     4,     5,     5,     5,     4,     5,     1,   nil,     2,    11,
+     2,     2 ]
 
 racc_goto_pointer = [
-   nil,    17,     3,   -12,   -16,    -6,   nil,    -9,   nil,   nil,
-     5,   -11 ]
+   nil,    16,     3,   -16,   -11,   -10,   nil,    -6,   nil,   nil,
+    -5,    -9 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     2,   nil,   nil,     6,     7,    10,    11,
-    13,    14 ]
+   nil,   nil,   nil,     5,   nil,   nil,     6,     7,     8,     9,
+    10,    11 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
+  0, 21, :_reduce_none,
   1, 21, :_reduce_none,
-  3, 22, :_reduce_2,
-  2, 22, :_reduce_3,
-  3, 22, :_reduce_4,
+  3, 22, :_reduce_3,
+  2, 22, :_reduce_4,
   3, 22, :_reduce_5,
   3, 22, :_reduce_6,
   3, 22, :_reduce_7,
@@ -83,27 +83,29 @@ racc_reduce_table = [
   3, 22, :_reduce_12,
   3, 22, :_reduce_13,
   3, 22, :_reduce_14,
+  3, 22, :_reduce_15,
   1, 22, :_reduce_none,
-  1, 26, :_reduce_16,
-  2, 26, :_reduce_17,
-  1, 27, :_reduce_18,
+  1, 26, :_reduce_17,
+  2, 26, :_reduce_18,
   1, 27, :_reduce_19,
   1, 27, :_reduce_20,
-  2, 27, :_reduce_21,
+  1, 27, :_reduce_21,
   2, 27, :_reduce_22,
   2, 27, :_reduce_23,
-  3, 27, :_reduce_24,
+  2, 27, :_reduce_24,
+  3, 27, :_reduce_25,
   1, 28, :_reduce_none,
-  1, 29, :_reduce_26,
-  3, 30, :_reduce_27,
-  3, 31, :_reduce_28,
-  1, 23, :_reduce_29,
-  1, 25, :_reduce_30,
-  1, 24, :_reduce_31 ]
+  1, 29, :_reduce_27,
+  3, 30, :_reduce_28,
+  4, 30, :_reduce_29,
+  3, 31, :_reduce_30,
+  1, 23, :_reduce_31,
+  1, 25, :_reduce_32,
+  1, 24, :_reduce_33 ]
 
-racc_reduce_n = 32
+racc_reduce_n = 34
 
-racc_shift_n = 52
+racc_shift_n = 55
 
 racc_token_table = {
   false => 0,
@@ -189,37 +191,32 @@ Racc_debug_parser = false
 
 # reduce 1 omitted
 
-module_eval(<<'.,.,', 'grammar.y', 20)
-  def _reduce_2(val, _values, result)
-     result = val[1] 
-    result
-  end
-.,.,
+# reduce 2 omitted
 
 module_eval(<<'.,.,', 'grammar.y', 21)
   def _reduce_3(val, _values, result)
-     result = ASTNode.new :booleanop, :not, [val[1]] 
+     result = val[1] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 22)
   def _reduce_4(val, _values, result)
-     result = ASTNode.new :booleanop, :and, [val[0], val[2]] 
+     result = ASTNode.new :booleanop, :not, [val[1]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 23)
   def _reduce_5(val, _values, result)
-     result = ASTNode.new :booleanop, :or, [val[0], val[2]] 
+     result = ASTNode.new :booleanop, :and, [val[0], val[2]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 24)
   def _reduce_6(val, _values, result)
-     result = ASTNode.new :exp, :equals, [val[0], val[2]] 
+     result = ASTNode.new :booleanop, :or, [val[0], val[2]] 
     result
   end
 .,.,
@@ -240,28 +237,28 @@ module_eval(<<'.,.,', 'grammar.y', 26)
 
 module_eval(<<'.,.,', 'grammar.y', 27)
   def _reduce_9(val, _values, result)
-     result = ASTNode.new :exp, :greaterthan, [val[0], val[2]] 
+     result = ASTNode.new :exp, :equals, [val[0], val[2]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 28)
   def _reduce_10(val, _values, result)
-     result = ASTNode.new :exp, :lessthan, [val[0], val[2]] 
+     result = ASTNode.new :exp, :greaterthan, [val[0], val[2]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 29)
   def _reduce_11(val, _values, result)
-     result = ASTNode.new :exp, :match, [val[0], val[2]] 
+     result = ASTNode.new :exp, :lessthan, [val[0], val[2]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 30)
   def _reduce_12(val, _values, result)
-     result = ASTNode.new :booleanop, :not, [ASTNode.new(:exp, :equals, [val[0], val[2]])] 
+     result = ASTNode.new :exp, :match, [val[0], val[2]] 
     result
   end
 .,.,
@@ -280,25 +277,25 @@ module_eval(<<'.,.,', 'grammar.y', 32)
   end
 .,.,
 
-# reduce 15 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 35)
-  def _reduce_16(val, _values, result)
-     result = ASTNode.new :subquery, :resources, [ASTNode.new(:booleanop, :and, [ASTNode.new(:resexported, false), *val[0]])] 
+module_eval(<<'.,.,', 'grammar.y', 33)
+  def _reduce_15(val, _values, result)
+     result = ASTNode.new :booleanop, :not, [ASTNode.new(:exp, :equals, [val[0], val[2]])] 
     result
   end
 .,.,
 
+# reduce 16 omitted
+
 module_eval(<<'.,.,', 'grammar.y', 36)
   def _reduce_17(val, _values, result)
-     result = ASTNode.new :subquery, :resources, [ASTNode.new(:booleanop, :and, [ASTNode.new(:resexported, true), *val[1]])] 
+     result = ASTNode.new :subquery, :resources, [ASTNode.new(:booleanop, :and, [ASTNode.new(:resexported, false), *val[0]])] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 38)
+module_eval(<<'.,.,', 'grammar.y', 37)
   def _reduce_18(val, _values, result)
-     result = [val[0]] 
+     result = ASTNode.new :subquery, :resources, [ASTNode.new(:booleanop, :and, [ASTNode.new(:resexported, true), *val[1]])] 
     result
   end
 .,.,
@@ -319,14 +316,14 @@ module_eval(<<'.,.,', 'grammar.y', 40)
 
 module_eval(<<'.,.,', 'grammar.y', 41)
   def _reduce_21(val, _values, result)
-     result = val[0].value == "Class" ? [val[0], val[1].capitalize!] : [val[0], val[1]] 
+     result = [val[0]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 42)
   def _reduce_22(val, _values, result)
-     result = [val[0], val[1]] 
+     result = val[0].value == "Class" ? [val[0], val[1].capitalize!] : [val[0], val[1]] 
     result
   end
 .,.,
@@ -340,50 +337,64 @@ module_eval(<<'.,.,', 'grammar.y', 43)
 
 module_eval(<<'.,.,', 'grammar.y', 44)
   def _reduce_24(val, _values, result)
-     result = val[0].value == "Class" ? [val[0], val[1].capitalize!, val[2]] : [val[0], val[1], val[2]] 
+     result = [val[0], val[1]] 
     result
   end
 .,.,
 
-# reduce 25 omitted
-
-module_eval(<<'.,.,', 'grammar.y', 47)
-  def _reduce_26(val, _values, result)
-     result = ASTNode.new(:resourcetype, val[0]).capitalize! 
+module_eval(<<'.,.,', 'grammar.y', 45)
+  def _reduce_25(val, _values, result)
+     result = val[0].value == "Class" ? [val[0], val[1].capitalize!, val[2]] : [val[0], val[1], val[2]] 
     result
   end
 .,.,
 
+# reduce 26 omitted
+
 module_eval(<<'.,.,', 'grammar.y', 48)
   def _reduce_27(val, _values, result)
-     result = ASTNode.new :resourcetitle, val[1] 
+     result = ASTNode.new(:resourcetype, val[0]).capitalize! 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 49)
   def _reduce_28(val, _values, result)
-     result = val[1] 
+     result = ASTNode.new :resourcetitle, '=', [ASTNode.new(:string, val[1])] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 51)
+module_eval(<<'.,.,', 'grammar.y', 50)
   def _reduce_29(val, _values, result)
-     result = ASTNode.new :string, val[0] 
+     result = ASTNode.new :resourcetitle, '~', [ASTNode.new(:string, val[2])] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.y', 52)
+module_eval(<<'.,.,', 'grammar.y', 51)
   def _reduce_30(val, _values, result)
-     result = ASTNode.new :number, val[0] 
+     result = val[1] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 53)
   def _reduce_31(val, _values, result)
+     result = ASTNode.new :string, val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 54)
+  def _reduce_32(val, _values, result)
+     result = ASTNode.new :number, val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.y', 55)
+  def _reduce_33(val, _values, result)
      result = ASTNode.new :boolean, val[0] 
     result
   end