puppet 0.24.6 → 0.24.7

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (383) hide show
  1. data/CHANGELOG +115 -0
  2. data/Rakefile +43 -14
  3. data/bin/puppetca +6 -5
  4. data/bin/puppetdoc +109 -15
  5. data/bin/ralsh +3 -1
  6. data/conf/redhat/puppet.spec +74 -48
  7. data/examples/mcx_dock_absent.pp +4 -0
  8. data/examples/mcx_dock_default.pp +118 -0
  9. data/examples/mcx_dock_full.pp +125 -0
  10. data/examples/mcx_dock_invalid.pp +9 -0
  11. data/examples/mcx_nogroup.pp +118 -0
  12. data/examples/mcx_notexists_absent.pp +4 -0
  13. data/ext/emacs/puppet-mode.el +1 -1
  14. data/lib/puppet.rb +1 -1
  15. data/lib/puppet/external/nagios/base.rb +114 -71
  16. data/lib/puppet/feature/base.rb +6 -0
  17. data/lib/puppet/indirector/yaml.rb +12 -3
  18. data/lib/puppet/module.rb +1 -1
  19. data/lib/puppet/network/client/master.rb +1 -1
  20. data/lib/puppet/network/xmlrpc/client.rb +3 -1
  21. data/lib/puppet/parameter.rb +1 -1
  22. data/lib/puppet/parser/ast.rb +15 -0
  23. data/lib/puppet/parser/ast/astarray.rb +1 -2
  24. data/lib/puppet/parser/ast/casestatement.rb +2 -0
  25. data/lib/puppet/parser/ast/collection.rb +2 -0
  26. data/lib/puppet/parser/ast/comparison_operator.rb +4 -0
  27. data/lib/puppet/parser/ast/definition.rb +2 -0
  28. data/lib/puppet/parser/ast/else.rb +3 -0
  29. data/lib/puppet/parser/ast/function.rb +19 -12
  30. data/lib/puppet/parser/ast/hostclass.rb +9 -1
  31. data/lib/puppet/parser/ast/ifstatement.rb +3 -0
  32. data/lib/puppet/parser/ast/node.rb +3 -0
  33. data/lib/puppet/parser/ast/resource.rb +3 -0
  34. data/lib/puppet/parser/ast/resource_defaults.rb +2 -0
  35. data/lib/puppet/parser/ast/resource_override.rb +3 -0
  36. data/lib/puppet/parser/ast/vardef.rb +3 -0
  37. data/lib/puppet/parser/functions.rb +14 -0
  38. data/lib/puppet/parser/functions/inline_template.rb +21 -0
  39. data/lib/puppet/parser/functions/template.rb +3 -2
  40. data/lib/puppet/parser/lexer.rb +56 -7
  41. data/lib/puppet/parser/parser.rb +114 -98
  42. data/lib/puppet/parser/parser_support.rb +24 -4
  43. data/lib/puppet/parser/resource/reference.rb +4 -3
  44. data/lib/puppet/parser/templatewrapper.rb +30 -22
  45. data/lib/puppet/property.rb +1 -1
  46. data/lib/puppet/property/list.rb +7 -2
  47. data/lib/puppet/property/ordered_list.rb +22 -0
  48. data/lib/puppet/provider/augeas/augeas.rb +189 -0
  49. data/lib/puppet/provider/computer/computer.rb +22 -0
  50. data/lib/puppet/provider/confine.rb +4 -1
  51. data/lib/puppet/provider/confine/variable.rb +13 -2
  52. data/lib/puppet/provider/confine_collection.rb +4 -1
  53. data/lib/puppet/provider/confiner.rb +1 -1
  54. data/lib/puppet/provider/group/directoryservice.rb +6 -3
  55. data/lib/puppet/provider/group/groupadd.rb +5 -2
  56. data/lib/puppet/provider/group/ldap.rb +11 -9
  57. data/lib/puppet/provider/group/netinfo.rb +8 -4
  58. data/lib/puppet/provider/group/pw.rb +5 -1
  59. data/lib/puppet/provider/host/netinfo.rb +5 -2
  60. data/lib/puppet/provider/macauthorization/macauthorization.rb +315 -0
  61. data/lib/puppet/provider/mcx/mcxcontent.rb +201 -0
  62. data/lib/puppet/provider/nameservice/directoryservice.rb +210 -107
  63. data/lib/puppet/provider/nameservice/netinfo.rb +7 -2
  64. data/lib/puppet/provider/package/appdmg.rb +0 -3
  65. data/lib/puppet/provider/package/apt.rb +6 -0
  66. data/lib/puppet/provider/package/rpm.rb +2 -0
  67. data/lib/puppet/provider/package/yum.rb +5 -1
  68. data/lib/puppet/provider/package/yumhelper.py +9 -0
  69. data/lib/puppet/provider/service/base.rb +9 -6
  70. data/lib/puppet/provider/service/daemontools.rb +25 -15
  71. data/lib/puppet/provider/service/debian.rb +6 -2
  72. data/lib/puppet/provider/service/freebsd.rb +5 -2
  73. data/lib/puppet/provider/service/gentoo.rb +6 -3
  74. data/lib/puppet/provider/service/init.rb +31 -21
  75. data/lib/puppet/provider/service/launchd.rb +195 -0
  76. data/lib/puppet/provider/service/redhat.rb +5 -2
  77. data/lib/puppet/provider/service/runit.rb +30 -20
  78. data/lib/puppet/provider/service/smf.rb +7 -4
  79. data/lib/puppet/provider/ssh_authorized_key/parsed.rb +21 -1
  80. data/lib/puppet/provider/user/directoryservice.rb +1 -0
  81. data/lib/puppet/provider/user/netinfo.rb +9 -3
  82. data/lib/puppet/provider/user/user_role_add.rb +43 -6
  83. data/lib/puppet/provider/zfs/solaris.rb +45 -0
  84. data/lib/puppet/provider/zone/solaris.rb +8 -4
  85. data/lib/puppet/provider/zpool/solaris.rb +116 -0
  86. data/lib/puppet/rails/database/003_add_environment_to_host.rb +9 -0
  87. data/lib/puppet/rails/database/schema.rb +1 -0
  88. data/lib/puppet/rails/host.rb +4 -0
  89. data/lib/puppet/reference/configuration.rb +1 -1
  90. data/lib/puppet/reports/tagmail.rb +15 -6
  91. data/lib/puppet/transaction/change.rb +3 -5
  92. data/lib/puppet/transportable.rb +1 -0
  93. data/lib/puppet/type/augeas.rb +155 -0
  94. data/lib/puppet/type/computer.rb +62 -0
  95. data/lib/puppet/type/exec.rb +2 -1
  96. data/lib/puppet/type/file.rb +1 -1
  97. data/lib/puppet/type/file/ensure.rb +8 -5
  98. data/lib/puppet/type/file/mode.rb +0 -14
  99. data/lib/puppet/type/file/owner.rb +32 -64
  100. data/lib/puppet/type/file/selcontext.rb +3 -8
  101. data/lib/puppet/type/group.rb +27 -45
  102. data/lib/puppet/type/k5login.rb +1 -1
  103. data/lib/puppet/type/macauthorization.rb +141 -0
  104. data/lib/puppet/type/mcx.rb +115 -0
  105. data/lib/puppet/type/mount.rb +1 -1
  106. data/lib/puppet/type/nagios_hostdependency.rb +3 -0
  107. data/lib/puppet/type/ssh_authorized_key.rb +16 -0
  108. data/lib/puppet/type/tidy.rb +43 -14
  109. data/lib/puppet/type/user.rb +25 -1
  110. data/lib/puppet/type/zfs.rb +51 -0
  111. data/lib/puppet/type/zone.rb +8 -0
  112. data/lib/puppet/type/zpool.rb +93 -0
  113. data/lib/puppet/util.rb +17 -38
  114. data/lib/puppet/util/file_locking.rb +44 -0
  115. data/lib/puppet/util/filetype.rb +3 -3
  116. data/lib/puppet/util/log.rb +1 -16
  117. data/lib/puppet/util/metric.rb +0 -5
  118. data/lib/puppet/util/rdoc.rb +85 -0
  119. data/lib/puppet/util/rdoc/code_objects.rb +219 -0
  120. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +829 -0
  121. data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +1051 -0
  122. data/lib/puppet/util/rdoc/parser.rb +437 -0
  123. data/lib/puppet/util/selinux.rb +135 -63
  124. data/lib/puppet/util/settings.rb +136 -126
  125. data/lib/puppet/util/storage.rb +4 -2
  126. data/spec/Rakefile +91 -0
  127. data/spec/integration/checksum.rb +47 -0
  128. data/spec/integration/defaults.rb +47 -0
  129. data/spec/integration/file_serving/configuration.rb +43 -0
  130. data/spec/integration/file_serving/content.rb +18 -0
  131. data/spec/integration/file_serving/metadata.rb +18 -0
  132. data/spec/integration/indirector/direct_file_server.rb +80 -0
  133. data/spec/integration/indirector/file_content/file_server.rb +18 -0
  134. data/spec/integration/indirector/file_metadata/file_server.rb +18 -0
  135. data/spec/integration/indirector/module_files.rb +57 -0
  136. data/spec/integration/indirector/node/ldap.rb +15 -0
  137. data/spec/integration/indirector/rest.rb +464 -0
  138. data/spec/integration/network/server/mongrel.rb +48 -0
  139. data/spec/integration/network/server/webrick.rb +48 -0
  140. data/spec/integration/node.rb +93 -0
  141. data/spec/integration/node/catalog.rb +54 -0
  142. data/spec/integration/node/facts.rb +45 -0
  143. data/spec/integration/provider/package.rb +26 -0
  144. data/spec/integration/provider/service/init.rb +32 -0
  145. data/spec/integration/reference/providers.rb +17 -0
  146. data/spec/integration/reports.rb +14 -0
  147. data/spec/integration/transaction/report.rb +26 -0
  148. data/spec/integration/type/package.rb +22 -0
  149. data/spec/integration/util/file_locking.rb +36 -0
  150. data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb +46 -0
  151. data/spec/monkey_patches/alias_should_to_must.rb +5 -0
  152. data/spec/shared_behaviours/file_server_terminus.rb +42 -0
  153. data/spec/shared_behaviours/file_serving.rb +64 -0
  154. data/spec/shared_behaviours/memory_terminus.rb +32 -0
  155. data/spec/spec.opts +5 -0
  156. data/spec/spec_helper.rb +36 -0
  157. data/spec/unit/executables/client/certhandler.rb +122 -0
  158. data/spec/unit/file_serving/configuration.rb +224 -0
  159. data/spec/unit/file_serving/configuration/parser.rb +135 -0
  160. data/spec/unit/file_serving/content.rb +71 -0
  161. data/spec/unit/file_serving/file_base.rb +124 -0
  162. data/spec/unit/file_serving/fileset.rb +239 -0
  163. data/spec/unit/file_serving/indirection_hooks.rb +124 -0
  164. data/spec/unit/file_serving/metadata.rb +187 -0
  165. data/spec/unit/file_serving/mount.rb +143 -0
  166. data/spec/unit/file_serving/terminus_helper.rb +76 -0
  167. data/spec/unit/indirector.rb +152 -0
  168. data/spec/unit/indirector/catalog/compiler.rb +156 -0
  169. data/spec/unit/indirector/catalog/yaml.rb +25 -0
  170. data/spec/unit/indirector/checksum/file.rb +139 -0
  171. data/spec/unit/indirector/code.rb +33 -0
  172. data/spec/unit/indirector/direct_file_server.rb +89 -0
  173. data/spec/unit/indirector/envelope.rb +47 -0
  174. data/spec/unit/indirector/exec.rb +51 -0
  175. data/spec/unit/indirector/facts/facter.rb +76 -0
  176. data/spec/unit/indirector/facts/yaml.rb +26 -0
  177. data/spec/unit/indirector/file.rb +154 -0
  178. data/spec/unit/indirector/file_content/file.rb +18 -0
  179. data/spec/unit/indirector/file_content/file_server.rb +18 -0
  180. data/spec/unit/indirector/file_content/modules.rb +18 -0
  181. data/spec/unit/indirector/file_content/rest.rb +11 -0
  182. data/spec/unit/indirector/file_metadata/file.rb +52 -0
  183. data/spec/unit/indirector/file_metadata/file_server.rb +18 -0
  184. data/spec/unit/indirector/file_metadata/modules.rb +42 -0
  185. data/spec/unit/indirector/file_metadata/rest.rb +9 -0
  186. data/spec/unit/indirector/file_server.rb +184 -0
  187. data/spec/unit/indirector/indirection.rb +731 -0
  188. data/spec/unit/indirector/ldap.rb +143 -0
  189. data/spec/unit/indirector/memory.rb +29 -0
  190. data/spec/unit/indirector/module_files.rb +259 -0
  191. data/spec/unit/indirector/node/exec.rb +69 -0
  192. data/spec/unit/indirector/node/ldap.rb +424 -0
  193. data/spec/unit/indirector/node/memory.rb +19 -0
  194. data/spec/unit/indirector/node/plain.rb +19 -0
  195. data/spec/unit/indirector/node/rest.rb +13 -0
  196. data/spec/unit/indirector/node/yaml.rb +25 -0
  197. data/spec/unit/indirector/plain.rb +29 -0
  198. data/spec/unit/indirector/report/processor.rb +81 -0
  199. data/spec/unit/indirector/request.rb +87 -0
  200. data/spec/unit/indirector/rest.rb +372 -0
  201. data/spec/unit/indirector/ssl_rsa/file.rb +116 -0
  202. data/spec/unit/indirector/terminus.rb +245 -0
  203. data/spec/unit/indirector/yaml.rb +145 -0
  204. data/spec/unit/module.rb +247 -0
  205. data/spec/unit/network/client.rb +45 -0
  206. data/spec/unit/network/client/master.rb +442 -0
  207. data/spec/unit/network/handler/fileserver.rb +179 -0
  208. data/spec/unit/network/http.rb +35 -0
  209. data/spec/unit/network/http/mongrel.rb +117 -0
  210. data/spec/unit/network/http/mongrel/rest.rb +377 -0
  211. data/spec/unit/network/http/mongrel/xmlrpc.rb +0 -0
  212. data/spec/unit/network/http/webrick.rb +127 -0
  213. data/spec/unit/network/http/webrick/rest.rb +323 -0
  214. data/spec/unit/network/http/webrick/xmlrpc.rb +0 -0
  215. data/spec/unit/network/http_pool.rb +238 -0
  216. data/spec/unit/network/server.rb +316 -0
  217. data/spec/unit/network/xmlrpc/client.rb +13 -0
  218. data/spec/unit/node.rb +167 -0
  219. data/spec/unit/node/catalog.rb +864 -0
  220. data/spec/unit/node/environment.rb +37 -0
  221. data/spec/unit/node/facts.rb +44 -0
  222. data/spec/unit/other/checksum.rb +92 -0
  223. data/spec/unit/other/pgraph.rb +210 -0
  224. data/spec/unit/other/transaction.rb +33 -0
  225. data/spec/unit/other/transbucket.rb +172 -0
  226. data/spec/unit/other/transobject.rb +92 -0
  227. data/spec/unit/parameter.rb +24 -0
  228. data/spec/unit/parser/ast.rb +37 -0
  229. data/spec/unit/parser/ast/arithmetic_operator.rb +73 -0
  230. data/spec/unit/parser/ast/astarray.rb +66 -0
  231. data/spec/unit/parser/ast/boolean_operator.rb +53 -0
  232. data/spec/unit/parser/ast/collexpr.rb +92 -0
  233. data/spec/unit/parser/ast/comparison_operator.rb +92 -0
  234. data/spec/unit/parser/ast/definition.rb +195 -0
  235. data/spec/unit/parser/ast/function.rb +77 -0
  236. data/spec/unit/parser/ast/hostclass.rb +148 -0
  237. data/spec/unit/parser/ast/minus.rb +36 -0
  238. data/spec/unit/parser/ast/node.rb +125 -0
  239. data/spec/unit/parser/ast/nop.rb +20 -0
  240. data/spec/unit/parser/ast/not.rb +30 -0
  241. data/spec/unit/parser/ast/resource_override.rb +51 -0
  242. data/spec/unit/parser/ast/resource_reference.rb +63 -0
  243. data/spec/unit/parser/ast/vardef.rb +47 -0
  244. data/spec/unit/parser/collector.rb +426 -0
  245. data/spec/unit/parser/compiler.rb +561 -0
  246. data/spec/unit/parser/functions.rb +83 -0
  247. data/spec/unit/parser/functions/inline_template.rb +59 -0
  248. data/spec/unit/parser/functions/template.rb +62 -0
  249. data/spec/unit/parser/interpreter.rb +138 -0
  250. data/spec/unit/parser/lexer.rb +646 -0
  251. data/spec/unit/parser/parser.rb +228 -0
  252. data/spec/unit/parser/resource.rb +336 -0
  253. data/spec/unit/parser/resource/reference.rb +95 -0
  254. data/spec/unit/parser/scope.rb +87 -0
  255. data/spec/unit/parser/templatewrapper.rb +129 -0
  256. data/spec/unit/property.rb +35 -0
  257. data/spec/unit/property/keyvalue.rb +168 -0
  258. data/spec/unit/property/list.rb +156 -0
  259. data/spec/unit/property/ordered_list.rb +64 -0
  260. data/spec/unit/provider/augeas/augeas.rb +238 -0
  261. data/spec/unit/provider/confine.rb +78 -0
  262. data/spec/unit/provider/confine/exists.rb +81 -0
  263. data/spec/unit/provider/confine/false.rb +53 -0
  264. data/spec/unit/provider/confine/feature.rb +60 -0
  265. data/spec/unit/provider/confine/true.rb +53 -0
  266. data/spec/unit/provider/confine/variable.rb +107 -0
  267. data/spec/unit/provider/confine_collection.rb +134 -0
  268. data/spec/unit/provider/confiner.rb +63 -0
  269. data/spec/unit/provider/group/groupadd.rb +31 -0
  270. data/spec/unit/provider/group/ldap.rb +105 -0
  271. data/spec/unit/provider/ldap.rb +248 -0
  272. data/spec/unit/provider/macauthorization.rb +147 -0
  273. data/spec/unit/provider/mcx/mcxcontent.rb +175 -0
  274. data/spec/unit/provider/mount.rb +130 -0
  275. data/spec/unit/provider/mount/parsed.rb +185 -0
  276. data/spec/unit/provider/package/apt.rb +138 -0
  277. data/spec/unit/provider/package/dpkg.rb +163 -0
  278. data/spec/unit/provider/package/gem.rb +87 -0
  279. data/spec/unit/provider/package/hpux.rb +52 -0
  280. data/spec/unit/provider/selboolean.rb +37 -0
  281. data/spec/unit/provider/selmodule-example.pp +0 -0
  282. data/spec/unit/provider/selmodule.rb +66 -0
  283. data/spec/unit/provider/service/daemontools.rb +124 -0
  284. data/spec/unit/provider/service/launchd.rb +134 -0
  285. data/spec/unit/provider/service/runit.rb +117 -0
  286. data/spec/unit/provider/ssh_authorized_key/parsed.rb +102 -0
  287. data/spec/unit/provider/user/hpux.rb +25 -0
  288. data/spec/unit/provider/user/ldap.rb +279 -0
  289. data/spec/unit/provider/user/user_role_add.rb +249 -0
  290. data/spec/unit/provider/user/useradd.rb +115 -0
  291. data/spec/unit/provider/zfs/solaris.rb +87 -0
  292. data/spec/unit/provider/zone/solaris.rb +42 -0
  293. data/spec/unit/provider/zpool/solaris.rb +179 -0
  294. data/spec/unit/rails.rb +125 -0
  295. data/spec/unit/relationship.rb +149 -0
  296. data/spec/unit/reports.rb +61 -0
  297. data/spec/unit/resource_reference.rb +73 -0
  298. data/spec/unit/simple_graph.rb +280 -0
  299. data/spec/unit/transaction/change.rb +187 -0
  300. data/spec/unit/transaction/event.rb +25 -0
  301. data/spec/unit/transaction/report.rb +40 -0
  302. data/spec/unit/type.rb +64 -0
  303. data/spec/unit/type/augeas.rb +113 -0
  304. data/spec/unit/type/computer.rb +82 -0
  305. data/spec/unit/type/exec.rb +91 -0
  306. data/spec/unit/type/file.rb +155 -0
  307. data/spec/unit/type/file/ensure.rb +21 -0
  308. data/spec/unit/type/file/group.rb +118 -0
  309. data/spec/unit/type/file/owner.rb +132 -0
  310. data/spec/unit/type/file/selinux.rb +82 -0
  311. data/spec/unit/type/group.rb +40 -0
  312. data/spec/unit/type/macauthorization.rb +78 -0
  313. data/spec/unit/type/mcx.rb +108 -0
  314. data/spec/unit/type/mount.rb +219 -0
  315. data/spec/unit/type/nagios.rb +63 -0
  316. data/spec/unit/type/noop_metaparam.rb +38 -0
  317. data/spec/unit/type/package.rb +246 -0
  318. data/spec/unit/type/resources.rb +27 -0
  319. data/spec/unit/type/schedule.rb +339 -0
  320. data/spec/unit/type/selboolean.rb +47 -0
  321. data/spec/unit/type/selmodule.rb +18 -0
  322. data/spec/unit/type/service.rb +254 -0
  323. data/spec/unit/type/ssh_authorized_key.rb +106 -0
  324. data/spec/unit/type/tidy.rb +68 -0
  325. data/spec/unit/type/user.rb +260 -0
  326. data/spec/unit/type/zfs.rb +45 -0
  327. data/spec/unit/type/zone.rb +20 -0
  328. data/spec/unit/type/zpool.rb +110 -0
  329. data/spec/unit/util/checksums.rb +99 -0
  330. data/spec/unit/util/constant_inflector.rb +70 -0
  331. data/spec/unit/util/file_locking.rb +115 -0
  332. data/spec/unit/util/ldap/connection.rb +169 -0
  333. data/spec/unit/util/ldap/generator.rb +54 -0
  334. data/spec/unit/util/ldap/manager.rb +654 -0
  335. data/spec/unit/util/loadedfile.rb +65 -0
  336. data/spec/unit/util/log.rb +107 -0
  337. data/spec/unit/util/metric.rb +95 -0
  338. data/spec/unit/util/nagios_maker.rb +128 -0
  339. data/spec/unit/util/posix.rb +256 -0
  340. data/spec/unit/util/resource_template.rb +58 -0
  341. data/spec/unit/util/selinux.rb +219 -0
  342. data/spec/unit/util/settings.rb +847 -0
  343. data/spec/unit/util/storage.rb +248 -0
  344. data/spec/unit/util/tagging.rb +92 -0
  345. data/spec/unit/util/uri_helper.rb +41 -0
  346. data/spec/unit/util/user_attr.rb +47 -0
  347. data/spec/unit/util/warnings.rb +35 -0
  348. data/test/certmgr/support.rb +0 -6
  349. data/test/data/providers/ssh_authorized_key/parsed/authorized_keys +1 -0
  350. data/test/data/snippets/multilinecomments.pp +6 -0
  351. data/test/data/snippets/multipleclass.pp +9 -0
  352. data/test/language/functions.rb +11 -1
  353. data/test/language/snippets.rb +16 -0
  354. data/test/lib/puppettest/runnable_test.rb +1 -1
  355. data/test/network/handler/fileserver.rb +5 -0
  356. data/test/other/report.rb +0 -4
  357. data/test/ral/type/resources.rb +2 -19
  358. data/test/util/settings.rb +4 -4
  359. data/test/util/storage.rb +0 -24
  360. data/test/util/utiltest.rb +0 -33
  361. metadata +319 -26
  362. data/conf/debian/README.source +0 -2
  363. data/conf/debian/TODO.Debian +0 -1
  364. data/conf/debian/changelog +0 -257
  365. data/conf/debian/compat +0 -1
  366. data/conf/debian/control +0 -45
  367. data/conf/debian/copyright +0 -17
  368. data/conf/debian/docs +0 -1
  369. data/conf/debian/fileserver.conf +0 -12
  370. data/conf/debian/puppet.NEWS +0 -63
  371. data/conf/debian/puppet.conf +0 -8
  372. data/conf/debian/puppet.dirs +0 -7
  373. data/conf/debian/puppet.files +0 -6
  374. data/conf/debian/puppet.init +0 -64
  375. data/conf/debian/puppet.logrotate +0 -11
  376. data/conf/debian/puppet.postinst +0 -9
  377. data/conf/debian/puppet.postrm +0 -21
  378. data/conf/debian/puppet.preinst +0 -25
  379. data/conf/debian/puppetmaster.files +0 -4
  380. data/conf/debian/puppetmaster.init +0 -58
  381. data/conf/debian/rules +0 -115
  382. data/conf/debian/watch +0 -2
  383. data/lib/puppet/type/nagios_hostgroupescalation.rb +0 -3
