puppet 3.4.3 → 3.5.0.rc1

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 (811) hide show
  1. data/CONTRIBUTING.md +6 -6
  2. data/Gemfile +22 -16
  3. data/LICENSE +1 -1
  4. data/README.md +33 -11
  5. data/Rakefile +1 -1
  6. data/conf/auth.conf +4 -0
  7. data/ext/build_defaults.yaml +1 -1
  8. data/ext/debian/control +6 -6
  9. data/ext/ips/transforms +1 -1
  10. data/ext/nagios/naggen +1 -1
  11. data/ext/project_data.yaml +21 -1
  12. data/ext/puppet-test +3 -3
  13. data/ext/redhat/puppet.spec.erb +28 -2
  14. data/ext/suse/puppet.spec +1 -1
  15. data/ext/upload_facts.rb +1 -1
  16. data/ext/windows/service/daemon.rb +99 -20
  17. data/lib/hiera_puppet.rb +2 -2
  18. data/lib/puppet.rb +68 -5
  19. data/lib/puppet/agent.rb +5 -1
  20. data/lib/puppet/application.rb +20 -11
  21. data/lib/puppet/application/agent.rb +1 -1
  22. data/lib/puppet/application/apply.rb +61 -41
  23. data/lib/puppet/application/cert.rb +3 -3
  24. data/lib/puppet/application/device.rb +7 -8
  25. data/lib/puppet/application/doc.rb +1 -1
  26. data/lib/puppet/application/filebucket.rb +3 -3
  27. data/lib/puppet/application/kick.rb +2 -2
  28. data/lib/puppet/application/master.rb +1 -1
  29. data/lib/puppet/application/queue.rb +9 -9
  30. data/lib/puppet/application/resource.rb +2 -2
  31. data/lib/puppet/bindings.rb +6 -6
  32. data/lib/puppet/configurer.rb +17 -14
  33. data/lib/puppet/configurer/fact_handler.rb +1 -1
  34. data/lib/puppet/confine/any.rb +26 -0
  35. data/lib/puppet/confine/exists.rb +1 -1
  36. data/lib/puppet/confiner.rb +1 -0
  37. data/lib/puppet/context.rb +55 -0
  38. data/lib/puppet/context/trusted_information.rb +56 -0
  39. data/lib/puppet/defaults.rb +97 -26
  40. data/lib/puppet/environments.rb +187 -0
  41. data/lib/puppet/error.rb +2 -1
  42. data/lib/puppet/external/pson/common.rb +1 -1
  43. data/lib/puppet/external/pson/pure/generator.rb +1 -1
  44. data/lib/puppet/external/pson/pure/parser.rb +1 -1
  45. data/lib/puppet/face/config.rb +73 -15
  46. data/lib/puppet/face/file/store.rb +1 -1
  47. data/lib/puppet/face/help.rb +2 -1
  48. data/lib/puppet/face/help/action.erb +1 -0
  49. data/lib/puppet/face/help/face.erb +1 -0
  50. data/lib/puppet/face/help/global.erb +1 -0
  51. data/lib/puppet/face/help/man.erb +9 -8
  52. data/lib/puppet/face/module/list.rb +13 -7
  53. data/lib/puppet/face/node/clean.rb +2 -2
  54. data/lib/puppet/face/parser.rb +11 -5
  55. data/lib/puppet/face/status.rb +1 -1
  56. data/lib/puppet/feature/external_facts.rb +2 -2
  57. data/lib/puppet/feature/libuser.rb +1 -1
  58. data/lib/puppet/feature/msgpack.rb +2 -0
  59. data/lib/puppet/feature/rails.rb +2 -2
  60. data/lib/puppet/file_bucket/dipper.rb +9 -9
  61. data/lib/puppet/file_bucket/file.rb +9 -5
  62. data/lib/puppet/file_serving/base.rb +1 -1
  63. data/lib/puppet/file_serving/configuration.rb +1 -1
  64. data/lib/puppet/file_serving/configuration/parser.rb +3 -3
  65. data/lib/puppet/file_serving/content.rb +2 -2
  66. data/lib/puppet/file_serving/fileset.rb +4 -4
  67. data/lib/puppet/file_serving/metadata.rb +69 -15
  68. data/lib/puppet/file_serving/mount/file.rb +1 -1
  69. data/lib/puppet/file_system.rb +361 -1
  70. data/lib/puppet/file_system/file18.rb +3 -3
  71. data/lib/puppet/file_system/file19.rb +3 -3
  72. data/lib/puppet/file_system/file19windows.rb +18 -23
  73. data/lib/puppet/file_system/file_impl.rb +145 -0
  74. data/lib/puppet/file_system/memory_file.rb +23 -9
  75. data/lib/puppet/file_system/memory_impl.rb +64 -0
  76. data/lib/puppet/forge.rb +4 -3
  77. data/lib/puppet/forge/repository.rb +0 -1
  78. data/lib/puppet/graph/relationship_graph.rb +7 -7
  79. data/lib/puppet/indirector.rb +1 -0
  80. data/lib/puppet/indirector/catalog/compiler.rb +3 -30
  81. data/lib/puppet/indirector/catalog/msgpack.rb +6 -0
  82. data/lib/puppet/indirector/catalog/static_compiler.rb +3 -7
  83. data/lib/puppet/indirector/data_binding/hiera.rb +1 -1
  84. data/lib/puppet/indirector/direct_file_server.rb +2 -2
  85. data/lib/puppet/indirector/exec.rb +1 -1
  86. data/lib/puppet/indirector/face.rb +3 -2
  87. data/lib/puppet/indirector/facts/facter.rb +1 -1
  88. data/lib/puppet/indirector/file_bucket_file/file.rb +25 -15
  89. data/lib/puppet/indirector/file_metadata/file.rb +1 -1
  90. data/lib/puppet/indirector/file_server.rb +1 -1
  91. data/lib/puppet/indirector/indirection.rb +1 -1
  92. data/lib/puppet/indirector/json.rb +4 -4
  93. data/lib/puppet/indirector/key/file.rb +8 -5
  94. data/lib/puppet/indirector/ldap.rb +1 -1
  95. data/lib/puppet/indirector/memory.rb +4 -0
  96. data/lib/puppet/indirector/msgpack.rb +82 -0
  97. data/lib/puppet/indirector/node/exec.rb +1 -1
  98. data/lib/puppet/indirector/node/ldap.rb +3 -3
  99. data/lib/puppet/indirector/node/msgpack.rb +7 -0
  100. data/lib/puppet/indirector/node/yaml.rb +15 -0
  101. data/lib/puppet/indirector/queue.rb +3 -2
  102. data/lib/puppet/indirector/report/msgpack.rb +11 -0
  103. data/lib/puppet/indirector/request.rb +17 -20
  104. data/lib/puppet/indirector/resource/rest.rb +1 -1
  105. data/lib/puppet/indirector/resource_type/parser.rb +3 -13
  106. data/lib/puppet/indirector/rest.rb +6 -7
  107. data/lib/puppet/indirector/ssl_file.rb +7 -7
  108. data/lib/puppet/indirector/yaml.rb +9 -13
  109. data/lib/puppet/metatype/manager.rb +12 -7
  110. data/lib/puppet/module.rb +14 -9
  111. data/lib/puppet/module_tool.rb +21 -26
  112. data/lib/puppet/module_tool/applications/application.rb +1 -1
  113. data/lib/puppet/module_tool/applications/generator.rb +2 -1
  114. data/lib/puppet/module_tool/applications/installer.rb +9 -4
  115. data/lib/puppet/module_tool/applications/uninstaller.rb +10 -7
  116. data/lib/puppet/module_tool/applications/unpacker.rb +1 -1
  117. data/lib/puppet/module_tool/applications/upgrader.rb +11 -8
  118. data/lib/puppet/module_tool/checksums.rb +1 -1
  119. data/lib/puppet/module_tool/contents_description.rb +2 -0
  120. data/lib/puppet/module_tool/dependency.rb +4 -5
  121. data/lib/puppet/module_tool/errors.rb +2 -0
  122. data/lib/puppet/module_tool/install_directory.rb +3 -0
  123. data/lib/puppet/module_tool/metadata.rb +3 -5
  124. data/lib/puppet/module_tool/modulefile.rb +3 -0
  125. data/lib/puppet/module_tool/shared_behaviors.rb +6 -1
  126. data/lib/puppet/module_tool/skeleton.rb +3 -0
  127. data/lib/puppet/module_tool/tar.rb +3 -0
  128. data/lib/puppet/network/auth_config_parser.rb +1 -1
  129. data/lib/puppet/network/authconfig.rb +5 -2
  130. data/lib/puppet/network/authentication.rb +7 -2
  131. data/lib/puppet/network/authorization.rb +2 -2
  132. data/lib/puppet/network/format_support.rb +4 -0
  133. data/lib/puppet/network/formats.rb +9 -14
  134. data/lib/puppet/network/http.rb +11 -0
  135. data/lib/puppet/network/http/api.rb +0 -2
  136. data/lib/puppet/network/http/api/v1.rb +146 -11
  137. data/lib/puppet/network/http/api/v2.rb +32 -0
  138. data/lib/puppet/network/http/api/v2/authorization.rb +13 -0
  139. data/lib/puppet/network/http/api/v2/environments.rb +21 -0
  140. data/lib/puppet/network/http/connection.rb +94 -37
  141. data/lib/puppet/network/http/error.rb +69 -0
  142. data/lib/puppet/network/http/handler.rb +28 -196
  143. data/lib/puppet/network/http/issues.rb +9 -0
  144. data/lib/puppet/network/http/memory_response.rb +13 -0
  145. data/lib/puppet/network/http/rack/rest.rb +10 -18
  146. data/lib/puppet/network/http/request.rb +56 -0
  147. data/lib/puppet/network/http/response.rb +11 -0
  148. data/lib/puppet/network/http/route.rb +91 -0
  149. data/lib/puppet/network/http/webrick.rb +1 -1
  150. data/lib/puppet/network/http/webrick/rest.rb +7 -12
  151. data/lib/puppet/network/http_pool.rb +3 -3
  152. data/lib/puppet/network/rights.rb +4 -4
  153. data/lib/puppet/node.rb +23 -14
  154. data/lib/puppet/node/environment.rb +149 -125
  155. data/lib/puppet/node/facts.rb +6 -5
  156. data/lib/puppet/parameter.rb +1 -1
  157. data/lib/puppet/parser/ast.rb +1 -1
  158. data/lib/puppet/parser/ast/block_expression.rb +1 -6
  159. data/lib/puppet/parser/ast/collexpr.rb +54 -2
  160. data/lib/puppet/parser/ast/lambda.rb +9 -0
  161. data/lib/puppet/parser/ast/leaf.rb +15 -0
  162. data/lib/puppet/parser/ast/pops_bridge.rb +168 -0
  163. data/lib/puppet/parser/code_merger.rb +13 -0
  164. data/lib/puppet/parser/collector.rb +1 -1
  165. data/lib/puppet/parser/compiler.rb +28 -30
  166. data/lib/puppet/parser/e4_parser_adapter.rb +81 -0
  167. data/lib/puppet/parser/e_parser_adapter.rb +0 -1
  168. data/lib/puppet/parser/files.rb +12 -7
  169. data/lib/puppet/parser/functions.rb +36 -29
  170. data/lib/puppet/parser/functions/collect.rb +1 -1
  171. data/lib/puppet/parser/functions/defined.rb +40 -16
  172. data/lib/puppet/parser/functions/each.rb +55 -41
  173. data/lib/puppet/parser/functions/epp.rb +41 -0
  174. data/lib/puppet/parser/functions/extlookup.rb +2 -2
  175. data/lib/puppet/parser/functions/file.rb +1 -1
  176. data/lib/puppet/parser/functions/filter.rb +68 -16
  177. data/lib/puppet/parser/functions/generate.rb +1 -1
  178. data/lib/puppet/parser/functions/include.rb +3 -2
  179. data/lib/puppet/parser/functions/inline_epp.rb +79 -0
  180. data/lib/puppet/parser/functions/inline_template.rb +1 -1
  181. data/lib/puppet/parser/functions/lookup.rb +127 -27
  182. data/lib/puppet/parser/functions/map.rb +64 -12
  183. data/lib/puppet/parser/functions/reduce.rb +40 -16
  184. data/lib/puppet/parser/functions/select.rb +1 -1
  185. data/lib/puppet/parser/functions/slice.rb +42 -23
  186. data/lib/puppet/parser/grammar.ra +3 -0
  187. data/lib/puppet/parser/lexer.rb +10 -9
  188. data/lib/puppet/parser/parser.rb +15 -12
  189. data/lib/puppet/parser/parser_factory.rb +26 -1
  190. data/lib/puppet/parser/parser_support.rb +13 -4
  191. data/lib/puppet/parser/resource.rb +1 -1
  192. data/lib/puppet/parser/scope.rb +246 -97
  193. data/lib/puppet/parser/templatewrapper.rb +1 -1
  194. data/lib/puppet/parser/type_loader.rb +13 -2
  195. data/lib/puppet/pops.rb +15 -1
  196. data/lib/puppet/pops/adapters.rb +64 -32
  197. data/lib/puppet/pops/binder/binder.rb +122 -150
  198. data/lib/puppet/pops/binder/binder_issues.rb +1 -21
  199. data/lib/puppet/pops/binder/bindings_checker.rb +0 -20
  200. data/lib/puppet/pops/binder/bindings_composer.rb +4 -70
  201. data/lib/puppet/pops/binder/bindings_factory.rb +16 -58
  202. data/lib/puppet/pops/binder/bindings_label_provider.rb +0 -3
  203. data/lib/puppet/pops/binder/bindings_loader.rb +13 -4
  204. data/lib/puppet/pops/binder/bindings_model.rb +17 -31
  205. data/lib/puppet/pops/binder/bindings_model_dumper.rb +2 -20
  206. data/lib/puppet/pops/binder/config/binder_config.rb +8 -40
  207. data/lib/puppet/pops/binder/config/binder_config_checker.rb +2 -43
  208. data/lib/puppet/pops/binder/config/issues.rb +1 -21
  209. data/lib/puppet/pops/binder/injector.rb +86 -7
  210. data/lib/puppet/pops/binder/injector_entry.rb +6 -2
  211. data/lib/puppet/pops/binder/key_factory.rb +7 -1
  212. data/lib/puppet/pops/binder/lookup.rb +191 -0
  213. data/lib/puppet/pops/binder/producers.rb +5 -5
  214. data/lib/puppet/pops/binder/scheme_handler/symbolic_scheme.rb +2 -3
  215. data/lib/puppet/pops/binder/system_bindings.rb +4 -16
  216. data/lib/puppet/pops/containment.rb +72 -5
  217. data/lib/puppet/pops/evaluator/access_operator.rb +548 -0
  218. data/lib/puppet/pops/evaluator/closure.rb +57 -0
  219. data/lib/puppet/pops/evaluator/compare_operator.rb +168 -0
  220. data/lib/puppet/pops/evaluator/epp_evaluator.rb +87 -0
  221. data/lib/puppet/pops/evaluator/evaluator_impl.rb +1069 -0
  222. data/lib/puppet/pops/evaluator/external_syntax_support.rb +49 -0
  223. data/lib/puppet/pops/evaluator/relationship_operator.rb +156 -0
  224. data/lib/puppet/pops/evaluator/runtime3_support.rb +489 -0
  225. data/lib/puppet/pops/issue_reporter.rb +8 -4
  226. data/lib/puppet/pops/issues.rb +199 -4
  227. data/lib/puppet/pops/label_provider.rb +5 -0
  228. data/lib/puppet/pops/model/ast_transformer.rb +55 -31
  229. data/lib/puppet/pops/model/ast_tree_dumper.rb +9 -1
  230. data/lib/puppet/pops/model/factory.rb +265 -111
  231. data/lib/puppet/pops/model/model.rb +179 -140
  232. data/lib/puppet/pops/model/model_label_provider.rb +38 -9
  233. data/lib/puppet/pops/model/model_tree_dumper.rb +38 -13
  234. data/lib/puppet/pops/parser/code_merger.rb +17 -0
  235. data/lib/puppet/pops/parser/egrammar.ra +110 -61
  236. data/lib/puppet/pops/parser/eparser.rb +1415 -1092
  237. data/lib/puppet/pops/parser/epp_parser.rb +51 -0
  238. data/lib/puppet/pops/parser/epp_support.rb +247 -0
  239. data/lib/puppet/pops/parser/evaluating_parser.rb +53 -15
  240. data/lib/puppet/pops/parser/heredoc_support.rb +139 -0
  241. data/lib/puppet/pops/parser/interpolation_support.rb +227 -0
  242. data/lib/puppet/pops/parser/lexer.rb +83 -192
  243. data/lib/puppet/pops/parser/lexer2.rb +684 -0
  244. data/lib/puppet/pops/parser/lexer_support.rb +107 -0
  245. data/lib/puppet/pops/parser/locatable.rb +23 -0
  246. data/lib/puppet/pops/parser/locator.rb +291 -0
  247. data/lib/puppet/pops/parser/makefile +1 -8
  248. data/lib/puppet/pops/parser/parser_support.rb +76 -48
  249. data/lib/puppet/pops/parser/slurp_support.rb +95 -0
  250. data/lib/puppet/pops/patterns.rb +13 -4
  251. data/lib/puppet/pops/types/class_loader.rb +2 -2
  252. data/lib/puppet/pops/types/enumeration.rb +34 -0
  253. data/lib/puppet/pops/types/type_calculator.rb +983 -58
  254. data/lib/puppet/pops/types/type_factory.rb +203 -15
  255. data/lib/puppet/pops/types/type_parser.rb +355 -12
  256. data/lib/puppet/pops/types/types.rb +314 -24
  257. data/lib/puppet/pops/utils.rb +23 -7
  258. data/lib/puppet/pops/validation.rb +14 -8
  259. data/lib/puppet/pops/validation/checker3_1.rb +17 -12
  260. data/lib/puppet/pops/validation/checker4_0.rb +514 -0
  261. data/lib/puppet/pops/validation/validator_factory_4_0.rb +31 -0
  262. data/lib/puppet/pops/visitor.rb +146 -4
  263. data/lib/puppet/property.rb +1 -1
  264. data/lib/puppet/property/ensure.rb +1 -1
  265. data/lib/puppet/provider.rb +47 -26
  266. data/lib/puppet/provider/aixobject.rb +3 -3
  267. data/lib/puppet/provider/augeas/augeas.rb +11 -11
  268. data/lib/puppet/provider/cron/crontab.rb +10 -1
  269. data/lib/puppet/provider/exec.rb +1 -1
  270. data/lib/puppet/provider/exec/posix.rb +1 -1
  271. data/lib/puppet/provider/exec/windows.rb +1 -1
  272. data/lib/puppet/provider/file/posix.rb +2 -2
  273. data/lib/puppet/provider/file/windows.rb +15 -9
  274. data/lib/puppet/provider/group/aix.rb +2 -2
  275. data/lib/puppet/provider/macauthorization/macauthorization.rb +3 -3
  276. data/lib/puppet/provider/mount.rb +7 -0
  277. data/lib/puppet/provider/mount/parsed.rb +0 -1
  278. data/lib/puppet/provider/naginator.rb +1 -1
  279. data/lib/puppet/provider/nameservice.rb +3 -3
  280. data/lib/puppet/provider/nameservice/directoryservice.rb +3 -3
  281. data/lib/puppet/provider/package/aix.rb +1 -1
  282. data/lib/puppet/provider/package/appdmg.rb +1 -4
  283. data/lib/puppet/provider/package/apple.rb +1 -1
  284. data/lib/puppet/provider/package/apt.rb +1 -1
  285. data/lib/puppet/provider/package/blastwave.rb +1 -1
  286. data/lib/puppet/provider/package/fink.rb +1 -1
  287. data/lib/puppet/provider/package/gem.rb +3 -3
  288. data/lib/puppet/provider/package/openbsd.rb +6 -4
  289. data/lib/puppet/provider/package/pacman.rb +58 -5
  290. data/lib/puppet/provider/package/pip.rb +2 -2
  291. data/lib/puppet/provider/package/pkgdmg.rb +25 -10
  292. data/lib/puppet/provider/package/pkgin.rb +48 -23
  293. data/lib/puppet/provider/package/pkgutil.rb +1 -1
  294. data/lib/puppet/provider/package/ports.rb +1 -1
  295. data/lib/puppet/provider/package/portupgrade.rb +7 -7
  296. data/lib/puppet/provider/package/rpm.rb +16 -8
  297. data/lib/puppet/provider/package/windows.rb +1 -1
  298. data/lib/puppet/provider/package/windows/package.rb +1 -1
  299. data/lib/puppet/provider/parsedfile.rb +1 -1
  300. data/lib/puppet/provider/selboolean/getsetsebool.rb +1 -1
  301. data/lib/puppet/provider/selmodule/semodule.rb +5 -5
  302. data/lib/puppet/provider/service/base.rb +1 -1
  303. data/lib/puppet/provider/service/bsd.rb +3 -3
  304. data/lib/puppet/provider/service/daemontools.rb +20 -20
  305. data/lib/puppet/provider/service/debian.rb +1 -1
  306. data/lib/puppet/provider/service/freebsd.rb +3 -3
  307. data/lib/puppet/provider/service/gentoo.rb +2 -2
  308. data/lib/puppet/provider/service/init.rb +5 -5
  309. data/lib/puppet/provider/service/launchd.rb +4 -4
  310. data/lib/puppet/provider/service/redhat.rb +2 -2
  311. data/lib/puppet/provider/service/runit.rb +4 -4
  312. data/lib/puppet/provider/service/service.rb +3 -4
  313. data/lib/puppet/provider/service/smf.rb +1 -1
  314. data/lib/puppet/provider/service/src.rb +3 -3
  315. data/lib/puppet/provider/service/systemd.rb +4 -4
  316. data/lib/puppet/provider/service/upstart.rb +22 -7
  317. data/lib/puppet/provider/service/windows.rb +7 -7
  318. data/lib/puppet/provider/ssh_authorized_key/parsed.rb +3 -3
  319. data/lib/puppet/provider/user/aix.rb +5 -5
  320. data/lib/puppet/provider/user/directoryservice.rb +8 -5
  321. data/lib/puppet/provider/user/ldap.rb +1 -1
  322. data/lib/puppet/provider/user/pw.rb +1 -1
  323. data/lib/puppet/provider/user/user_role_add.rb +2 -2
  324. data/lib/puppet/provider/user/useradd.rb +19 -5
  325. data/lib/puppet/provider/yumrepo/inifile.rb +187 -0
  326. data/lib/puppet/provider/zone/solaris.rb +4 -4
  327. data/lib/puppet/rails.rb +16 -11
  328. data/lib/puppet/rails/benchmark.rb +1 -1
  329. data/lib/puppet/rails/resource.rb +5 -1
  330. data/lib/puppet/reference/configuration.rb +1 -1
  331. data/lib/puppet/reference/report.rb +1 -1
  332. data/lib/puppet/relationship.rb +10 -5
  333. data/lib/puppet/reports/http.rb +8 -2
  334. data/lib/puppet/reports/rrdgraph.rb +1 -1
  335. data/lib/puppet/reports/store.rb +3 -3
  336. data/lib/puppet/reports/tagmail.rb +4 -4
  337. data/lib/puppet/resource.rb +37 -44
  338. data/lib/puppet/resource/catalog.rb +18 -20
  339. data/lib/puppet/resource/status.rb +7 -6
  340. data/lib/puppet/resource/type.rb +6 -5
  341. data/lib/puppet/resource/type_collection.rb +2 -2
  342. data/lib/puppet/run.rb +9 -8
  343. data/lib/puppet/settings.rb +395 -244
  344. data/lib/puppet/settings/base_setting.rb +10 -4
  345. data/lib/puppet/settings/config_file.rb +81 -44
  346. data/lib/puppet/settings/directory_setting.rb +1 -2
  347. data/lib/puppet/settings/file_setting.rb +12 -5
  348. data/lib/puppet/settings/ini_file.rb +171 -0
  349. data/lib/puppet/ssl/base.rb +4 -0
  350. data/lib/puppet/ssl/certificate_authority.rb +16 -11
  351. data/lib/puppet/ssl/certificate_authority/interface.rb +3 -2
  352. data/lib/puppet/ssl/certificate_factory.rb +50 -5
  353. data/lib/puppet/ssl/certificate_request.rb +2 -2
  354. data/lib/puppet/ssl/certificate_request_attributes.rb +1 -1
  355. data/lib/puppet/ssl/certificate_revocation_list.rb +3 -1
  356. data/lib/puppet/ssl/host.rb +9 -8
  357. data/lib/puppet/ssl/inventory.rb +1 -1
  358. data/lib/puppet/ssl/key.rb +1 -1
  359. data/lib/puppet/ssl/validator/default_validator.rb +1 -1
  360. data/lib/puppet/status.rb +8 -7
  361. data/lib/puppet/test/test_helper.rb +35 -4
  362. data/lib/puppet/transaction/event.rb +6 -5
  363. data/lib/puppet/transaction/report.rb +10 -10
  364. data/lib/puppet/type.rb +1 -3
  365. data/lib/puppet/type/augeas.rb +2 -1
  366. data/lib/puppet/type/cron.rb +41 -11
  367. data/lib/puppet/type/exec.rb +5 -5
  368. data/lib/puppet/type/file.rb +42 -4
  369. data/lib/puppet/type/file/content.rb +5 -6
  370. data/lib/puppet/type/file/ensure.rb +3 -3
  371. data/lib/puppet/type/file/source.rb +12 -6
  372. data/lib/puppet/type/file/target.rb +5 -5
  373. data/lib/puppet/type/k5login.rb +4 -4
  374. data/lib/puppet/type/mount.rb +1 -1
  375. data/lib/puppet/type/package.rb +79 -3
  376. data/lib/puppet/type/resources.rb +34 -5
  377. data/lib/puppet/type/selboolean.rb +1 -1
  378. data/lib/puppet/type/selmodule.rb +1 -1
  379. data/lib/puppet/type/ssh_authorized_key.rb +2 -1
  380. data/lib/puppet/type/sshkey.rb +2 -1
  381. data/lib/puppet/type/tidy.rb +1 -1
  382. data/lib/puppet/type/user.rb +4 -1
  383. data/lib/puppet/type/yumrepo.rb +219 -344
  384. data/lib/puppet/type/zone.rb +15 -5
  385. data/lib/puppet/util.rb +14 -13
  386. data/lib/puppet/util/adsi.rb +19 -3
  387. data/lib/puppet/util/autoload.rb +27 -24
  388. data/lib/puppet/util/backups.rb +6 -6
  389. data/lib/puppet/util/checksums.rb +2 -2
  390. data/lib/puppet/util/classgen.rb +1 -1
  391. data/lib/puppet/util/colors.rb +4 -12
  392. data/lib/puppet/util/command_line.rb +2 -2
  393. data/lib/puppet/util/command_line/trollop.rb +3 -3
  394. data/lib/puppet/util/docs.rb +2 -2
  395. data/lib/puppet/util/errors.rb +8 -1
  396. data/lib/puppet/util/execution.rb +12 -5
  397. data/lib/puppet/util/filetype.rb +5 -5
  398. data/lib/puppet/util/inifile.rb +19 -4
  399. data/lib/puppet/util/instrumentation/data.rb +5 -0
  400. data/lib/puppet/util/instrumentation/indirection_probe.rb +6 -1
  401. data/lib/puppet/util/instrumentation/listener.rb +6 -1
  402. data/lib/puppet/util/json_lockfile.rb +4 -1
  403. data/lib/puppet/util/ldap/connection.rb +1 -1
  404. data/lib/puppet/util/lockfile.rb +10 -6
  405. data/lib/puppet/util/log.rb +6 -1
  406. data/lib/puppet/util/log/destinations.rb +2 -2
  407. data/lib/puppet/util/metric.rb +9 -4
  408. data/lib/puppet/util/nagios_maker.rb +26 -1
  409. data/lib/puppet/util/network_device.rb +1 -1
  410. data/lib/puppet/util/network_device/config.rb +1 -1
  411. data/lib/puppet/util/network_device/transport/ssh.rb +3 -3
  412. data/lib/puppet/util/plugins.rb +1 -1
  413. data/lib/puppet/util/profiler.rb +13 -1
  414. data/lib/puppet/util/pson.rb +1 -1
  415. data/lib/puppet/util/queue/stomp.rb +2 -2
  416. data/lib/puppet/util/rdoc.rb +1 -1
  417. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +1 -1
  418. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +19 -19
  419. data/lib/puppet/util/reference.rb +1 -1
  420. data/lib/puppet/util/resource_template.rb +1 -1
  421. data/lib/puppet/util/retryaction.rb +1 -1
  422. data/lib/puppet/util/selinux.rb +2 -2
  423. data/lib/puppet/util/storage.rb +3 -3
  424. data/lib/puppet/util/symbolic_file_mode.rb +1 -1
  425. data/lib/puppet/util/tag_set.rb +15 -3
  426. data/lib/puppet/util/tagging.rb +12 -17
  427. data/lib/puppet/util/watched_file.rb +1 -1
  428. data/lib/puppet/util/watcher.rb +1 -1
  429. data/lib/puppet/util/windows/error.rb +2 -2
  430. data/lib/puppet/util/windows/file.rb +20 -4
  431. data/lib/puppet/util/windows/registry.rb +2 -2
  432. data/lib/puppet/vendor/safe_yaml/CHANGES.md +1 -1
  433. data/lib/puppet/version.rb +1 -1
  434. data/lib/puppetx.rb +1 -21
  435. data/lib/puppetx/puppet/syntax_checker.rb +1 -1
  436. data/lib/puppetx/puppetlabs/syntax_checkers/json.rb +9 -11
  437. data/spec/fixtures/integration/node/environment/sitedir/00_a.pp +2 -0
  438. data/spec/fixtures/integration/node/environment/sitedir/01_b.pp +6 -0
  439. data/spec/fixtures/{unit/pops/binder/hiera2/yaml_backend/empty/common.yaml → integration/node/environment/sitedir/03_empty.pp} +0 -0
  440. data/spec/fixtures/integration/node/environment/sitedir/04_include.pp +2 -0
  441. data/spec/fixtures/integration/provider/cron/crontab/purged +8 -0
  442. data/spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb +1 -1
  443. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/binder_config.yaml +3 -12
  444. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/lib/puppet/bindings/confdirtest.rb +10 -0
  445. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet/bindings/awesome2/default.rb +20 -0
  446. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/{awesome/lib/puppetx/awesome → awesome2/lib/puppetx/awesome2}/echo_scheme_handler.rb +2 -2
  447. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/lib/puppet/bindings/bad/default.rb +5 -0
  448. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb +6 -0
  449. data/spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml +2 -2
  450. data/spec/fixtures/unit/provider/service/systemd/{list_units → list_units_services} +0 -1
  451. data/spec/integration/agent/logging_spec.rb +1 -1
  452. data/spec/integration/application/apply_spec.rb +78 -3
  453. data/spec/integration/application/doc_spec.rb +3 -2
  454. data/spec/integration/configurer_spec.rb +5 -3
  455. data/spec/integration/directory_environments_spec.rb +50 -0
  456. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  457. data/spec/integration/indirector/file_content/file_server_spec.rb +4 -5
  458. data/spec/integration/network/authconfig_spec.rb +4 -4
  459. data/spec/integration/network/formats_spec.rb +1 -1
  460. data/spec/integration/node/environment_spec.rb +67 -15
  461. data/spec/integration/node/facts_spec.rb +1 -1
  462. data/spec/integration/node_spec.rb +1 -1
  463. data/spec/integration/parser/catalog_spec.rb +100 -60
  464. data/spec/integration/parser/compiler_spec.rb +102 -13
  465. data/spec/integration/parser/future_compiler_spec.rb +416 -0
  466. data/spec/integration/parser/parser_spec.rb +44 -105
  467. data/spec/integration/parser/scope_spec.rb +614 -528
  468. data/spec/integration/provider/cron/crontab_spec.rb +21 -0
  469. data/spec/integration/provider/mount_spec.rb +15 -2
  470. data/spec/integration/resource/catalog_spec.rb +1 -1
  471. data/spec/integration/resource/type_collection_spec.rb +3 -4
  472. data/spec/integration/ssl/autosign_spec.rb +1 -1
  473. data/spec/integration/ssl/certificate_revocation_list_spec.rb +1 -1
  474. data/spec/integration/ssl/host_spec.rb +1 -1
  475. data/spec/integration/transaction_spec.rb +13 -13
  476. data/spec/integration/type/exec_spec.rb +2 -2
  477. data/spec/integration/type/file_spec.rb +114 -41
  478. data/spec/integration/type/nagios_spec.rb +80 -0
  479. data/spec/integration/type/tidy_spec.rb +2 -2
  480. data/spec/integration/util/execution_spec.rb +17 -0
  481. data/spec/integration/util/rdoc/parser_spec.rb +1 -1
  482. data/spec/integration/util/settings_spec.rb +1 -1
  483. data/spec/integration/util/windows/security_spec.rb +27 -2
  484. data/spec/lib/matchers/include.rb +27 -0
  485. data/spec/lib/matchers/include_spec.rb +32 -0
  486. data/spec/lib/matchers/json.rb +135 -79
  487. data/spec/lib/matchers/match_tokens2.rb +74 -0
  488. data/spec/lib/matchers/resource.rb +35 -0
  489. data/spec/lib/puppet/indirector/indirector_testing/memory.rb +7 -0
  490. data/spec/lib/puppet/indirector/indirector_testing/msgpack.rb +6 -0
  491. data/spec/lib/puppet/indirector_testing.rb +12 -2
  492. data/spec/lib/puppet_spec/files.rb +1 -0
  493. data/spec/lib/puppet_spec/matchers.rb +5 -0
  494. data/spec/lib/puppet_spec/modules.rb +1 -1
  495. data/spec/lib/puppet_spec/scope.rb +14 -0
  496. data/spec/shared_behaviours/file_server_terminus.rb +2 -2
  497. data/spec/spec_helper.rb +47 -17
  498. data/spec/unit/agent_spec.rb +8 -1
  499. data/spec/unit/application/agent_spec.rb +5 -4
  500. data/spec/unit/application/apply_spec.rb +34 -15
  501. data/spec/unit/application/device_spec.rb +27 -32
  502. data/spec/unit/application/doc_spec.rb +4 -4
  503. data/spec/unit/application/filebucket_spec.rb +1 -1
  504. data/spec/unit/application/master_spec.rb +2 -2
  505. data/spec/unit/application_spec.rb +1 -1
  506. data/spec/unit/configurer/downloader_spec.rb +1 -1
  507. data/spec/unit/configurer/fact_handler_spec.rb +5 -16
  508. data/spec/unit/configurer_spec.rb +2 -2
  509. data/spec/unit/confine/exists_spec.rb +5 -5
  510. data/spec/unit/context/trusted_information_spec.rb +124 -0
  511. data/spec/unit/context_spec.rb +74 -0
  512. data/spec/unit/environments_spec.rb +126 -0
  513. data/spec/unit/face/config_spec.rb +31 -16
  514. data/spec/unit/face/module/build_spec.rb +1 -0
  515. data/spec/unit/face/module/install_spec.rb +21 -104
  516. data/spec/unit/face/module/list_spec.rb +52 -36
  517. data/spec/unit/face/module/uninstall_spec.rb +18 -25
  518. data/spec/unit/face/parser_spec.rb +39 -23
  519. data/spec/unit/file_bucket/dipper_spec.rb +2 -2
  520. data/spec/unit/file_serving/base_spec.rb +9 -13
  521. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -2
  522. data/spec/unit/file_serving/configuration_spec.rb +7 -7
  523. data/spec/unit/file_serving/content_spec.rb +7 -12
  524. data/spec/unit/file_serving/fileset_spec.rb +49 -53
  525. data/spec/unit/file_serving/metadata_spec.rb +83 -32
  526. data/spec/unit/file_serving/mount/file_spec.rb +10 -10
  527. data/spec/unit/file_system/tempfile_spec.rb +3 -3
  528. data/spec/unit/file_system_spec.rb +508 -0
  529. data/spec/unit/forge/errors_spec.rb +1 -1
  530. data/spec/unit/forge/repository_spec.rb +1 -3
  531. data/spec/unit/hiera/scope_spec.rb +6 -2
  532. data/spec/unit/hiera_puppet_spec.rb +13 -6
  533. data/spec/unit/indirector/catalog/msgpack_spec.rb +12 -0
  534. data/spec/unit/indirector/catalog/static_compiler_spec.rb +42 -11
  535. data/spec/unit/indirector/direct_file_server_spec.rb +6 -6
  536. data/spec/unit/indirector/facts/facter_spec.rb +5 -5
  537. data/spec/unit/indirector/file_bucket_file/file_spec.rb +4 -4
  538. data/spec/unit/indirector/file_metadata/file_spec.rb +2 -2
  539. data/spec/unit/indirector/file_server_spec.rb +4 -4
  540. data/spec/unit/indirector/json_spec.rb +6 -6
  541. data/spec/unit/indirector/key/file_spec.rb +8 -8
  542. data/spec/unit/indirector/msgpack_spec.rb +191 -0
  543. data/spec/unit/indirector/node/active_record_spec.rb +1 -1
  544. data/spec/unit/indirector/node/ldap_spec.rb +16 -7
  545. data/spec/unit/indirector/node/msgpack_spec.rb +24 -0
  546. data/spec/unit/indirector/node/plain_spec.rb +1 -1
  547. data/spec/unit/indirector/queue_spec.rb +1 -1
  548. data/spec/unit/indirector/report/msgpack_spec.rb +28 -0
  549. data/spec/unit/indirector/request_spec.rb +16 -8
  550. data/spec/unit/indirector/rest_spec.rb +0 -4
  551. data/spec/unit/indirector/ssl_file_spec.rb +12 -11
  552. data/spec/unit/indirector/yaml_spec.rb +4 -4
  553. data/spec/unit/man_spec.rb +32 -0
  554. data/spec/unit/module_spec.rb +60 -46
  555. data/spec/unit/module_tool/applications/checksummer_spec.rb +1 -1
  556. data/spec/unit/module_tool/applications/installer_spec.rb +53 -16
  557. data/spec/unit/module_tool/applications/uninstaller_spec.rb +26 -25
  558. data/spec/unit/module_tool/tar_spec.rb +1 -1
  559. data/spec/unit/module_tool_spec.rb +17 -90
  560. data/spec/unit/network/authconfig_spec.rb +3 -4
  561. data/spec/unit/network/authentication_spec.rb +20 -6
  562. data/spec/unit/network/authorization_spec.rb +11 -1
  563. data/spec/unit/network/formats_spec.rb +32 -9
  564. data/spec/unit/network/http/api/v1_spec.rb +365 -62
  565. data/spec/unit/network/http/api/v2/authorization_spec.rb +57 -0
  566. data/spec/unit/network/http/api/v2/environments_spec.rb +42 -0
  567. data/spec/unit/network/http/api/v2_spec.rb +14 -0
  568. data/spec/unit/network/http/connection_spec.rb +39 -5
  569. data/spec/unit/network/http/error_spec.rb +30 -0
  570. data/spec/unit/network/http/handler_spec.rb +69 -419
  571. data/spec/unit/network/http/rack/rest_spec.rb +20 -28
  572. data/spec/unit/network/http/route_spec.rb +75 -0
  573. data/spec/unit/network/http/webrick/rest_spec.rb +21 -58
  574. data/spec/unit/network/http_pool_spec.rb +3 -3
  575. data/spec/unit/network/rights_spec.rb +2 -2
  576. data/spec/unit/node/environment_spec.rb +108 -89
  577. data/spec/unit/node/facts_spec.rb +5 -12
  578. data/spec/unit/node_spec.rb +22 -22
  579. data/spec/unit/parser/ast/collection_spec.rb +1 -1
  580. data/spec/unit/parser/ast/leaf_spec.rb +2 -0
  581. data/spec/unit/parser/ast/resource_spec.rb +1 -1
  582. data/spec/unit/parser/compiler_spec.rb +5 -3
  583. data/spec/unit/parser/files_spec.rb +40 -50
  584. data/spec/unit/parser/functions/defined_spec.rb +80 -18
  585. data/spec/unit/parser/functions/epp_spec.rb +88 -0
  586. data/spec/unit/parser/functions/fqdn_rand_spec.rb +4 -1
  587. data/spec/unit/parser/functions/generate_spec.rb +6 -2
  588. data/spec/unit/parser/functions/hiera_array_spec.rb +5 -2
  589. data/spec/unit/parser/functions/hiera_hash_spec.rb +4 -1
  590. data/spec/unit/parser/functions/hiera_include_spec.rb +6 -3
  591. data/spec/unit/parser/functions/hiera_spec.rb +5 -2
  592. data/spec/unit/parser/functions/include_spec.rb +0 -1
  593. data/spec/unit/parser/functions/inline_epp_spec.rb +82 -0
  594. data/spec/unit/parser/functions/lookup_spec.rb +66 -16
  595. data/spec/unit/parser/functions_spec.rb +25 -91
  596. data/spec/unit/parser/lexer_spec.rb +1 -1
  597. data/spec/unit/parser/methods/filter_spec.rb +56 -0
  598. data/spec/unit/parser/methods/map_spec.rb +94 -5
  599. data/spec/unit/parser/methods/reduce_spec.rb +10 -0
  600. data/spec/unit/parser/methods/shared.rb +2 -18
  601. data/spec/unit/parser/methods/slice_spec.rb +39 -1
  602. data/spec/unit/parser/parser_spec.rb +14 -10
  603. data/spec/unit/parser/resource_spec.rb +3 -9
  604. data/spec/unit/parser/scope_spec.rb +81 -78
  605. data/spec/unit/parser/type_loader_spec.rb +0 -4
  606. data/spec/unit/pops/benchmark_spec.rb +142 -0
  607. data/spec/unit/pops/binder/binder_spec.rb +15 -34
  608. data/spec/unit/pops/binder/bindings_checker_spec.rb +0 -41
  609. data/spec/unit/pops/binder/bindings_composer_spec.rb +6 -31
  610. data/spec/unit/pops/binder/config/binder_config_spec.rb +5 -18
  611. data/spec/unit/pops/binder/injector_spec.rb +76 -81
  612. data/spec/unit/pops/evaluator/access_ops_spec.rb +376 -0
  613. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +77 -0
  614. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +103 -0
  615. data/spec/unit/pops/evaluator/collections_ops_spec.rb +111 -0
  616. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +256 -0
  617. data/spec/unit/pops/evaluator/conditionals_spec.rb +190 -0
  618. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +1045 -0
  619. data/spec/unit/pops/evaluator/evaluator_rspec_helper.rb +75 -0
  620. data/spec/unit/pops/evaluator/logical_ops_spec.rb +90 -0
  621. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +44 -0
  622. data/spec/unit/pops/evaluator/variables_spec.rb +194 -0
  623. data/spec/unit/pops/factory_spec.rb +6 -29
  624. data/spec/unit/pops/issues_spec.rb +1 -1
  625. data/spec/unit/pops/model/ast_transformer_spec.rb +6 -9
  626. data/spec/unit/pops/model/model_spec.rb +2 -2
  627. data/spec/unit/pops/parser/epp_parser_spec.rb +86 -0
  628. data/spec/unit/pops/parser/evaluating_parser_spec.rb +4 -2
  629. data/spec/unit/pops/parser/lexer2_spec.rb +428 -0
  630. data/spec/unit/pops/parser/lexer_spec.rb +25 -86
  631. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +29 -4
  632. data/spec/unit/pops/parser/parse_calls_spec.rb +10 -6
  633. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -9
  634. data/spec/unit/pops/parser/parse_containers_spec.rb +43 -12
  635. data/spec/unit/pops/parser/parse_heredoc_spec.rb +73 -0
  636. data/spec/unit/pops/parser/parse_resource_spec.rb +14 -0
  637. data/spec/unit/pops/parser/parser_spec.rb +3 -1
  638. data/spec/unit/pops/transformer/transform_basic_expressions_spec.rb +4 -4
  639. data/spec/unit/pops/transformer/transform_calls_spec.rb +41 -6
  640. data/spec/unit/pops/transformer/transform_conditionals_spec.rb +0 -9
  641. data/spec/unit/pops/transformer/transform_containers_spec.rb +12 -4
  642. data/spec/unit/pops/types/enumeration_spec.rb +50 -0
  643. data/spec/unit/pops/types/type_calculator_spec.rb +1171 -196
  644. data/spec/unit/pops/types/type_factory_spec.rb +108 -4
  645. data/spec/unit/pops/types/type_parser_spec.rb +114 -10
  646. data/spec/unit/pops/validator/validator_spec.rb +36 -1
  647. data/spec/unit/provider/augeas/augeas_spec.rb +39 -16
  648. data/spec/unit/provider/cron/parsed_spec.rb +27 -31
  649. data/spec/unit/provider/file/posix_spec.rb +2 -2
  650. data/spec/unit/provider/group/windows_adsi_spec.rb +1 -0
  651. data/spec/unit/provider/mount_spec.rb +12 -1
  652. data/spec/unit/provider/nameservice/directoryservice_spec.rb +3 -3
  653. data/spec/unit/provider/package/apt_spec.rb +1 -1
  654. data/spec/unit/provider/package/aptrpm_spec.rb +1 -1
  655. data/spec/unit/provider/package/gem_spec.rb +12 -0
  656. data/spec/unit/provider/package/msi_spec.rb +4 -0
  657. data/spec/unit/provider/package/openbsd_spec.rb +10 -10
  658. data/spec/unit/provider/package/pacman_spec.rb +36 -7
  659. data/spec/unit/provider/package/pkgin_spec.rb +57 -55
  660. data/spec/unit/provider/package/rpm_spec.rb +51 -6
  661. data/spec/unit/provider/service/base_spec.rb +4 -4
  662. data/spec/unit/provider/service/daemontools_spec.rb +8 -13
  663. data/spec/unit/provider/service/freebsd_spec.rb +3 -3
  664. data/spec/unit/provider/service/gentoo_spec.rb +24 -24
  665. data/spec/unit/provider/service/init_spec.rb +15 -15
  666. data/spec/unit/provider/service/openbsd_spec.rb +16 -16
  667. data/spec/unit/provider/service/openrc_spec.rb +20 -20
  668. data/spec/unit/provider/service/openwrt_spec.rb +1 -1
  669. data/spec/unit/provider/service/runit_spec.rb +5 -8
  670. data/spec/unit/provider/service/src_spec.rb +4 -4
  671. data/spec/unit/provider/service/systemd_spec.rb +24 -14
  672. data/spec/unit/provider/service/upstart_spec.rb +12 -4
  673. data/spec/unit/provider/service/windows_spec.rb +1 -1
  674. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +21 -23
  675. data/spec/unit/provider/user/directoryservice_spec.rb +7 -7
  676. data/spec/unit/provider/user/useradd_spec.rb +43 -15
  677. data/spec/unit/provider/user/windows_adsi_spec.rb +1 -0
  678. data/spec/unit/provider/yumrepo/inifile_spec.rb +105 -0
  679. data/spec/unit/provider/zone/solaris_spec.rb +1 -1
  680. data/spec/unit/provider_spec.rb +120 -62
  681. data/spec/unit/rails/host_spec.rb +1 -1
  682. data/spec/unit/rails/param_value_spec.rb +4 -0
  683. data/spec/unit/relationship_spec.rb +4 -4
  684. data/spec/unit/reports/http_spec.rb +14 -3
  685. data/spec/unit/reports/rrdgraph_spec.rb +0 -1
  686. data/spec/unit/reports/store_spec.rb +2 -2
  687. data/spec/unit/resource/catalog_spec.rb +17 -29
  688. data/spec/unit/resource/status_spec.rb +1 -1
  689. data/spec/unit/resource/type_collection_spec.rb +28 -47
  690. data/spec/unit/resource/type_spec.rb +12 -23
  691. data/spec/unit/resource_spec.rb +54 -93
  692. data/spec/unit/run_spec.rb +3 -3
  693. data/spec/unit/settings/autosign_setting_spec.rb +1 -1
  694. data/spec/unit/settings/config_file_spec.rb +68 -15
  695. data/spec/unit/settings/file_setting_spec.rb +2 -2
  696. data/spec/unit/settings/ini_file_spec.rb +184 -0
  697. data/spec/unit/settings_spec.rb +137 -79
  698. data/spec/unit/ssl/certificate_authority/interface_spec.rb +3 -1
  699. data/spec/unit/ssl/certificate_authority_spec.rb +11 -9
  700. data/spec/unit/ssl/certificate_factory_spec.rb +19 -4
  701. data/spec/unit/ssl/certificate_request_attributes_spec.rb +1 -1
  702. data/spec/unit/ssl/certificate_revocation_list_spec.rb +101 -72
  703. data/spec/unit/ssl/host_spec.rb +8 -20
  704. data/spec/unit/ssl/inventory_spec.rb +2 -2
  705. data/spec/unit/ssl/key_spec.rb +4 -4
  706. data/spec/unit/status_spec.rb +6 -4
  707. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -11
  708. data/spec/unit/transaction/event_spec.rb +2 -2
  709. data/spec/unit/transaction/report_spec.rb +24 -15
  710. data/spec/unit/transaction/resource_harness_spec.rb +1 -1
  711. data/spec/unit/type/cron_spec.rb +39 -1
  712. data/spec/unit/type/file/content_spec.rb +4 -5
  713. data/spec/unit/type/file/ctime_spec.rb +1 -1
  714. data/spec/unit/type/file/mode_spec.rb +5 -4
  715. data/spec/unit/type/file/mtime_spec.rb +1 -1
  716. data/spec/unit/type/file/source_spec.rb +30 -7
  717. data/spec/unit/type/file_spec.rb +8 -8
  718. data/spec/unit/type/k5login_spec.rb +3 -3
  719. data/spec/unit/type/nagios_spec.rb +6 -0
  720. data/spec/unit/type/package/package_settings_spec.rb +135 -0
  721. data/spec/unit/type/package_spec.rb +13 -1
  722. data/spec/unit/type/resources_spec.rb +155 -0
  723. data/spec/unit/type/service_spec.rb +3 -3
  724. data/spec/unit/type/ssh_authorized_key_spec.rb +96 -93
  725. data/spec/unit/type/sshkey_spec.rb +39 -30
  726. data/spec/unit/type/tidy_spec.rb +19 -12
  727. data/spec/unit/type/user_spec.rb +47 -2
  728. data/spec/unit/type/whit_spec.rb +2 -2
  729. data/spec/unit/type/yumrepo_spec.rb +32 -177
  730. data/spec/unit/type/zone_spec.rb +2 -2
  731. data/spec/unit/type_spec.rb +11 -0
  732. data/spec/unit/util/adsi_spec.rb +48 -1
  733. data/spec/unit/util/autoload_spec.rb +24 -39
  734. data/spec/unit/util/backups_spec.rb +25 -28
  735. data/spec/unit/util/checksums_spec.rb +1 -3
  736. data/spec/unit/util/colors_spec.rb +14 -0
  737. data/spec/unit/util/docs_spec.rb +9 -0
  738. data/spec/unit/util/execution_spec.rb +1 -1
  739. data/spec/unit/util/filetype_spec.rb +7 -7
  740. data/spec/unit/util/instrumentation/data_spec.rb +3 -1
  741. data/spec/unit/util/instrumentation/indirection_probe_spec.rb +2 -0
  742. data/spec/unit/util/instrumentation/listener_spec.rb +3 -2
  743. data/spec/unit/util/json_lockfile_spec.rb +25 -4
  744. data/spec/unit/util/lockfile_spec.rb +49 -7
  745. data/spec/unit/util/log/destinations_spec.rb +1 -0
  746. data/spec/unit/util/log_spec.rb +1 -1
  747. data/spec/unit/util/metric_spec.rb +1 -1
  748. data/spec/unit/util/pidlock_spec.rb +6 -6
  749. data/spec/unit/util/pson_spec.rb +2 -2
  750. data/spec/unit/util/rdoc/parser_spec.rb +32 -29
  751. data/spec/unit/util/resource_template_spec.rb +3 -3
  752. data/spec/unit/util/selinux_spec.rb +5 -5
  753. data/spec/unit/util/storage_spec.rb +4 -4
  754. data/spec/unit/util/tag_set_spec.rb +1 -1
  755. data/spec/unit/util/watcher_spec.rb +1 -4
  756. data/spec/unit/util/yaml_spec.rb +2 -2
  757. data/spec/unit/util_spec.rb +7 -7
  758. data/tasks/benchmark.rake +0 -1
  759. data/tasks/parallel.rake +408 -0
  760. data/tasks/yard.rake +59 -0
  761. metadata +2889 -2782
  762. checksums.yaml +0 -7
  763. data/README_DEVELOPER.md +0 -809
  764. data/lib/puppet/file_system/file.rb +0 -271
  765. data/lib/puppet/network/http/rack/httphandler.rb +0 -13
  766. data/lib/puppet/pops/binder/hiera2.rb +0 -10
  767. data/lib/puppet/pops/binder/hiera2/bindings_provider.rb +0 -148
  768. data/lib/puppet/pops/binder/hiera2/config.rb +0 -69
  769. data/lib/puppet/pops/binder/hiera2/config_checker.rb +0 -68
  770. data/lib/puppet/pops/binder/hiera2/diagnostic_producer.rb +0 -36
  771. data/lib/puppet/pops/binder/hiera2/issues.rb +0 -67
  772. data/lib/puppet/pops/binder/hiera2/json_backend.rb +0 -18
  773. data/lib/puppet/pops/binder/hiera2/yaml_backend.rb +0 -21
  774. data/lib/puppet/pops/binder/scheme_handler/confdir_hiera_scheme.rb +0 -67
  775. data/lib/puppet/pops/binder/scheme_handler/module_hiera_scheme.rb +0 -92
  776. data/lib/puppet/pops/parser/grammar.ra +0 -746
  777. data/lib/puppet/provider/port/parsed.rb +0 -173
  778. data/lib/puppet/type/port.rb +0 -119
  779. data/lib/puppetx/puppet/hiera2_backend.rb +0 -31
  780. data/spec/fixtures/unit/pops/binder/bindings_composer/hiera1config/binder_config.yaml +0 -18
  781. data/spec/fixtures/unit/pops/binder/bindings_composer/hiera1config/hiera.yaml +0 -8
  782. data/spec/fixtures/unit/pops/binder/bindings_composer/hiera1config/modules/good/common.yaml +0 -1
  783. data/spec/fixtures/unit/pops/binder/bindings_composer/hiera1config/modules/good/hiera.yaml +0 -10
  784. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/common.yaml +0 -1
  785. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/hiera.yaml +0 -11
  786. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/localhost.yaml +0 -1
  787. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/common.yaml +0 -3
  788. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/hiera.yaml +0 -13
  789. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/lib/puppet/bindings/awesome/default.rb +0 -4
  790. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/lib/puppetx/awesome/echo_backend.rb +0 -11
  791. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/localhost.yaml +0 -1
  792. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/common.yaml +0 -3
  793. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/hiera_config.yaml +0 -9
  794. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/common.yaml +0 -2
  795. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/hiera.yaml +0 -11
  796. data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/hiera.yaml +0 -9
  797. data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/node.example.com.json +0 -9
  798. data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/node.example.com.yaml +0 -5
  799. data/spec/fixtures/unit/pops/binder/hiera2/config/bad_syntax/hiera.yaml +0 -10
  800. data/spec/fixtures/unit/pops/binder/hiera2/config/malformed_hierarchy/hiera.yaml +0 -8
  801. data/spec/fixtures/unit/pops/binder/hiera2/config/missing/foo.txt +0 -1
  802. data/spec/fixtures/unit/pops/binder/hiera2/config/no_backends/hiera.yaml +0 -7
  803. data/spec/fixtures/unit/pops/binder/hiera2/config/no_hierarchy/hiera.yaml +0 -4
  804. data/spec/fixtures/unit/pops/binder/hiera2/config/not_a_hash/hiera.yaml +0 -2
  805. data/spec/fixtures/unit/pops/binder/hiera2/config/ok/hiera.yaml +0 -8
  806. data/spec/fixtures/unit/pops/binder/hiera2/yaml_backend/invalid/common.yaml +0 -1
  807. data/spec/fixtures/unit/pops/binder/hiera2/yaml_backend/ok/common.yaml +0 -2
  808. data/spec/unit/file_system/file_spec.rb +0 -486
  809. data/spec/unit/pops/binder/hiera2/bindings_provider_spec.rb +0 -74
  810. data/spec/unit/pops/binder/hiera2/config_spec.rb +0 -61
  811. data/spec/unit/pops/binder/hiera2/yaml_backend_spec.rb +0 -33
