ruby-puppetdb 1.1.1 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +7 -0
  2. data/Modulefile +1 -1
  3. data/lib/puppetdb/astnode.rb +5 -0
  4. data/lib/puppetdb/connection.rb +1 -1
  5. data/lib/puppetdb/grammar.y +3 -3
  6. data/lib/puppetdb/parser.rb +3 -3
  7. metadata +86 -92
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 1beecbcce5ba235ea07c8285ceb07614e8502dde
4
+ data.tar.gz: e6321323e3fe82b17437139c5314175ee243495c
5
+ SHA512:
6
+ metadata.gz: 58f1303a9b2b09ae762cb99a49f649941b8e2265cb1aa5a1bde180ccb9356d1725304841a31821e04ef02b7ccb01174f78e77d00aed85260cedeaad8336fe81c
7
+ data.tar.gz: d545b33bc634612e6207f53a49cf0c5b6748c9e4dfca1960affae8959ea57ab3e7d5fd84e4617e90c81391185eb69d66f2f6c2a68333f500eb066e0fed953889
data/Modulefile CHANGED
@@ -1,5 +1,5 @@
1
1
  name 'dalen-puppetdbquery'
2
- version '1.1.1'
2
+ version '1.2.0'
3
3
  author 'Erik Dalen <erik.gustav.dalen@gmail.com>'
4
4
  license 'Apache License V2'
5
5
  summary 'Query functions for the PuppetDB API'
data/lib/puppetdb/astnode.rb CHANGED
@@ -7,6 +7,11 @@ class PuppetDB::ASTNode
7
7
  @children = children
8
8
  end
9
9
 
10
+ def capitalize!
11
+ @value=@value.to_s.split("::").collect { |s| s.capitalize }.join("::")
12
+ return self
13
+ end
14
+
10
15
  # Generate the the query code for a subquery
11
16
  #
12
17
  # @param from_mode [Symbol] the mode you want to subquery from
data/lib/puppetdb/connection.rb CHANGED
@@ -61,7 +61,7 @@ class PuppetDB::Connection
61
61
  uri += URI.escape "?query=#{query.to_json}" unless query.nil? or query.empty?
62
62
 
63
63
  resp = http.get(uri, headers)
64
- raise Puppet::Error, "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
64
+ raise RuntimeError, "PuppetDB query error: [#{resp.code}] #{resp.msg}, query: #{query.to_json}" unless resp.kind_of?(Net::HTTPSuccess)
65
65
  return JSON.parse(resp.body)
66
66
  end
67
67
  end
data/lib/puppetdb/grammar.y CHANGED
@@ -39,13 +39,13 @@ rule
39
39
  resexp: restype { result = [val[0]] }
40
40
  | restitle { result = [val[0]] }
41
41
  | resparams { result = [val[0]] }
42
- | restype restitle { result = [val[0], val[1]] }
42
+ | restype restitle { result = val[0].value == "Class" ? [val[0], val[1].capitalize!] : [val[0], val[1]] }
43
43
  | restitle resparams { result = [val[0], val[1]] }
44
44
  | restype resparams { result = [val[0], val[1]] }
45
- | restype restitle resparams { result = [val[0], val[1], val[2]] }
45
+ | restype restitle resparams { result = val[0].value == "Class" ? [val[0], val[1].capitalize!, val[2]] : [val[0], val[1], val[2]] }
46
46
 
47
47
  resexported: EXPORTED
48
- restype: STRING { result = ASTNode.new :resourcetype, val[0] }
48
+ restype: STRING { result = ASTNode.new(:resourcetype, val[0]).capitalize! }
49
49
  restitle: LBRACK STRING RBRACK { result = ASTNode.new :resourcetitle, val[1] }
50
50
  resparams: LBRACE exp RBRACE { result = val[1] }
51
51
 
data/lib/puppetdb/parser.rb CHANGED
@@ -319,7 +319,7 @@ module_eval(<<'.,.,', 'grammar.y', 40)
319
319
 
320
320
  module_eval(<<'.,.,', 'grammar.y', 41)
321
321
  def _reduce_21(val, _values, result)
322
- result = [val[0], val[1]]
322
+ result = val[0].value == "Class" ? [val[0], val[1].capitalize!] : [val[0], val[1]]
323
323
  result
324
324
  end
325
325
  .,.,
@@ -340,7 +340,7 @@ module_eval(<<'.,.,', 'grammar.y', 43)
340
340
 
341
341
  module_eval(<<'.,.,', 'grammar.y', 44)
342
342
  def _reduce_24(val, _values, result)
343
- result = [val[0], val[1], val[2]]
343
+ result = val[0].value == "Class" ? [val[0], val[1].capitalize!, val[2]] : [val[0], val[1], val[2]]
344
344
  result
345
345
  end
346
346
  .,.,
@@ -349,7 +349,7 @@ module_eval(<<'.,.,', 'grammar.y', 44)
349
349
 
350
350
  module_eval(<<'.,.,', 'grammar.y', 47)
351
351
  def _reduce_26(val, _values, result)
352
- result = ASTNode.new :resourcetype, val[0]
352
+ result = ASTNode.new(:resourcetype, val[0]).capitalize!
353
353
  result
354
354
  end
355
355
  .,.,
metadata CHANGED
@@ -1,95 +1,95 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ruby-puppetdb
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 1
7
- - 1
8
- - 1
9
- version: 1.1.1
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.2.0
10
5
  platform: ruby