@@ -29,7 +29,7 @@ module Puppet
29
29
 
30
30
  class Parser < Racc::Parser
31
31
 
32
- module_eval <<'..end grammar.ra modeval..id5cb4445525', 'grammar.ra', 741
32
+ module_eval <<'..end grammar.ra modeval..id987bcfd032', 'grammar.ra', 759
33
33
 
34
34
  # It got too annoying having code in a file that needs to be compiled.
35
35
  require 'puppet/parser/parser_support'
@@ -41,7 +41,7 @@ require 'puppet/parser/parser_support'
41
41
 
42
42
  # $Id$
43
43
 
44
- ..end grammar.ra modeval..id5cb4445525
44
+ ..end grammar.ra modeval..id987bcfd032
45
45
 
46
46
  ##### racc 1.4.5 generates ###
47
47
 
@@ -1103,8 +1103,9 @@ module_eval <<'.,.,', 'grammar.ra', 130
1103
1103
  end
1104
1104
  .,.,
1105
1105
 
1106
- module_eval <<'.,.,', 'grammar.ra', 151
1106
+ module_eval <<'.,.,', 'grammar.ra', 152
1107
1107
  def _reduce_34( val, _values, result )
1108
+ @lexer.commentpop
1108
1109
  array = val[2]
1109
1110
  if array.instance_of?(AST::ResourceInstance)