@@ -0,0 +1,49 @@
1
+ # This module is an integral part of the evaluator. It deals with the concern of validating
2
+ # external syntax in text produced by heredoc and templates.
3
+ #
4
+ module Puppet::Pops::Evaluator::ExternalSyntaxSupport
5
+ # TODO: This can be simplified if the Factory directly supporteded hash_of/type_of
6
+ TYPES = Puppet::Pops::Types::TypeFactory
7
+
8
+ def assert_external_syntax(scope, result, syntax, reference_expr)
9
+ @@HASH_OF_SYNTAX_CHECKERS ||= TYPES.hash_of(TYPES.type_of(::Puppetx::SYNTAX_CHECKERS_TYPE))
10
+ # ignore 'unspecified syntax'
11
+ return if syntax.nil? || syntax == ''
12
+
13
+ checker = checker_for_syntax(scope, syntax)
14
+ # ignore syntax with no matching checker
15
+ return unless checker
16
+
17
+ # Call checker and give it the location information from the expression
18
+ # (as opposed to where the heredoc tag is (somewhere on the line above)).
19
+ acceptor = Puppet::Pops::Validation::Acceptor.new()
20
+ source_pos = find_closest_positioned(reference_expr)
21
+ checker.check(result, syntax, acceptor, source_pos)
22
+
23
+ if acceptor.error_count > 0
24
+ checker_message = "Invalid produced text having syntax: '#{syntax}'."
25
+ Puppet::Pops::IssueReporter.assert_and_report(acceptor, :message => checker_message)
26
+ raise ArgumentError, "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
27
+ end
28
+ end
29
+
30
+ # Finds the most significant checker for the given syntax (most significant is to the right).
31
+ # Returns nil if there is no registered checker.
32
+ #
33
+ def checker_for_syntax(scope, syntax)
34
+ checkers_hash = scope.compiler.injector.lookup(scope, @@HASH_OF_SYNTAX_CHECKERS, ::Puppetx::SYNTAX_CHECKERS) || {}
35
+ checkers_hash[lookup_keys_for_syntax(syntax).find {|x| checkers_hash[x] }]
36
+ end
37
+
38
+ # Returns an array of possible syntax names
39
+ def lookup_keys_for_syntax(syntax)
40
+ segments = syntax.split(/\+/)
41
+ result = []
42
+ begin
43
+ result << segments.join("+")
44
+ segments.shift
45
+ end until segments.empty?
46
+ result
47
+ end
48
+
49
+ end
@@ -0,0 +1,156 @@
1
+ # The RelationshipOperator implements the semantics of the -> <- ~> <~ operators creating relationships or notification
2
+ # relationships between the left and right hand side's references to resources.
3
+ #
4
+ # This is separate class since a second level of evaluation is required that transforms string in left or right hand
5
+ # to type references. The task of "making a relationship" is delegated to the "runtime support" class that is included.
6
+ # This is done to separate the concerns of the new evaluator from the 3x runtime; messy logic goes into the runtime support
7
+ # module. Later when more is cleaned up this can be simplified further.
8
+ #
9
+ class Puppet::Pops::Evaluator::RelationshipOperator
10
+
11
+ # Provides access to the Puppet 3.x runtime (scope, etc.)
12
+ # This separation has been made to make it easier to later migrate the evaluator to an improved runtime.
13
+ #
14
+ include Puppet::Pops::Evaluator::Runtime3Support
15
+
16
+ Issues = Puppet::Pops::Issues
17
+
18
+ class IllegalRelationshipOperandError < RuntimeError
19
+ attr_reader :operand
20
+ def initialize operand
21
+ @operand = operand
22
+ end
23
+ end
24
+
25
+ class NotCatalogTypeError < RuntimeError
26
+ attr_reader :type
27
+ def initialize type
28
+ @type = type
29
+ end
30
+ end
31
+
32
+ def initialize
33
+ @type_transformer_visitor = Puppet::Pops::Visitor.new(self, "transform", 1, 1)
34
+ @type_calculator = Puppet::Pops::Types::TypeCalculator.new()
35
+ @type_parser = Puppet::Pops::Types::TypeParser.new()
36
+
37
+ @catalog_type = Puppet::Pops::Types::TypeFactory.catalog_entry()
38
+ end
39
+
40
+ def transform(o, scope)
41
+ @type_transformer_visitor.visit_this_1(self, o, scope)
42
+ end
43
+
44
+ # Catch all non transformable objects
45
+ # @api private
46
+ def transform_Object(o, scope)
47
+ raise IllegalRelationshipOperandError.new(o)
48
+ end
49
+
50
+ # A string must be a type reference in string format
51
+ # @api private
52
+ def transform_String(o, scope)
53
+ assert_catalog_type(@type_parser.parse(o), scope)
54
+ end
55
+
56
+ # A qualified name is short hand for a class with this name
57
+ # @api private
58
+ def transform_QualifiedName(o, scope)
59
+ Puppet::Pops::Types::TypeFactory.host_class(o.value)
60
+ end
61
+
62
+ # Types are what they are, just check the type
63
+ # @api private
64
+ def transform_PAbstractType(o, scope)
65
+ assert_catalog_type(o, scope)
66
+ end
67
+
68
+ # This transforms a 3x Collector (the result of evaluating a 3x AST::Collection).
69
+ # It is passed through verbatim since it is evaluated late by the compiler. At the point
70
+ # where the relationship is evaluated, it is simply recorded with the compiler for later evaluation.
71
+ # If one of the sides of the relationship is a Collector it is evaluated before the actual
72
+ # relationship is formed. (All of this happens at a later point in time.
73
+ #
74
+ def transform_Collector(o, scope)
75
+ o
76
+ end
77
+
78
+ # Array content needs to be transformed
79
+ def transform_Array(o, scope)
80
+ o.map{|x| transform(x, scope) }
81
+ end
82
+
83
+ # Asserts (and returns) the type if it is a PCatalogEntryType
84
+ # (A PCatalogEntryType is the base class of PHostClassType, and PResourceType).
85
+ #
86
+ def assert_catalog_type(o, scope)
87
+ unless @type_calculator.assignable?(@catalog_type, o)
88
+ raise NotCatalogTypeError.new(o)
89
+ end
90
+ # TODO must check if this is an abstract PResourceType (i.e. without a type_name) - which should fail ?
91
+ # e.g. File -> File (and other similar constructs) - maybe the catalog protects against this since references
92
+ # may be to future objects...
93
+ o
94
+ end
95
+
96
+ RELATIONSHIP_OPERATORS = [:'->', :'~>', :'<-', :'<~']
97
+ REVERSE_OPERATORS = [:'<-', :'<~']
98
+ RELATION_TYPE = {
99
+ :'->' => :relationship,
100
+ :'<-' => :relationship,
101
+ :'~>' => :subscription,
102
+ :'<~' => :subscription
103
+ }
104
+
105
+ # Evaluate a relationship.
106
+ # TODO: The error reporting is not fine grained since evaluation has already taken place
107
+ # There is no references to the original source expressions at this point, only the overall
108
+ # relationship expression. (e.g.. the expression may be ['string', func_call(), etc.] -> func_call())
109
+ # To implement this, the general evaluator needs to be able to track each evaluation result and associate
110
+ # it with a corresponding expression. This structure should then be passed to the relationship operator.
111
+ #
112
+ def evaluate (left_right_evaluated, relationship_expression, scope)
113
+ # assert operator (should have been validated, but this logic makes assumptions which would
114
+ # screw things up royally). Better safe than sorry.
115
+ unless RELATIONSHIP_OPERATORS.include?(relationship_expression.operator)
116
+ fail(Issues::UNSUPPORTED_OPERATOR, relationship_expression, {:operator => relationship_expression.operator})
117
+ end
118
+
119
+ begin
120
+ # Turn each side into an array of types (this also asserts their type)
121
+ # (note wrap in array first if value is not already an array)
122
+ #
123
+ # TODO: Later when objects are Puppet Runtime Objects and know their type, it will be more efficient to check/infer
124
+ # the type first since a chained operation then does not have to visit each element again. This is not meaningful now
125
+ # since inference needs to visit each object each time, and this is what the transformation does anyway).
126
+ #
127
+ # real is [left, right], and both the left and right may be a single value or an array. In each case all content
128
+ # should be flattened, and then transformed to a type. left or right may also be a value that is transformed
129
+ # into an array, and thus the resulting left and right must be flattened individually
130
+ # Once flattened, the operands should be sets (to remove duplicate entries)
131
+ #
132
+ real = left_right_evaluated.collect {|x| [x].flatten.collect {|x| transform(x, scope) }}
133
+ real[0].flatten!
134
+ real[1].flatten!
135
+ real[0].uniq!
136
+ real[1].uniq!
137
+
138
+ # reverse order if operator is Right to Left
139
+ source, target = reverse_operator?(relationship_expression) ? real.reverse : real
140
+
141
+ # Add the relationships to the catalog
142
+ source.each {|s| target.each {|t| add_relationship(s, t, RELATION_TYPE[relationship_expression.operator], scope) }}
143
+
144
+ # Produce the transformed source RHS (if this is a chain, this does not need to be done again)
145
+ real.slice(1)
146
+ rescue NotCatalogTypeError => e
147
+ fail(Issues::ILLEGAL_RELATIONSHIP_OPERAND_TYPE, relationship_expression, {:type => @type_calculator.string(e.type)})
148
+ rescue IllegalRelationshipOperandError => e
149
+ fail(Issues::ILLEGAL_RELATIONSHIP_OPERAND_TYPE, relationship_expression, {:operand => e.operand})
150
+ end
151
+ end
152
+
153
+ def reverse_operator?(o)
154
+ REVERSE_OPERATORS.include?(o.operator)
155
+ end
156
+ end
@@ -0,0 +1,489 @@
1
+ # A module with bindings between the new evaluator and the 3x runtime.
2
+ # The intention is to separate all calls into scope, compiler, resource, etc. in this module
3
+ # to make it easier to later refactor the evaluator for better implementations of the 3x classes.
4
+ #
5
+ # @api private
6
+ module Puppet::Pops::Evaluator::Runtime3Support
7
+ # Fails the evaluation of _semantic_ with a given issue.
8
+ #
9
+ # @param issue [Puppet::Pops::Issue] the issue to report
10
+ # @param semantic [Puppet::Pops::ModelPopsObject] the object for which evaluation failed in some way. Used to determine origin.
11
+ # @param options [Hash] hash of optional named data elements for the given issue
12
+ # @return [!] this method does not return
13
+ # @raise [Puppet::ParseError] an evaluation error initialized from the arguments (TODO: Change to EvaluationError?)
14
+ #
15
+ def fail(issue, semantic, options={}, except=nil)
16
+ if except.nil?
17
+ # Want a stacktrace, and it must be passed as an exception
18
+ begin
19
+ raise EvaluationError.new()
20
+ rescue EvaluationError => e
21
+ except = e
22
+ end
23
+ end
24
+ diagnostic_producer.accept(issue, semantic, options, except)
25
+ end
26
+
27
+ # Binds the given variable name to the given value in the given scope.
28
+ # The reference object `o` is intended to be used for origin information - the 3x scope implementation
29
+ # only makes use of location when there is an error. This is now handled by other mechanisms; first a check
30
+ # is made if a variable exists and an error is raised if attempting to change an immutable value. Errors
31
+ # in name, numeric variable assignment etc. have also been validated prior to this call. In the event the
32
+ # scope.setvar still raises an error, the general exception handling for evaluation of the assignment
33
+ # expression knows about its location. Because of this, there is no need to extract the location for each
34
+ # setting (extraction is somewhat expensive since 3x requires line instead of offset).
35
+ #
36
+ def set_variable(name, value, o, scope)
37
+ # Scope also checks this but requires that location information are passed as options.
38
+ # Those are expensive to calculate and a test is instead made here to enable failing with better information.
39
+ # The error is not specific enough to allow catching it - need to check the actual message text.
40
+ # TODO: Improve the messy implementation in Scope.
41
+ #
42
+ if scope.bound?(name)
43
+ if Puppet::Parser::Scope::RESERVED_VARIABLE_NAMES.include?(name)
44
+ fail(Puppet::Pops::Issues::ILLEGAL_RESERVED_ASSIGNMENT, o, {:name => name} )
45
+ else
46
+ fail(Puppet::Pops::Issues::ILLEGAL_REASSIGNMENT, o, {:name => name} )
47
+ end
48
+ end
49
+ scope.setvar(name, value)
50
+ end
51
+
52
+ # Returns the value of the variable (nil is returned if variable has no value, or if variable does not exist)
53
+ #
54
+ def get_variable_value(name, o, scope)
55
+ # Puppet 3x stores all variables as strings (then converts them back to numeric with a regexp... to see if it is a match variable)
56
+ # Not ideal, scope should support numeric lookup directly instead.
57
+ # TODO: consider fixing scope
58
+ catch(:undefined_variable) {
59
+ return scope.lookupvar(name.to_s)
60
+ }
61
+ # It is always ok to reference numeric variables even if they are not assigned. They are always undef
62
+ # if not set by a match expression.
63
+ #
64
+ unless name =~ Puppet::Pops::Patterns::NUMERIC_VAR_NAME
65
+ fail(Puppet::Pops::Issues::UNKNOWN_VARIABLE, o, {:name => name})
66
+ end
67
+ end
68
+
69
+ # Returns true if the variable of the given name is set in the given most nested scope. True is returned even if
70
+ # variable is bound to nil.
71
+ #
72
+ def variable_bound?(name, scope)
73
+ scope.bound?(name.to_s)
74
+ end
75
+
76
+ # Returns true if the variable is bound to a value or nil, in the scope or it's parent scopes.
77
+ #
78
+ def variable_exists?(name, scope)
79
+ scope.exist?(name.to_s)
80
+ end
81
+
82
+ def set_match_data(match_data, o, scope)
83
+ # See set_variable for rationale for not passing file and line to ephemeral_from.
84
+ # NOTE: The 3x scope adds one ephemeral(match) to its internal stack per match that succeeds ! It never
85
+ # clears anything. Thus a context that performs many matches will get very deep (there simply is no way to
86
+ # clear the match variables without rolling back the ephemeral stack.)
87
+ # This implementation does not attempt to fix this, it behaves the same bad way.
88
+ unless match_data.nil?
89
+ scope.ephemeral_from(match_data)
90
+ end
91
+ end
92
+
93
+ # Creates a local scope with vairalbes set from a hash of variable name to value
94
+ #
95
+ def create_local_scope_from(hash, scope)
96
+ # two dummy values are needed since the scope tries to give an error message (can not happen in this
97
+ # case - it is just wrong, the error should be reported by the caller who knows in more detail where it
98
+ # is in the source.
99
+ #
100
+ raise ArgumentError, "Internal error - attempt to create a local scope without a hash" unless hash.is_a?(Hash)
101
+ scope.ephemeral_from(hash)
102
+ end
103
+
104
+ # Creates a nested match scope
105
+ def create_match_scope_from(scope)
106
+ # Create a transparent match scope (for future matches)
107
+ scope.new_match_scope(nil)
108
+ end
109
+
110
+ def get_scope_nesting_level(scope)
111
+ scope.ephemeral_level
112
+ end
113
+
114
+ def set_scope_nesting_level(scope, level)
115
+ # Yup, 3x uses this method to reset the level, it also supports passing :all to destroy all
116
+ # ephemeral/local scopes - which is a sure way to create havoc.
117
+ #
118
+ scope.unset_ephemeral_var(level)
119
+ end
120
+
121
+ # Adds a relationship between the given `source` and `target` of the given `relationship_type`
122
+ # @param source [Puppet:Pops::Types::PCatalogEntryType] the source end of the relationship (from)
123
+ # @param target [Puppet:Pops::Types::PCatalogEntryType] the target end of the relationship (to)
124
+ # @param relationship_type [:relationship, :subscription] the type of the relationship
125
+ #
126
+ def add_relationship(source, target, relationship_type, scope)
127
+ # The 3x way is to record a Puppet::Parser::Relationship that is evaluated at the end of the compilation.
128
+ # This means it is not possible to detect any duplicates at this point (and signal where an attempt is made to
129
+ # add a duplicate. There is also no location information to signal the original place in the logic. The user will have
130
+ # to go fish.
131
+ # The 3.x implementation is based on Strings :-o, so the source and target must be transformed. The resolution is
132
+ # done by Catalog#resource(type, title). To do that, it creates a Puppet::Resource since it is responsible for
133
+ # translating the name/type/title and create index-keys used by the catalog. The Puppet::Resource has bizarre parsing of
134
+ # the type and title (scan for [] that is interpreted as type/title (but it gets it wrong).
135
+ # Moreover if the type is "" or "component", the type is Class, and if the type is :main, it is :main, all other cases
136
+ # undergo capitalization of name-segments (foo::bar becomes Foo::Bar). (This was earlier done in the reverse by the parser).
137
+ # Further, the title undergoes the same munging !!!
138
+ #
139
+ # That bug infested nest of messy logic needs serious Exorcism!
140
+ #
141
+ # Unfortunately it is not easy to simply call more intelligent methods at a lower level as the compiler evaluates the recorded
142
+ # Relationship object at a much later point, and it is responsible for invoking all the messy logic.
143
+ #
144
+ # TODO: Revisit the below logic when there is a sane implementation of the catalog, compiler and resource. For now
145
+ # concentrate on transforming the type references to what is expected by the wacky logic.
146
+ #
147
+ # HOWEVER, the Compiler only records the Relationships, and the only method it calls is @relationships.each{|x| x.evaluate(catalog) }
148
+ # Which means a smarter Relationship class could do this right. Instead of obtaining the resource from the catalog using
149
+ # the borked resource(type, title) which creates a resource for the purpose of looking it up, it needs to instead
150
+ # scan the catalog's resources
151
+ #
152
+ # GAAAH, it is even worse!
153
+ # It starts in the parser, which parses "File['foo']" into an AST::ResourceReference with type = File, and title = foo
154
+ # This AST is evaluated by looking up the type/title in the scope - causing it to be loaded if it exists, and if not, the given
155
+ # type name/title is used. It does not search for resource instances, only classes and types. It returns symbolic information
156
+ # [type, [title, title]]. From this, instances of Puppet::Resource are created and returned. These only have type/title information
157
+ # filled out. One or an array of resources are returned.
158
+ # This set of evaluated (empty reference) Resource instances are then passed to the relationship operator. It creates a
159
+ # Puppet::Parser::Relationship giving it a source and a target that are (empty reference) Resource instances. These are then remembered
160
+ # until the relationship is evaluated by the compiler (at the end). When evaluation takes place, the (empty reference) Resource instances
161
+ # are converted to String (!?! WTF) on the simple format "#{type}[#{title}]", and the catalog is told to find a resource, by giving
162
+ # it this string. If it cannot find the resource it fails, else the before/notify parameter is appended with the target.
163
+ # The search for the resource begin with (you guessed it) again creating an (empty reference) resource from type and title (WTF?!?!).
164
+ # The catalog now uses the reference resource to compute a key [r.type, r.title.to_s] and also gets a uniqueness key from the
165
+ # resource (This is only a reference type created from title and type). If it cannot find it with the first key, it uses the
166
+ # uniqueness key to lookup.
167
+ #
168
+ # This is probably done to allow a resource type to munge/translate the title in some way (but it is quite unclear from the long
169
+ # and convoluted path of evaluation.
170
+ # In order to do this in a way that is similar to 3.x two resources are created to be used as keys.
171
+ #
172
+ #
173
+ # TODO: logic that creates a PCatalogEntryType should resolve it to ensure it is loaded (to the best of known_resource_types knowledge).
174
+ # If this is not done, the order in which things are done may be different? OTOH, it probably works anyway :-)
175
+ # TODO: Not sure if references needs to be resolved via the scope?
176
+ #
177
+ # And if that is not enough, a source/target may be a Collector (a baked query that will be evaluated by the
178
+ # compiler - it is simply passed through here for processing by the compiler at the right time).
179
+ #
180
+ if source.is_a?(Puppet::Parser::Collector)
181
+ # use verbatim - behavior defined by 3x
182
+ source_resource = source
183
+ else
184
+ # transform into the wonderful String representation in 3x
185
+ type, title = catalog_type_to_split_type_title(source)
186
+ source_resource = Puppet::Resource.new(type, title)
187
+ end
188
+ if target.is_a?(Puppet::Parser::Collector)
189
+ # use verbatim - behavior defined by 3x
190
+ target_resource = target
191
+ else
192
+ # transform into the wonderful String representation in 3x
193
+ type, title = catalog_type_to_split_type_title(target)
194
+ target_resource = Puppet::Resource.new(type, title)
195
+ end
196
+ # Add the relationship to the compiler for later evaluation.
197
+ scope.compiler.add_relationship(Puppet::Parser::Relationship.new(source_resource, target_resource, relationship_type))
198
+ end
199
+
200
+ # Coerce value `v` to numeric or fails.
201
+ # The given value `v` is coerced to Numeric, and if that fails the operation
202
+ # calls {#fail}.
203
+ # @param v [Object] the value to convert
204
+ # @param o [Object] originating instruction
205
+ # @param scope [Object] the (runtime specific) scope where evaluation of o takes place
206
+ # @return [Numeric] value `v` converted to Numeric.
207
+ #
208
+ def coerce_numeric(v, o, scope)
209
+ unless n = Puppet::Pops::Utils.to_n(v)
210
+ fail(Puppet::Pops::Issues::NOT_NUMERIC, o, {:value => v})
211
+ end
212
+ n
213
+ end
214
+
215
+ # Asserts that the given function name resolves to an available function. The function is loaded
216
+ # as a side effect. Fails if the function does not exist.
217
+ #
218
+ def assert_function_available(name, o, scope)
219
+ fail(Puppet::Pops::Issues::UNKNOWN_FUNCTION, o, {:name => name}) unless Puppet::Parser::Functions.function(name)
220
+ end
221
+
222
+ def call_function(name, args, o, scope)
223
+ # Arguments must be mapped since functions are unaware of the new and magical creatures in 4x.
224
+ # NOTE: Passing an empty string last converts :undef to empty string
225
+ mapped_args = args.map {|a| convert(a, scope, '') }
226
+ scope.send("function_#{name}", mapped_args)
227
+ end
228
+
229
+ # Returns true if the function produces a value
230
+ def rvalue_function?(name, o, scope)
231
+ Puppet::Parser::Functions.rvalue?(name)
232
+ end
233
+
234
+ # The o is used for source reference
235
+ def create_resource_parameter(o, scope, name, value, operator)
236
+ file, line = extract_file_line(o)
237
+ Puppet::Parser::Resource::Param.new(
238
+ :name => name,
239
+ :value => convert(value, scope, :undef), # converted to 3x since 4x supports additional objects / types
240
+ :source => scope.source, :line => line, :file => file,
241
+ :add => operator == :'+>'
242
+ )
243
+ end
244
+
245
+ def create_resources(o, scope, virtual, exported, type_name, resource_titles, evaluated_parameters)
246
+
247
+ # TODO: Unknown resource causes creation of Resource to fail with ArgumentError, should give
248
+ # a proper Issue. Now the result is "Error while evaluating a Resource Statement" with the message
249
+ # from the raised exception. (It may be good enough).
250
+
251
+ # resolve in scope.
252
+ fully_qualified_type, resource_titles = scope.resolve_type_and_titles(type_name, resource_titles)
253
+
254
+ # Not 100% accurate as this is the resource expression location and each title is processed separately
255
+ # The titles are however the result of evaluation and they have no location at this point (an array
256
+ # of positions for the source expressions are required for this to work).
257
+ # TODO: Revisit and possible improve the accuracy.
258
+ #
259
+ file, line = extract_file_line(o)
260
+
261
+ # Build a resource for each title
262
+ resource_titles.map do |resource_title|
263
+ resource = Puppet::Parser::Resource.new(
264
+ fully_qualified_type, resource_title,
265
+ :parameters => evaluated_parameters,
266
+ :file => file,
267
+ :line => line,
268
+ :exported => exported,
269
+ :virtual => virtual,
270
+ # WTF is this? Which source is this? The file? The name of the context ?
271
+ :source => scope.source,
272
+ :scope => scope,
273
+ :strict => true
274
+ )
275
+
276
+ if resource.resource_type.is_a? Puppet::Resource::Type
277
+ resource.resource_type.instantiate_resource(scope, resource)
278
+ end
279
+ scope.compiler.add_resource(scope, resource)
280
+ scope.compiler.evaluate_classes([resource_title], scope, false, true) if fully_qualified_type == 'class'
281
+ # Turn the resource into a PType (a reference to a resource type)
282
+ # weed out nil's
283
+ resource_to_ptype(resource)
284
+ end
285
+ end
286
+
287
+ # Defines default parameters for a type with the given name.
288
+ #
289
+ def create_resource_defaults(o, scope, type_name, evaluated_parameters)
290
+ # Note that name must be capitalized in this 3x call
291
+ # The 3x impl creates a Resource instance with a bogus title and then asks the created resource
292
+ # for the type of the name.
293
+ # Note, locations are available per parameter.
294
+ #
295
+ scope.define_settings(type_name.capitalize, evaluated_parameters)
296
+ end
297
+
298
+ # Creates resource overrides for all resource type objects in evaluated_resources. The same set of
299
+ # evaluated parameters are applied to all.
300
+ #
301
+ def create_resource_overrides(o, scope, evaluated_resources, evaluated_parameters)
302
+ # Not 100% accurate as this is the resource expression location and each title is processed separately
303
+ # The titles are however the result of evaluation and they have no location at this point (an array
304
+ # of positions for the source expressions are required for this to work.
305
+ # TODO: Revisit and possible improve the accuracy.
306
+ #
307
+ file, line = extract_file_line(o)
308
+
309
+ evaluated_resources.each do |r|
310
+ resource = Puppet::Parser::Resource.new(
311
+ r.type_name, r.title,
312
+ :parameters => evaluated_parameters,
313
+ :file => file,
314
+ :line => line,
315
+ # WTF is this? Which source is this? The file? The name of the context ?
316
+ :source => scope.source,
317
+ :scope => scope
318
+ )
319
+
320
+ scope.compiler.add_override(resource)
321
+ end
322
+ end
323
+
324
+ # Finds a resource given a type and a title.
325
+ #
326
+ def find_resource(scope, type_name, title)
327
+ scope.compiler.findresource(type_name, title)
328
+ end
329
+
330
+ # Returns the value of a resource's parameter by first looking up the parameter in the resource
331
+ # and then in the defaults for the resource. Since the resource exists (it must in order to look up its
332
+ # parameters, any overrides have already been applied). Defaults are not applied to a resource until it
333
+ # has been finished (which typically has not taked place when this is evaluated; hence the dual lookup).
334
+ #
335
+ def get_resource_parameter_value(scope, resource, parameter_name)
336
+ val = resource[parameter_name]
337
+ if val.nil? && defaults = scope.lookupdefaults(resource.type)
338
+ # NOTE: 3x resource keeps defaults as hash using symbol for name as key to Parameter which (again) holds
339
+ # name and value.
340
+ param = defaults[parameter_name.to_sym]
341
+ val = param.value
342
+ end
343
+ val
344
+ end
345
+
346
+ # Returns true, if the given name is the name of a resource parameter.
347
+ #
348
+ def is_parameter_of_resource?(scope, resource, name)
349
+ resource.valid_parameter?(name)
350
+ end
351
+
352
+ def resource_to_ptype(resource)
353
+ nil if resource.nil?
354
+ type_calculator.infer(resource)
355
+ end
356
+
357
+ # This is the same type of "truth" as used in the current Puppet DSL.
358
+ #
359
+ def is_true? o
360
+ # Is the value true? This allows us to control the definition of truth
361
+ # in one place.
362
+ case o
363
+ when ''
364
+ false
365
+ when :undef
366
+ false
367
+ else
368
+ !!o
369
+ end
370
+ end
371
+
372
+ # Utility method for TrueClass || FalseClass
373
+ # @param x [Object] the object to test if it is instance of TrueClass or FalseClass
374
+ def is_boolean? x
375
+ x.is_a?(TrueClass) || x.is_a?(FalseClass)
376
+ end
377
+
378
+ def initialize
379
+ @@convert_visitor ||= Puppet::Pops::Visitor.new(self, "convert", 2, 2)
380
+ end
381
+
382
+ # Converts 4x supported values to 3x values. This is required because
383
+ # resources and other objects do not know about the new type system, and does not support
384
+ # regular expressions. Unfortunately this has to be done for array and hash as well.
385
+ # A complication is that catalog types needs to be resolved against the scope.
386
+ #
387
+ def convert(o, scope, undef_value)
388
+ @@convert_visitor.visit_this_2(self, o, scope, undef_value)
389
+ end
390
+
391
+
392
+ def convert_NilClass(o, scope, undef_value)
393
+ undef_value
394
+ end
395
+
396
+ def convert_Object(o, scope, undef_value)
397
+ o
398
+ end
399
+
400
+ def convert_Array(o, scope, undef_value)
401
+ o.map {|x| convert(x, scope, undef_value) }
402
+ end
403
+
404
+ def convert_Hash(o, scope, undef_value)
405
+ result = {}
406
+ o.each {|k,v| result[convert(k, scope, undef_value)] = convert(v, scope, undef_value) }
407
+ result
408
+ end
409
+
410
+ def convert_Regexp(o, scope, undef_value)
411
+ # Puppet 3x cannot handle parameter values that are reqular expressions. Turn into regexp string in
412
+ # source form
413
+ o.inspect
414
+ end
415
+
416
+ def convert_Symbol(o, scope, undef_value)
417
+ case o
418
+ when :undef
419
+ undef_value # 3x wants :undef as empty string in function
420
+ else
421
+ o # :default, and all others are verbatim since they are new in future evaluator
422
+ end
423
+ end
424
+
425
+ def convert_PAbstractType(o, scope, undef_value)
426
+ o
427
+ end
428
+
429
+ def convert_PResourceType(o,scope, undef_value)
430
+ # Needs conversion by calling scope to resolve the name and possibly return a different name
431
+ # Resolution can only be called with an array, and returns an array. Here there is only one name
432
+ type, titles = scope.resolve_type_and_titles(o.type_name, [o.title])
433
+ Puppet::Resource.new(type, titles[0])
434
+ end
435
+
436
+ def convert_PHostClassType(o, scope, undef_value)
437
+ # Needs conversion by calling scope to resolve the name and possibly return a different name
438
+ # Resolution can only be called with an array, and returns an array. Here there is only one name
439
+ type, titles = scope.resolve_type_and_titles('class', [o.class_name])
440
+ Puppet::Resource.new(type, titles[0])
441
+ end
442
+
443
+ private
444
+
445
+ # Produces an array with [type, title] from a PCatalogEntryType
446
+ # Used to produce reference resource instances (used when 3x is operating on a resource).
447
+ #
448
+ def catalog_type_to_split_type_title(catalog_type)
449
+ case catalog_type
450
+ when Puppet::Pops::Types::PHostClassType
451
+ return ['Class', catalog_type.class_name]
452
+ when Puppet::Pops::Types::PResourceType
453
+ return [catalog_type.type_name, catalog_type.title]
454
+ else
455
+ raise ArgumentError, "Cannot split the type #{catalog_type.class}, it is neither a PHostClassType, nor a PResourceClass."
456
+ end
457
+ end
458
+
459
+ def extract_file_line(o)
460
+ source_pos = Puppet::Pops::Utils.find_closest_positioned(o)
461
+ return [nil, -1] unless source_pos
462
+ [source_pos.locator.file, source_pos.line]
463
+ end
464
+
465
+ def find_closest_positioned(o)
466
+ return nil if o.nil? || o.is_a?(Puppet::Pops::Model::Program)
467
+ o.offset.nil? ? find_closest_positioned(o.eContainer) : Puppet::Pops::Adapters::SourcePosAdapter.adapt(o)
468
+ end
469
+
470
+ # Creates a diagnostic producer
471
+ def diagnostic_producer
472
+ Puppet::Pops::Validation::DiagnosticProducer.new(
473
+ ExceptionRaisingAcceptor.new(), # Raises exception on all issues
474
+ Puppet::Pops::Validation::SeverityProducer.new(), # All issues are errors
475
+ Puppet::Pops::Model::ModelLabelProvider.new())
476
+ end
477
+
478
+ # An acceptor of diagnostics that immediately raises an exception.
479
+ class ExceptionRaisingAcceptor < Puppet::Pops::Validation::Acceptor
480
+ def accept(diagnostic)
481
+ super
482
+ Puppet::Pops::IssueReporter.assert_and_report(self, {:message => "Evaluation Error:" })
483
+ raise ArgumentError, "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
484
+ end
485
+ end
486
+
487
+ class EvaluationError < StandardError
488
+ end
489
+ end