11
- authors:
6
+ authors:
12
7
  - Dan Bode
13
- - "Erik Dal\xC3\xA9n"
8
+ - Erik Dalén
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-06-05 00:00:00 +02:00
19
- default_executable:
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
12
+ date: 2013-06-06 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
22
15
  name: json
23
- prerelease: false
24
- requirement: &id001 !ruby/object:Gem::Requirement
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- segments:
29
- - 0
30
- version: "0"
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - '>='
19
+ - !ruby/object:Gem::Version
20
+ version: '0'
31
21
  type: :runtime
32
- version_requirements: *id001
33
- - !ruby/object:Gem::Dependency
34
- name: rspec
35
22
  prerelease: false
36
- requirement: &id002 !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "="
39
- - !ruby/object:Gem::Version
40
- segments:
41
- - 2
42
- - 13
43
- version: "2.13"
23
+ version_requirements: !ruby/object:Gem::Requirement
24
+ requirements:
25
+ - - '>='
26
+ - !ruby/object:Gem::Version
27
+ version: '0'
28
+ - !ruby/object:Gem::Dependency
29
+ name: rspec
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ - - '='
33
+ - !ruby/object:Gem::Version
34
+ version: '2.13'
44
35
  type: :development
45
- version_requirements: *id002
46
- - !ruby/object:Gem::Dependency
47
- name: rake
48
36
  prerelease: false
49
- requirement: &id003 !ruby/object:Gem::Requirement
50
- requirements:
51
- - - ">="
52
- - !ruby/object:Gem::Version
53
- segments:
54
- - 0
55
- version: "0"
37
+ version_requirements: !ruby/object:Gem::Requirement
38
+ requirements:
39
+ - - '='
40
+ - !ruby/object:Gem::Version
41
+ version: '2.13'
42
+ - !ruby/object:Gem::Dependency
43
+ name: rake
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - '>='
47
+ - !ruby/object:Gem::Version
48
+ version: '0'
56
49
  type: :development
57
- version_requirements: *id003
58
- - !ruby/object:Gem::Dependency
59
- name: puppetlabs_spec_helper
60
50
  prerelease: false
61
- requirement: &id004 !ruby/object:Gem::Requirement
62
- requirements:
63
- - - ">="
64
- - !ruby/object:Gem::Version
65
- segments:
66
- - 0
67
- version: "0"
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ requirements:
53
+ - - '>='
54
+ - !ruby/object:Gem::Version
55
+ version: '0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: puppetlabs_spec_helper
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
68
63
  type: :development
69
- version_requirements: *id004
70
- - !ruby/object:Gem::Dependency
71
- name: puppet
72
64
  prerelease: false
73
- requirement: &id005 !ruby/object:Gem::Requirement
74
- requirements:
75
- - - ">="
76
- - !ruby/object:Gem::Version
77
- segments:
78
- - 0
79
- version: "0"
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: puppet
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - '>='
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
80
77
  type: :development
81
- version_requirements: *id005
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - '>='
82
+ - !ruby/object:Gem::Version
83
+ version: '0'
82
84
  description: A higher level query language for PuppetDB.
83
- email:
85
+ email:
84
86
  - dan@puppetlabs.com
85
87
  - erik.gustav.dalen@gmail.com
86
- executables:
88
+ executables:
87
89
  - find-nodes
88
90
  extensions: []
89
-
90
91
  extra_rdoc_files: []
91
-
92
- files:
92
+ files:
93
93
  - .gitignore
94
94
  - .travis.yml
95
95
  - COPYING
@@ -132,37 +132,31 @@ files:
132
132
  - spec/unit/puppet/parser/functions/pdbstatusquery_spec.rb
133
133
  - spec/unit/puppet/parser/functions/query_facts_spec.rb
134
134
  - spec/unit/puppet/parser/functions/query_nodes_spec.rb
135
- has_rdoc: true
136
135
  homepage: https://github.com/dalen/puppet-puppetdbquery
137
- licenses:
136
+ licenses:
138
137
  - Apache v2
138
+ metadata: {}
139
139
  post_install_message:
140
140
  rdoc_options: []
141
-
142
- require_paths:
141
+ require_paths:
143
142
  - lib
144
- required_ruby_version: !ruby/object:Gem::Requirement
145
- requirements:
146
- - - ">="
147
- - !ruby/object:Gem::Version
148
- segments:
149
- - 0
150
- version: "0"
151
- required_rubygems_version: !ruby/object:Gem::Requirement
152
- requirements:
153
- - - ">="
154
- - !ruby/object:Gem::Version
155
- segments:
156
- - 0
157
- version: "0"
143
+ required_ruby_version: !ruby/object:Gem::Requirement
144
+ requirements:
145
+ - - '>='
146
+ - !ruby/object:Gem::Version
147
+ version: '0'
148
+ required_rubygems_version: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - '>='
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
158
153
  requirements: []
159
-
160
154
  rubyforge_project:
161
- rubygems_version: 1.3.6
155
+ rubygems_version: 2.0.3
162
156
  signing_key:
163
- specification_version: 3
157
+ specification_version: 4
164
158
  summary: Query functions for PuppetDB
165
- test_files:
159
+ test_files:
166
160
  - examples/nova_functions.pp
167
161
  - examples/query_node_examples.pp
168
162
  - examples/query_resource_examples.pp