1110
1111
  array = [array]
@@ -1127,7 +1128,7 @@ module_eval <<'.,.,', 'grammar.ra', 151
1127
1128
  end
1128
1129
  .,.,
1129
1130
 
1130
- module_eval <<'.,.,', 'grammar.ra', 154
1131
+ module_eval <<'.,.,', 'grammar.ra', 155
1131
1132
  def _reduce_35( val, _values, result )
1132
1133
  # This is a deprecated syntax.
1133
1134
  error "All resource specifications require names"
@@ -1135,7 +1136,7 @@ module_eval <<'.,.,', 'grammar.ra', 154
1135
1136
  end
1136
1137
  .,.,
1137
1138
 
1138
- module_eval <<'.,.,', 'grammar.ra', 157
1139
+ module_eval <<'.,.,', 'grammar.ra', 158
1139
1140
  def _reduce_36( val, _values, result )
1140
1141
  # a defaults setting for a type
1141
1142
  result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
@@ -1143,14 +1144,15 @@ module_eval <<'.,.,', 'grammar.ra', 157
1143
1144
  end
1144
1145
  .,.,
1145
1146
 
1146
- module_eval <<'.,.,', 'grammar.ra', 162
1147
+ module_eval <<'.,.,', 'grammar.ra', 164
1147
1148
  def _reduce_37( val, _values, result )
1149
+ @lexer.commentpop
1148
1150
  result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
1149
1151
  result
1150
1152
  end
1151
1153
  .,.,
1152
1154
 
1153
- module_eval <<'.,.,', 'grammar.ra', 189
1155
+ module_eval <<'.,.,', 'grammar.ra', 191
1154
1156
  def _reduce_38( val, _values, result )
1155
1157
  type = val[0]
1156
1158
 
@@ -1178,27 +1180,27 @@ module_eval <<'.,.,', 'grammar.ra', 189
1178
1180
  end
1179
1181
  .,.,
1180
1182
 
1181
- module_eval <<'.,.,', 'grammar.ra', 190
1183
+ module_eval <<'.,.,', 'grammar.ra', 192
1182
1184
  def _reduce_39( val, _values, result )
1183
1185
  result = :virtual
1184
1186
  result
1185
1187
  end
1186
1188
  .,.,
1187
1189
 
1188
- module_eval <<'.,.,', 'grammar.ra', 191
1190
+ module_eval <<'.,.,', 'grammar.ra', 193
1189
1191
  def _reduce_40( val, _values, result )
1190
1192
  result = :exported
1191
1193
  result
1192
1194
  end
1193
1195
  .,.,
1194
1196
 
1195
- module_eval <<'.,.,', 'grammar.ra', 214
1197
+ module_eval <<'.,.,', 'grammar.ra', 216
1196
1198
  def _reduce_41( val, _values, result )
1197
1199
  if val[0] =~ /^[a-z]/
1198
1200
  Puppet.warning addcontext("Collection names must now be capitalized")
1199
1201
  end
1200
1202
  type = val[0].downcase
1201
- args = {:type => type}
1203
+ args = {:type => type }
1202
1204
 
1203
1205
  if val[1].is_a?(AST::CollExpr)
1204
1206
  args[:query] = val[1]
@@ -1215,7 +1217,7 @@ module_eval <<'.,.,', 'grammar.ra', 214
1215
1217
  end
1216
1218
  .,.,
1217
1219
 
1218
- module_eval <<'.,.,', 'grammar.ra', 224
1220
+ module_eval <<'.,.,', 'grammar.ra', 226
1219
1221
  def _reduce_42( val, _values, result )
1220
1222
  if val[1]
1221
1223
  result = val[1]
@@ -1227,7 +1229,7 @@ module_eval <<'.,.,', 'grammar.ra', 224
1227
1229
  end
1228
1230
  .,.,
1229
1231
 
1230
- module_eval <<'.,.,', 'grammar.ra', 232
1232
+ module_eval <<'.,.,', 'grammar.ra', 234
1231
1233
  def _reduce_43( val, _values, result )
1232
1234
  if val[1]
1233
1235
  result = val[1]
@@ -1243,7 +1245,7 @@ module_eval <<'.,.,', 'grammar.ra', 232
1243
1245
 
1244
1246
  # reduce 45 omitted
1245
1247
 
1246
- module_eval <<'.,.,', 'grammar.ra', 240
1248
+ module_eval <<'.,.,', 'grammar.ra', 242
1247
1249
  def _reduce_46( val, _values, result )
1248
1250
  result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
1249
1251
  result
@@ -1252,7 +1254,7 @@ module_eval <<'.,.,', 'grammar.ra', 240
1252
1254
 
1253
1255
  # reduce 47 omitted
1254
1256
 
1255
- module_eval <<'.,.,', 'grammar.ra', 246
1257
+ module_eval <<'.,.,', 'grammar.ra', 248
1256
1258
  def _reduce_48( val, _values, result )
1257
1259
  result = val[1]
1258
1260
  result.parens = true
@@ -1264,7 +1266,7 @@ module_eval <<'.,.,', 'grammar.ra', 246
1264
1266
 
1265
1267
  # reduce 50 omitted
1266
1268
 
1267
- module_eval <<'.,.,', 'grammar.ra', 254
1269
+ module_eval <<'.,.,', 'grammar.ra', 256
1268
1270
  def _reduce_51( val, _values, result )
1269
1271
  result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
1270
1272
  #result = ast AST::CollExpr
@@ -1273,7 +1275,7 @@ module_eval <<'.,.,', 'grammar.ra', 254
1273
1275
  end
1274
1276
  .,.,
1275
1277
 
1276
- module_eval <<'.,.,', 'grammar.ra', 259
1278
+ module_eval <<'.,.,', 'grammar.ra', 261
1277
1279
  def _reduce_52( val, _values, result )
1278
1280
  result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
1279
1281
  #result = ast AST::CollExpr
@@ -1286,7 +1288,7 @@ module_eval <<'.,.,', 'grammar.ra', 259
1286
1288
 
1287
1289
  # reduce 54 omitted
1288
1290
 
1289
- module_eval <<'.,.,', 'grammar.ra', 266
1291
+ module_eval <<'.,.,', 'grammar.ra', 268
1290
1292
  def _reduce_55( val, _values, result )
1291
1293
  result = ast AST::ResourceInstance, :children => [val[0],val[2]]
1292
1294
  result
@@ -1295,7 +1297,7 @@ module_eval <<'.,.,', 'grammar.ra', 266
1295
1297
 
1296
1298
  # reduce 56 omitted
1297
1299
 
1298
- module_eval <<'.,.,', 'grammar.ra', 276
1300
+ module_eval <<'.,.,', 'grammar.ra', 278
1299
1301
  def _reduce_57( val, _values, result )
1300
1302
  if val[0].instance_of?(AST::ResourceInstance)
1301
1303
  result = ast AST::ASTArray, :children => [val[0],val[2]]
@@ -1311,21 +1313,21 @@ module_eval <<'.,.,', 'grammar.ra', 276
1311
1313
 
1312
1314
  # reduce 59 omitted
1313
1315
 
1314
- module_eval <<'.,.,', 'grammar.ra', 283
1316
+ module_eval <<'.,.,', 'grammar.ra', 285
1315
1317
  def _reduce_60( val, _values, result )
1316
1318
  result = ast AST::Undef, :value => :undef
1317
1319
  result
1318
1320
  end
1319
1321
  .,.,
1320
1322
 
1321
- module_eval <<'.,.,', 'grammar.ra', 287
1323
+ module_eval <<'.,.,', 'grammar.ra', 289
1322
1324
  def _reduce_61( val, _values, result )
1323
1325
  result = ast AST::Name, :value => val[0]
1324
1326
  result
1325
1327
  end
1326
1328
  .,.,
1327
1329
 
1328
- module_eval <<'.,.,', 'grammar.ra', 291
1330
+ module_eval <<'.,.,', 'grammar.ra', 293
1329
1331
  def _reduce_62( val, _values, result )
1330
1332
  result = ast AST::Type, :value => val[0]
1331
1333
  result
@@ -1344,7 +1346,7 @@ module_eval <<'.,.,', 'grammar.ra', 291
1344
1346
 
1345
1347
  # reduce 68 omitted
1346
1348
 
1347
- module_eval <<'.,.,', 'grammar.ra', 307
1349
+ module_eval <<'.,.,', 'grammar.ra', 309
1348
1350
  def _reduce_69( val, _values, result )
1349
1351
  if val[0] =~ /::/
1350
1352
  raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
@@ -1356,7 +1358,7 @@ module_eval <<'.,.,', 'grammar.ra', 307
1356
1358
  end
1357
1359
  .,.,
1358
1360
 
1359
- module_eval <<'.,.,', 'grammar.ra', 312
1361
+ module_eval <<'.,.,', 'grammar.ra', 314
1360
1362
  def _reduce_70( val, _values, result )
1361
1363
  variable = ast AST::Name, :value => val[0]
1362
1364
  result = ast AST::VarDef, :name => variable, :value => val[2], :append => true
@@ -1364,21 +1366,21 @@ module_eval <<'.,.,', 'grammar.ra', 312
1364
1366
  end
1365
1367
  .,.,
1366
1368
 
1367
- module_eval <<'.,.,', 'grammar.ra', 317
1369
+ module_eval <<'.,.,', 'grammar.ra', 319
1368
1370
  def _reduce_71( val, _values, result )
1369
1371
  result = ast AST::ASTArray
1370
1372
  result
1371
1373
  end
1372
1374
  .,.,
1373
1375
 
1374
- module_eval <<'.,.,', 'grammar.ra', 317
1376
+ module_eval <<'.,.,', 'grammar.ra', 319
1375
1377
  def _reduce_72( val, _values, result )
1376
1378
  result = val[0]
1377
1379
  result
1378
1380
  end
1379
1381
  .,.,
1380
1382
 
1381
- module_eval <<'.,.,', 'grammar.ra', 326
1383
+ module_eval <<'.,.,', 'grammar.ra', 328
1382
1384
  def _reduce_73( val, _values, result )
1383
1385
  if val[0].instance_of?(AST::ASTArray)
1384
1386
  val[0].push(val[2])
@@ -1390,14 +1392,14 @@ module_eval <<'.,.,', 'grammar.ra', 326
1390
1392
  end
1391
1393
  .,.,
1392
1394
 
1393
- module_eval <<'.,.,', 'grammar.ra', 330
1395
+ module_eval <<'.,.,', 'grammar.ra', 332
1394
1396
  def _reduce_74( val, _values, result )
1395
1397
  result = ast AST::ResourceParam, :param => val[0], :value => val[2]
1396
1398
  result
1397
1399
  end
1398
1400
  .,.,
1399
1401
 
1400
- module_eval <<'.,.,', 'grammar.ra', 335
1402
+ module_eval <<'.,.,', 'grammar.ra', 337
1401
1403
  def _reduce_75( val, _values, result )
1402
1404
  result = ast AST::ResourceParam, :param => val[0], :value => val[2],
1403
1405
  :add => true
@@ -1409,21 +1411,21 @@ module_eval <<'.,.,', 'grammar.ra', 335
1409
1411
 
1410
1412
  # reduce 77 omitted
1411
1413
 
1412
- module_eval <<'.,.,', 'grammar.ra', 343
1414
+ module_eval <<'.,.,', 'grammar.ra', 345
1413
1415
  def _reduce_78( val, _values, result )
1414
1416
  result = ast AST::ASTArray
1415
1417
  result
1416
1418
  end
1417
1419
  .,.,
1418
1420
 
1419
- module_eval <<'.,.,', 'grammar.ra', 343
1421
+ module_eval <<'.,.,', 'grammar.ra', 345
1420
1422
  def _reduce_79( val, _values, result )
1421
1423
  result = val[0]
1422
1424
  result
1423
1425
  end
1424
1426
  .,.,
1425
1427
 
1426
- module_eval <<'.,.,', 'grammar.ra', 352
1428
+ module_eval <<'.,.,', 'grammar.ra', 354
1427
1429
  def _reduce_80( val, _values, result )
1428
1430
  if val[0].instance_of?(AST::ASTArray)
1429
1431
  val[0].push(val[2])
@@ -1437,7 +1439,7 @@ module_eval <<'.,.,', 'grammar.ra', 352
1437
1439
 
1438
1440
  # reduce 81 omitted
1439
1441
 
1440
- module_eval <<'.,.,', 'grammar.ra', 361
1442
+ module_eval <<'.,.,', 'grammar.ra', 363
1441
1443
  def _reduce_82( val, _values, result )
1442
1444
  if val[0].instance_of?(AST::ASTArray)
1443
1445
  result = val[0].push(val[2])
@@ -1480,7 +1482,7 @@ module_eval <<'.,.,', 'grammar.ra', 361
1480
1482
 
1481
1483
  # reduce 98 omitted
1482
1484
 
1483
- module_eval <<'.,.,', 'grammar.ra', 388
1485
+ module_eval <<'.,.,', 'grammar.ra', 390
1484
1486
  def _reduce_99( val, _values, result )
1485
1487
  args = aryfy(val[2])
1486
1488
  result = ast AST::Function,
@@ -1491,7 +1493,7 @@ module_eval <<'.,.,', 'grammar.ra', 388
1491
1493
  end
1492
1494
  .,.,
1493
1495
 
1494
- module_eval <<'.,.,', 'grammar.ra', 393
1496
+ module_eval <<'.,.,', 'grammar.ra', 395
1495
1497
  def _reduce_100( val, _values, result )
1496
1498
  result = ast AST::Function,
1497
1499
  :name => val[0],
@@ -1501,28 +1503,28 @@ module_eval <<'.,.,', 'grammar.ra', 393
1501
1503
  end
1502
1504
  .,.,
1503
1505
 
1504
- module_eval <<'.,.,', 'grammar.ra', 397
1506
+ module_eval <<'.,.,', 'grammar.ra', 399
1505
1507
  def _reduce_101( val, _values, result )
1506
1508
  result = ast AST::String, :value => val[0]
1507
1509
  result
1508
1510
  end
1509
1511
  .,.,
1510
1512
 
1511
- module_eval <<'.,.,', 'grammar.ra', 399
1513
+ module_eval <<'.,.,', 'grammar.ra', 401
1512
1514
  def _reduce_102( val, _values, result )
1513
1515
  result = ast AST::FlatString, :value => val[0]
1514
1516
  result
1515
1517
  end
1516
1518
  .,.,
1517
1519
 
1518
- module_eval <<'.,.,', 'grammar.ra', 403
1520
+ module_eval <<'.,.,', 'grammar.ra', 405
1519
1521
  def _reduce_103( val, _values, result )
1520
1522
  result = ast AST::Boolean, :value => val[0]
1521
1523
  result
1522
1524
  end
1523
1525
  .,.,
1524
1526
 
1525
- module_eval <<'.,.,', 'grammar.ra', 408
1527
+ module_eval <<'.,.,', 'grammar.ra', 410
1526
1528
  def _reduce_104( val, _values, result )
1527
1529
  Puppet.warning addcontext("Deprecation notice: Resource references should now be capitalized")
1528
1530
  result = ast AST::ResourceReference, :type => val[0], :title => val[2]
@@ -1530,15 +1532,16 @@ module_eval <<'.,.,', 'grammar.ra', 408
1530
1532
  end
1531
1533
  .,.,
1532
1534
 
1533
- module_eval <<'.,.,', 'grammar.ra', 410
1535
+ module_eval <<'.,.,', 'grammar.ra', 412
1534
1536
  def _reduce_105( val, _values, result )
1535
1537
  result = ast AST::ResourceReference, :type => val[0], :title => val[2]
1536
1538
  result
1537
1539
  end
1538
1540
  .,.,
1539
1541
 
1540
- module_eval <<'.,.,', 'grammar.ra', 423
1542
+ module_eval <<'.,.,', 'grammar.ra', 426
1541
1543
  def _reduce_106( val, _values, result )
1544
+ @lexer.commentpop
1542
1545
  args = {
1543
1546
  :test => val[1],
1544
1547
  :statements => val[3]
@@ -1553,8 +1556,9 @@ module_eval <<'.,.,', 'grammar.ra', 423
1553
1556
  end
1554
1557
  .,.,
1555
1558
 
1556
- module_eval <<'.,.,', 'grammar.ra', 435
1559
+ module_eval <<'.,.,', 'grammar.ra', 439
1557
1560
  def _reduce_107( val, _values, result )
1561
+ @lexer.commentpop
1558
1562
  args = {
1559
1563
  :test => val[1],
1560
1564
  :statements => ast(AST::Nop)
@@ -1571,15 +1575,17 @@ module_eval <<'.,.,', 'grammar.ra', 435
1571
1575
 
1572
1576
  # reduce 108 omitted
1573
1577
 
1574
- module_eval <<'.,.,', 'grammar.ra', 440
1578
+ module_eval <<'.,.,', 'grammar.ra', 445
1575
1579
  def _reduce_109( val, _values, result )
1580
+ @lexer.commentpop
1576
1581
  result = ast AST::Else, :statements => val[2]
1577
1582
  result
1578
1583
  end
1579
1584
  .,.,
1580
1585
 
1581
- module_eval <<'.,.,', 'grammar.ra', 443
1586
+ module_eval <<'.,.,', 'grammar.ra', 449
1582
1587
  def _reduce_110( val, _values, result )
1588
+ @lexer.commentpop
1583
1589
  result = ast AST::Else, :statements => ast(AST::Nop)
1584
1590
  result
1585
1591
  end
@@ -1587,127 +1593,128 @@ module_eval <<'.,.,', 'grammar.ra', 443
1587
1593
 
1588
1594
  # reduce 111 omitted
1589
1595
 
1590
- module_eval <<'.,.,', 'grammar.ra', 460
1596
+ module_eval <<'.,.,', 'grammar.ra', 466
1591
1597
  def _reduce_112( val, _values, result )
1592
1598
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1593
1599
  result
1594
1600
  end
1595
1601
  .,.,
1596
1602
 
1597
- module_eval <<'.,.,', 'grammar.ra', 463
1603
+ module_eval <<'.,.,', 'grammar.ra', 469
1598
1604
  def _reduce_113( val, _values, result )
1599
1605
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1600
1606
  result
1601
1607
  end
1602
1608
  .,.,
1603
1609
 
1604
- module_eval <<'.,.,', 'grammar.ra', 466
1610
+ module_eval <<'.,.,', 'grammar.ra', 472
1605
1611
  def _reduce_114( val, _values, result )
1606
1612
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1607
1613
  result
1608
1614
  end
1609
1615
  .,.,
1610
1616
 
1611
- module_eval <<'.,.,', 'grammar.ra', 469
1617
+ module_eval <<'.,.,', 'grammar.ra', 475
1612
1618
  def _reduce_115( val, _values, result )
1613
1619
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1614
1620
  result
1615
1621
  end
1616
1622
  .,.,
1617
1623
 
1618
- module_eval <<'.,.,', 'grammar.ra', 472
1624
+ module_eval <<'.,.,', 'grammar.ra', 478
1619
1625
  def _reduce_116( val, _values, result )
1620
1626
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1621
1627
  result
1622
1628
  end
1623
1629
  .,.,
1624
1630
 
1625
- module_eval <<'.,.,', 'grammar.ra', 475
1631
+ module_eval <<'.,.,', 'grammar.ra', 481
1626
1632
  def _reduce_117( val, _values, result )
1627
1633
  result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1628
1634
  result
1629
1635
  end
1630
1636
  .,.,
1631
1637
 
1632
- module_eval <<'.,.,', 'grammar.ra', 478
1638
+ module_eval <<'.,.,', 'grammar.ra', 484
1633
1639
  def _reduce_118( val, _values, result )
1634
1640
  result = ast AST::Minus, :value => val[1]
1635
1641
  result
1636
1642
  end
1637
1643
  .,.,
1638
1644
 
1639
- module_eval <<'.,.,', 'grammar.ra', 481
1645
+ module_eval <<'.,.,', 'grammar.ra', 487
1640
1646
  def _reduce_119( val, _values, result )
1641
1647
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1642
1648
  result
1643
1649
  end
1644
1650
  .,.,
1645
1651
 
1646
- module_eval <<'.,.,', 'grammar.ra', 484
1652
+ module_eval <<'.,.,', 'grammar.ra', 490
1647
1653
  def _reduce_120( val, _values, result )
1648
1654
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1649
1655
  result
1650
1656
  end
1651
1657
  .,.,
1652
1658
 
1653
- module_eval <<'.,.,', 'grammar.ra', 487
1659
+ module_eval <<'.,.,', 'grammar.ra', 493
1654
1660
  def _reduce_121( val, _values, result )
1655
1661
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1656
1662
  result
1657
1663
  end
1658
1664
  .,.,
1659
1665
 
1660
- module_eval <<'.,.,', 'grammar.ra', 490
1666
+ module_eval <<'.,.,', 'grammar.ra', 496
1661
1667
  def _reduce_122( val, _values, result )
1662
1668
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1663
1669
  result
1664
1670
  end
1665
1671
  .,.,
1666
1672
 
1667
- module_eval <<'.,.,', 'grammar.ra', 493
1673
+ module_eval <<'.,.,', 'grammar.ra', 499
1668
1674
  def _reduce_123( val, _values, result )
1669
1675
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1670
1676
  result
1671
1677
  end
1672
1678
  .,.,
1673
1679
 
1674
- module_eval <<'.,.,', 'grammar.ra', 496
1680
+ module_eval <<'.,.,', 'grammar.ra', 502
1675
1681
  def _reduce_124( val, _values, result )
1676
1682
  result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1677
1683
  result
1678
1684
  end
1679
1685
  .,.,
1680
1686
 
1681
- module_eval <<'.,.,', 'grammar.ra', 499
1687
+ module_eval <<'.,.,', 'grammar.ra', 505
1682
1688
  def _reduce_125( val, _values, result )
1683
1689
  result = ast AST::Not, :value => val[1]
1684
1690
  result
1685
1691
  end
1686
1692
  .,.,
1687
1693
 
1688
- module_eval <<'.,.,', 'grammar.ra', 502
1694
+ module_eval <<'.,.,', 'grammar.ra', 508
1689
1695
  def _reduce_126( val, _values, result )
1690
1696
  result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1691
1697
  result
1692
1698
  end
1693
1699
  .,.,
1694
1700
 
1695
- module_eval <<'.,.,', 'grammar.ra', 505
1701
+ module_eval <<'.,.,', 'grammar.ra', 511
1696
1702
  def _reduce_127( val, _values, result )
1697
1703
  result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
1698
1704
  result
1699
1705
  end
1700
1706
  .,.,
1701
1707
 
1702
- module_eval <<'.,.,', 'grammar.ra', 508
1708
+ module_eval <<'.,.,', 'grammar.ra', 514
1703
1709
  def _reduce_128( val, _values, result )
1704
1710
  result = val[1]
1705
1711
  result
1706
1712
  end
1707
1713
  .,.,
1708
1714
 
1709
- module_eval <<'.,.,', 'grammar.ra', 516
1715
+ module_eval <<'.,.,', 'grammar.ra', 523
1710
1716
  def _reduce_129( val, _values, result )
1717
+ @lexer.commentpop
1711
1718
  options = val[3]
1712
1719
  unless options.instance_of?(AST::ASTArray)
1713
1720
  options = ast AST::ASTArray, :children => [val[3]]
@@ -1719,7 +1726,7 @@ module_eval <<'.,.,', 'grammar.ra', 516
1719
1726
 
1720
1727
  # reduce 130 omitted
1721
1728
 
1722
- module_eval <<'.,.,', 'grammar.ra', 526
1729
+ module_eval <<'.,.,', 'grammar.ra', 533
1723
1730
  def _reduce_131( val, _values, result )
1724
1731
  if val[0].instance_of?(AST::ASTArray)
1725
1732
  val[0].push val[1]
@@ -1731,15 +1738,17 @@ module_eval <<'.,.,', 'grammar.ra', 526
1731
1738
  end
1732
1739
  .,.,
1733
1740
 
1734
- module_eval <<'.,.,', 'grammar.ra', 530
1741
+ module_eval <<'.,.,', 'grammar.ra', 538
1735
1742
  def _reduce_132( val, _values, result )
1743
+ @lexer.commentpop
1736
1744
  result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
1737
1745
  result
1738
1746
  end
1739
1747
  .,.,
1740
1748
 
1741
- module_eval <<'.,.,', 'grammar.ra', 535
1749
+ module_eval <<'.,.,', 'grammar.ra', 544
1742
1750
  def _reduce_133( val, _values, result )
1751
+ @lexer.commentpop
1743
1752
  result = ast(AST::CaseOpt,
1744
1753
  :value => val[0],
1745
1754
  :statements => ast(AST::ASTArray)
@@ -1750,7 +1759,7 @@ module_eval <<'.,.,', 'grammar.ra', 535
1750
1759
 
1751
1760
  # reduce 134 omitted
1752
1761
 
1753
- module_eval <<'.,.,', 'grammar.ra', 545
1762
+ module_eval <<'.,.,', 'grammar.ra', 554
1754
1763
  def _reduce_135( val, _values, result )
1755
1764
  if val[0].instance_of?(AST::ASTArray)
1756
1765
  val[0].push(val[2])
@@ -1762,7 +1771,7 @@ module_eval <<'.,.,', 'grammar.ra', 545
1762
1771
  end
1763
1772
  .,.,
1764
1773
 
1765
- module_eval <<'.,.,', 'grammar.ra', 549
1774
+ module_eval <<'.,.,', 'grammar.ra', 558
1766
1775
  def _reduce_136( val, _values, result )
1767
1776
  result = ast AST::Selector, :param => val[0], :values => val[2]
1768
1777
  result
@@ -1771,16 +1780,17 @@ module_eval <<'.,.,', 'grammar.ra', 549
1771
1780
 
1772
1781
  # reduce 137 omitted
1773
1782
 
1774
- module_eval <<'.,.,', 'grammar.ra', 551
1783
+ module_eval <<'.,.,', 'grammar.ra', 564
1775
1784
  def _reduce_138( val, _values, result )
1776
- result = val[1]
1785
+ @lexer.commentpop
1786
+ result = val[1]
1777
1787
  result
1778
1788
  end
1779
1789
  .,.,
1780
1790
 
1781
1791
  # reduce 139 omitted
1782
1792
 
1783
- module_eval <<'.,.,', 'grammar.ra', 562
1793
+ module_eval <<'.,.,', 'grammar.ra', 574
1784
1794
  def _reduce_140( val, _values, result )
1785
1795
  if val[0].instance_of?(AST::ASTArray)
1786
1796
  val[0].push(val[2])
@@ -1792,7 +1802,7 @@ module_eval <<'.,.,', 'grammar.ra', 562
1792
1802
  end
1793
1803
  .,.,
1794
1804
 
1795
- module_eval <<'.,.,', 'grammar.ra', 566
1805
+ module_eval <<'.,.,', 'grammar.ra', 578
1796
1806
  def _reduce_141( val, _values, result )
1797
1807
  result = ast AST::ResourceParam, :param => val[0], :value => val[2]
1798
1808
  result
@@ -1813,28 +1823,28 @@ module_eval <<'.,.,', 'grammar.ra', 566
1813
1823
 
1814
1824
  # reduce 148 omitted
1815
1825
 
1816
- module_eval <<'.,.,', 'grammar.ra', 577
1826
+ module_eval <<'.,.,', 'grammar.ra', 589
1817
1827
  def _reduce_149( val, _values, result )
1818
1828
  result = ast AST::Default, :value => val[0]
1819
1829
  result
1820
1830
  end
1821
1831
  .,.,
1822
1832
 
1823
- module_eval <<'.,.,', 'grammar.ra', 579
1833
+ module_eval <<'.,.,', 'grammar.ra', 591
1824
1834
  def _reduce_150( val, _values, result )
1825
1835
  result = [val[0].value]
1826
1836
  result
1827
1837
  end
1828
1838
  .,.,
1829
1839
 
1830
- module_eval <<'.,.,', 'grammar.ra', 583
1840
+ module_eval <<'.,.,', 'grammar.ra', 595
1831
1841
  def _reduce_151( val, _values, result )
1832
1842
  results = val[0] << val[2].value
1833
1843
  result
1834
1844
  end
1835
1845
  .,.,
1836
1846
 
1837
- module_eval <<'.,.,', 'grammar.ra', 591
1847
+ module_eval <<'.,.,', 'grammar.ra', 603
1838
1848
  def _reduce_152( val, _values, result )
1839
1849
  val[1].each do |file|
1840
1850
  import(file)
@@ -1845,8 +1855,9 @@ module_eval <<'.,.,', 'grammar.ra', 591
1845
1855
  end
1846
1856
  .,.,
1847
1857
 
1848
- module_eval <<'.,.,', 'grammar.ra', 601
1858
+ module_eval <<'.,.,', 'grammar.ra', 614
1849
1859
  def _reduce_153( val, _values, result )
1860
+ @lexer.commentpop
1850
1861
  newdefine classname(val[1]), :arguments => val[2], :code => val[4]
1851
1862
  @lexer.indefine = false
1852
1863
  result = nil
@@ -1856,8 +1867,9 @@ module_eval <<'.,.,', 'grammar.ra', 601
1856
1867
  end
1857
1868
  .,.,
1858
1869
 
1859
- module_eval <<'.,.,', 'grammar.ra', 605
1870
+ module_eval <<'.,.,', 'grammar.ra', 619
1860
1871
  def _reduce_154( val, _values, result )
1872
+ @lexer.commentpop
1861
1873
  newdefine classname(val[1]), :arguments => val[2]
1862
1874
  @lexer.indefine = false
1863
1875
  result = nil
@@ -1865,8 +1877,9 @@ module_eval <<'.,.,', 'grammar.ra', 605
1865
1877
  end
1866
1878
  .,.,
1867
1879
 
1868
- module_eval <<'.,.,', 'grammar.ra', 613
1880
+ module_eval <<'.,.,', 'grammar.ra', 628
1869
1881
  def _reduce_155( val, _values, result )
1882
+ @lexer.commentpop
1870
1883
  # Our class gets defined in the parent namespace, not our own.
1871
1884
  @lexer.namepop
1872
1885
  newclass classname(val[1]), :code => val[4], :parent => val[2]
@@ -1875,8 +1888,9 @@ module_eval <<'.,.,', 'grammar.ra', 613
1875
1888
  end
1876
1889
  .,.,
1877
1890
 
1878
- module_eval <<'.,.,', 'grammar.ra', 618
1891
+ module_eval <<'.,.,', 'grammar.ra', 634
1879
1892
  def _reduce_156( val, _values, result )
1893
+ @lexer.commentpop
1880
1894
  # Our class gets defined in the parent namespace, not our own.
1881
1895
  @lexer.namepop
1882
1896
  newclass classname(val[1]), :parent => val[2]
@@ -1885,16 +1899,18 @@ module_eval <<'.,.,', 'grammar.ra', 618
1885
1899
  end
1886
1900
  .,.,
1887
1901
 
1888
- module_eval <<'.,.,', 'grammar.ra', 623
1902
+ module_eval <<'.,.,', 'grammar.ra', 640
1889
1903
  def _reduce_157( val, _values, result )
1904
+ @lexer.commentpop
1890
1905
  newnode val[1], :parent => val[2], :code => val[4]
1891
1906
  result = nil
1892
1907
  result
1893
1908
  end
1894
1909
  .,.,
1895
1910
 
1896
- module_eval <<'.,.,', 'grammar.ra', 626
1911
+ module_eval <<'.,.,', 'grammar.ra', 644
1897
1912
  def _reduce_158( val, _values, result )
1913
+ @lexer.commentpop
1898
1914
  newnode val[1], :parent => val[2]
1899
1915
  result = nil
1900
1916
  result
@@ -1909,7 +1925,7 @@ module_eval <<'.,.,', 'grammar.ra', 626
1909
1925
 
1910
1926
  # reduce 162 omitted
1911
1927
 
1912
- module_eval <<'.,.,', 'grammar.ra', 640
1928
+ module_eval <<'.,.,', 'grammar.ra', 658
1913
1929
  def _reduce_163( val, _values, result )
1914
1930
  result = val[0]
1915
1931
  result = [result] unless result.is_a?(Array)
@@ -1926,14 +1942,14 @@ module_eval <<'.,.,', 'grammar.ra', 640
1926
1942
 
1927
1943
  # reduce 167 omitted
1928
1944
 
1929
- module_eval <<'.,.,', 'grammar.ra', 649
1945
+ module_eval <<'.,.,', 'grammar.ra', 667
1930
1946
  def _reduce_168( val, _values, result )
1931
1947
  result = nil
1932
1948
  result
1933
1949
  end
1934
1950
  .,.,
1935
1951
 
1936
- module_eval <<'.,.,', 'grammar.ra', 653
1952
+ module_eval <<'.,.,', 'grammar.ra', 671
1937
1953
  def _reduce_169( val, _values, result )
1938
1954
  result = ast AST::ASTArray, :children => []
1939
1955
  result
@@ -1942,14 +1958,14 @@ module_eval <<'.,.,', 'grammar.ra', 653
1942
1958
 
1943
1959
  # reduce 170 omitted
1944
1960
 
1945
- module_eval <<'.,.,', 'grammar.ra', 658
1961
+ module_eval <<'.,.,', 'grammar.ra', 676
1946
1962
  def _reduce_171( val, _values, result )
1947
1963
  result = nil
1948
1964
  result
1949
1965
  end
1950
1966
  .,.,
1951
1967
 
1952
- module_eval <<'.,.,', 'grammar.ra', 662
1968
+ module_eval <<'.,.,', 'grammar.ra', 680
1953
1969
  def _reduce_172( val, _values, result )
1954
1970
  result = val[1]
1955
1971
  result = [result] unless result[0].is_a?(Array)
@@ -1959,7 +1975,7 @@ module_eval <<'.,.,', 'grammar.ra', 662
1959
1975
 
1960
1976
  # reduce 173 omitted
1961
1977
 
1962
- module_eval <<'.,.,', 'grammar.ra', 669
1978
+ module_eval <<'.,.,', 'grammar.ra', 687
1963
1979
  def _reduce_174( val, _values, result )
1964
1980
  result = val[0]
1965
1981
  result = [result] unless result[0].is_a?(Array)
@@ -1968,7 +1984,7 @@ module_eval <<'.,.,', 'grammar.ra', 669
1968
1984
  end
1969
1985
  .,.,
1970
1986
 
1971
- module_eval <<'.,.,', 'grammar.ra', 674
1987
+ module_eval <<'.,.,', 'grammar.ra', 692
1972
1988
  def _reduce_175( val, _values, result )
1973
1989
  Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
1974
1990
  result = [val[0], val[2]]
@@ -1976,7 +1992,7 @@ module_eval <<'.,.,', 'grammar.ra', 674
1976
1992
  end
1977
1993
  .,.,
1978
1994
 
1979
- module_eval <<'.,.,', 'grammar.ra', 678
1995
+ module_eval <<'.,.,', 'grammar.ra', 696
1980
1996
  def _reduce_176( val, _values, result )
1981
1997
  Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
1982
1998
  result = [val[0]]
@@ -1984,14 +2000,14 @@ module_eval <<'.,.,', 'grammar.ra', 678
1984
2000
  end
1985
2001
  .,.,
1986
2002
 
1987
- module_eval <<'.,.,', 'grammar.ra', 680
2003
+ module_eval <<'.,.,', 'grammar.ra', 698
1988
2004
  def _reduce_177( val, _values, result )
1989
2005
  result = [val[0], val[2]]
1990
2006
  result
1991
2007
  end
1992
2008
  .,.,
1993
2009
 
1994
- module_eval <<'.,.,', 'grammar.ra', 682
2010
+ module_eval <<'.,.,', 'grammar.ra', 700
1995
2011
  def _reduce_178( val, _values, result )
1996
2012
  result = [val[0]]
1997
2013
  result
@@ -2000,7 +2016,7 @@ module_eval <<'.,.,', 'grammar.ra', 682
2000
2016
 
2001
2017
  # reduce 179 omitted
2002
2018
 
2003
- module_eval <<'.,.,', 'grammar.ra', 687
2019
+ module_eval <<'.,.,', 'grammar.ra', 705
2004
2020
  def _reduce_180( val, _values, result )
2005
2021
  result = val[1]
2006
2022
  result
@@ -2009,7 +2025,7 @@ module_eval <<'.,.,', 'grammar.ra', 687
2009
2025
 
2010
2026
  # reduce 181 omitted
2011
2027
 
2012
- module_eval <<'.,.,', 'grammar.ra', 692
2028
+ module_eval <<'.,.,', 'grammar.ra', 710
2013
2029
  def _reduce_182( val, _values, result )
2014
2030
  result = val[1]
2015
2031
  result
@@ -2020,14 +2036,14 @@ module_eval <<'.,.,', 'grammar.ra', 692
2020
2036
 
2021
2037
  # reduce 184 omitted
2022
2038
 
2023
- module_eval <<'.,.,', 'grammar.ra', 698
2039
+ module_eval <<'.,.,', 'grammar.ra', 716
2024
2040
  def _reduce_185( val, _values, result )
2025
2041
  result = ast AST::Variable, :value => val[0]
2026
2042
  result
2027
2043
  end
2028
2044
  .,.,
2029
2045
 
2030
- module_eval <<'.,.,', 'grammar.ra', 706
2046
+ module_eval <<'.,.,', 'grammar.ra', 724
2031
2047
  def _reduce_186( val, _values, result )
2032
2048
  if val[1].instance_of?(AST::ASTArray)
2033
2049
  result = val[1]
@@ -2038,7 +2054,7 @@ module_eval <<'.,.,', 'grammar.ra', 706
2038
2054
  end
2039
2055
  .,.,
2040
2056
 
2041
- module_eval <<'.,.,', 'grammar.ra', 713
2057
+ module_eval <<'.,.,', 'grammar.ra', 731
2042
2058
  def _reduce_187( val, _values, result )
2043
2059
  if val[1].instance_of?(AST::ASTArray)
2044
2060
  result = val[1]
@@ -2049,7 +2065,7 @@ module_eval <<'.,.,', 'grammar.ra', 713
2049
2065
  end
2050
2066
  .,.,
2051
2067
 
2052
- module_eval <<'.,.,', 'grammar.ra', 715
2068
+ module_eval <<'.,.,', 'grammar.ra', 733
2053
2069
  def _reduce_188( val, _values, result )
2054
2070
  result = ast AST::ASTArray
2055
2071
  result
@@ -2062,7 +2078,7 @@ module_eval <<'.,.,', 'grammar.ra', 715
2062
2078
 
2063
2079
  # reduce 191 omitted
2064
2080
 
2065
- module_eval <<'.,.,', 'grammar.ra', 720
2081
+ module_eval <<'.,.,', 'grammar.ra', 738
2066
2082
  def _reduce_192( val, _values, result )
2067
2083
  result = nil
2068
2084
  result