puppet 8.5.1-universal-darwin → 8.7.0-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.
Files changed (581) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -2
  3. data/Gemfile.lock +55 -48
  4. data/Rakefile +45 -22
  5. data/examples/hiera/README.md +68 -57
  6. data/examples/hiera/data/common.yaml +12 -0
  7. data/examples/hiera/data/dc1.yaml +6 -0
  8. data/examples/hiera/hiera.yaml +15 -0
  9. data/examples/hiera/modules/ntp/data/common.yaml +4 -0
  10. data/examples/hiera/modules/ntp/hiera.yaml +9 -0
  11. data/examples/hiera/modules/ntp/manifests/config.pp +16 -4
  12. data/examples/hiera/modules/ntp/templates/ntp.conf.epp +3 -0
  13. data/examples/hiera/modules/users/manifests/common.pp +7 -2
  14. data/examples/hiera/modules/users/manifests/dc1.pp +7 -2
  15. data/examples/hiera/site.pp +1 -1
  16. data/ext/project_data.yaml +0 -45
  17. data/ext/windows/service/daemon.rb +49 -55
  18. data/lib/hiera/scope.rb +3 -3
  19. data/lib/hiera_puppet.rb +1 -1
  20. data/lib/puppet/agent/disabler.rb +1 -1
  21. data/lib/puppet/application/agent.rb +2 -2
  22. data/lib/puppet/application/apply.rb +2 -2
  23. data/lib/puppet/application/describe.rb +6 -6
  24. data/lib/puppet/application/device.rb +99 -100
  25. data/lib/puppet/application/doc.rb +1 -1
  26. data/lib/puppet/application/face_base.rb +7 -7
  27. data/lib/puppet/application/filebucket.rb +1 -1
  28. data/lib/puppet/application/lookup.rb +5 -5
  29. data/lib/puppet/application/resource.rb +10 -3
  30. data/lib/puppet/application/ssl.rb +3 -3
  31. data/lib/puppet/application.rb +16 -18
  32. data/lib/puppet/coercion.rb +1 -1
  33. data/lib/puppet/configurer/downloader.rb +9 -4
  34. data/lib/puppet/configurer/fact_handler.rb +12 -13
  35. data/lib/puppet/configurer.rb +16 -18
  36. data/lib/puppet/confine/feature.rb +1 -1
  37. data/lib/puppet/confine/variable.rb +1 -1
  38. data/lib/puppet/confine.rb +2 -2
  39. data/lib/puppet/confine_collection.rb +1 -1
  40. data/lib/puppet/confiner.rb +2 -2
  41. data/lib/puppet/daemon.rb +4 -3
  42. data/lib/puppet/datatypes.rb +5 -6
  43. data/lib/puppet/defaults.rb +14 -8
  44. data/lib/puppet/environments.rb +3 -7
  45. data/lib/puppet/error.rb +3 -3
  46. data/lib/puppet/external/dot.rb +42 -34
  47. data/lib/puppet/face/catalog/select.rb +1 -1
  48. data/lib/puppet/face/epp.rb +7 -9
  49. data/lib/puppet/face/help.rb +12 -12
  50. data/lib/puppet/face/module/changes.rb +1 -3
  51. data/lib/puppet/face/module/list.rb +37 -37
  52. data/lib/puppet/face/node/clean.rb +1 -1
  53. data/lib/puppet/face/parser.rb +6 -8
  54. data/lib/puppet/face/report.rb +5 -7
  55. data/lib/puppet/facter_impl.rb +1 -1
  56. data/lib/puppet/feature/base.rb +9 -11
  57. data/lib/puppet/feature/pe_license.rb +1 -1
  58. data/lib/puppet/feature/ssh.rb +1 -1
  59. data/lib/puppet/feature/telnet.rb +3 -5
  60. data/lib/puppet/feature/zlib.rb +1 -1
  61. data/lib/puppet/ffi/windows/constants.rb +1 -1
  62. data/lib/puppet/ffi/windows/functions.rb +2 -2
  63. data/lib/puppet/ffi/windows/structs.rb +3 -3
  64. data/lib/puppet/file_bucket/dipper.rb +4 -4
  65. data/lib/puppet/file_bucket/file.rb +4 -4
  66. data/lib/puppet/file_serving/base.rb +5 -5
  67. data/lib/puppet/file_serving/configuration/parser.rb +9 -9
  68. data/lib/puppet/file_serving/configuration.rb +3 -3
  69. data/lib/puppet/file_serving/fileset.rb +13 -13
  70. data/lib/puppet/file_serving/http_metadata.rb +1 -1
  71. data/lib/puppet/file_serving/metadata.rb +13 -9
  72. data/lib/puppet/file_serving/mount/file.rb +6 -6
  73. data/lib/puppet/file_serving/mount/locales.rb +2 -4
  74. data/lib/puppet/file_serving/mount/pluginfacts.rb +2 -4
  75. data/lib/puppet/file_serving/mount/plugins.rb +2 -4
  76. data/lib/puppet/file_serving/mount.rb +1 -1
  77. data/lib/puppet/file_system/file_impl.rb +3 -3
  78. data/lib/puppet/file_system/memory_impl.rb +1 -1
  79. data/lib/puppet/file_system/path_pattern.rb +1 -1
  80. data/lib/puppet/file_system/uniquefile.rb +17 -16
  81. data/lib/puppet/file_system/windows.rb +26 -18
  82. data/lib/puppet/forge/cache.rb +2 -2
  83. data/lib/puppet/forge/errors.rb +1 -1
  84. data/lib/puppet/forge/repository.rb +2 -2
  85. data/lib/puppet/forge.rb +13 -19
  86. data/lib/puppet/functions/abs.rb +2 -2
  87. data/lib/puppet/functions/camelcase.rb +1 -1
  88. data/lib/puppet/functions/compare.rb +2 -2
  89. data/lib/puppet/functions/contain.rb +1 -1
  90. data/lib/puppet/functions/defined.rb +2 -2
  91. data/lib/puppet/functions/dig.rb +1 -1
  92. data/lib/puppet/functions/eyaml_lookup_key.rb +11 -13
  93. data/lib/puppet/functions/get.rb +1 -1
  94. data/lib/puppet/functions/hocon_data.rb +3 -5
  95. data/lib/puppet/functions/import.rb +1 -1
  96. data/lib/puppet/functions/json_data.rb +4 -6
  97. data/lib/puppet/functions/max.rb +2 -2
  98. data/lib/puppet/functions/min.rb +2 -2
  99. data/lib/puppet/functions/new.rb +1 -1
  100. data/lib/puppet/functions/reduce.rb +6 -10
  101. data/lib/puppet/functions/regsubst.rb +2 -2
  102. data/lib/puppet/functions/require.rb +1 -1
  103. data/lib/puppet/functions/yaml_data.rb +11 -13
  104. data/lib/puppet/functions.rb +32 -37
  105. data/lib/puppet/generate/type.rb +2 -2
  106. data/lib/puppet/gettext/config.rb +9 -9
  107. data/lib/puppet/graph/rb_tree_map.rb +31 -23
  108. data/lib/puppet/graph/relationship_graph.rb +12 -12
  109. data/lib/puppet/graph/simple_graph.rb +8 -10
  110. data/lib/puppet/http/client.rb +1 -1
  111. data/lib/puppet/http/dns.rb +4 -4
  112. data/lib/puppet/http/external_client.rb +1 -1
  113. data/lib/puppet/http/factory.rb +1 -1
  114. data/lib/puppet/http/proxy.rb +15 -15
  115. data/lib/puppet/http/redirector.rb +6 -2
  116. data/lib/puppet/http/resolver.rb +2 -2
  117. data/lib/puppet/http/retry_after_handler.rb +2 -2
  118. data/lib/puppet/http/service/ca.rb +1 -1
  119. data/lib/puppet/http/service/compiler.rb +4 -4
  120. data/lib/puppet/http/service/file_server.rb +1 -1
  121. data/lib/puppet/http/service/report.rb +2 -2
  122. data/lib/puppet/http/service.rb +9 -13
  123. data/lib/puppet/http/session.rb +1 -1
  124. data/lib/puppet/http/site.rb +1 -1
  125. data/lib/puppet/indirector/catalog/compiler.rb +44 -45
  126. data/lib/puppet/indirector/catalog/rest.rb +7 -5
  127. data/lib/puppet/indirector/catalog/store_configs.rb +1 -1
  128. data/lib/puppet/indirector/exec.rb +2 -2
  129. data/lib/puppet/indirector/face.rb +7 -9
  130. data/lib/puppet/indirector/fact_search.rb +1 -1
  131. data/lib/puppet/indirector/facts/facter.rb +6 -6
  132. data/lib/puppet/indirector/facts/json.rb +1 -1
  133. data/lib/puppet/indirector/facts/store_configs.rb +1 -1
  134. data/lib/puppet/indirector/file_bucket_file/file.rb +17 -17
  135. data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -3
  136. data/lib/puppet/indirector/file_content/rest.rb +1 -1
  137. data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
  138. data/lib/puppet/indirector/hiera.rb +1 -1
  139. data/lib/puppet/indirector/indirection.rb +27 -29
  140. data/lib/puppet/indirector/json.rb +4 -4
  141. data/lib/puppet/indirector/memory.rb +2 -2
  142. data/lib/puppet/indirector/msgpack.rb +5 -5
  143. data/lib/puppet/indirector/node/store_configs.rb +1 -1
  144. data/lib/puppet/indirector/none.rb +1 -1
  145. data/lib/puppet/indirector/report/json.rb +1 -1
  146. data/lib/puppet/indirector/report/yaml.rb +1 -1
  147. data/lib/puppet/indirector/request.rb +4 -4
  148. data/lib/puppet/indirector/resource/ral.rb +2 -4
  149. data/lib/puppet/indirector/resource/store_configs.rb +1 -1
  150. data/lib/puppet/indirector/terminus.rb +4 -4
  151. data/lib/puppet/indirector/yaml.rb +3 -3
  152. data/lib/puppet/info_service/class_information_service.rb +5 -8
  153. data/lib/puppet/info_service/task_information_service.rb +6 -7
  154. data/lib/puppet/interface/action.rb +5 -5
  155. data/lib/puppet/interface/action_manager.rb +5 -5
  156. data/lib/puppet/interface/documentation.rb +5 -5
  157. data/lib/puppet/interface/face_collection.rb +7 -7
  158. data/lib/puppet/interface/option.rb +2 -2
  159. data/lib/puppet/interface/option_manager.rb +6 -6
  160. data/lib/puppet/interface.rb +4 -4
  161. data/lib/puppet/metatype/manager.rb +2 -2
  162. data/lib/puppet/module/plan.rb +10 -10
  163. data/lib/puppet/module/task.rb +8 -8
  164. data/lib/puppet/module.rb +39 -41
  165. data/lib/puppet/module_tool/applications/application.rb +10 -8
  166. data/lib/puppet/module_tool/applications/installer.rb +53 -50
  167. data/lib/puppet/module_tool/applications/unpacker.rb +6 -8
  168. data/lib/puppet/module_tool/applications/upgrader.rb +37 -34
  169. data/lib/puppet/module_tool/checksums.rb +2 -2
  170. data/lib/puppet/module_tool/dependency.rb +1 -1
  171. data/lib/puppet/module_tool/errors/base.rb +1 -1
  172. data/lib/puppet/module_tool/install_directory.rb +1 -1
  173. data/lib/puppet/module_tool/local_tarball.rb +3 -5
  174. data/lib/puppet/module_tool/metadata.rb +12 -8
  175. data/lib/puppet/module_tool/shared_behaviors.rb +27 -12
  176. data/lib/puppet/module_tool/tar/mini.rb +3 -3
  177. data/lib/puppet/module_tool.rb +4 -4
  178. data/lib/puppet/network/client_request.rb +5 -3
  179. data/lib/puppet/network/format.rb +2 -2
  180. data/lib/puppet/network/format_support.rb +1 -1
  181. data/lib/puppet/network/formats.rb +1 -1
  182. data/lib/puppet/network/http/api/indirected_routes.rb +24 -44
  183. data/lib/puppet/network/http/api/server/v3.rb +1 -1
  184. data/lib/puppet/network/http/connection.rb +1 -1
  185. data/lib/puppet/network/http/handler.rb +8 -12
  186. data/lib/puppet/network/http/request.rb +1 -1
  187. data/lib/puppet/network/http/route.rb +9 -9
  188. data/lib/puppet/node/environment.rb +21 -23
  189. data/lib/puppet/node/facts.rb +1 -1
  190. data/lib/puppet/node.rb +5 -5
  191. data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
  192. data/lib/puppet/pal/pal_impl.rb +48 -50
  193. data/lib/puppet/pal/plan_signature.rb +1 -1
  194. data/lib/puppet/pal/task_signature.rb +1 -1
  195. data/lib/puppet/parameter/package_options.rb +1 -1
  196. data/lib/puppet/parameter/value.rb +2 -2
  197. data/lib/puppet/parameter/value_collection.rb +7 -7
  198. data/lib/puppet/parameter.rb +8 -9
  199. data/lib/puppet/parser/ast/block_expression.rb +2 -2
  200. data/lib/puppet/parser/ast/hostclass.rb +1 -1
  201. data/lib/puppet/parser/ast/pops_bridge.rb +3 -4
  202. data/lib/puppet/parser/ast/resource.rb +4 -4
  203. data/lib/puppet/parser/ast/resourceparam.rb +4 -4
  204. data/lib/puppet/parser/ast.rb +14 -15
  205. data/lib/puppet/parser/compiler.rb +26 -28
  206. data/lib/puppet/parser/functions/create_resources.rb +3 -3
  207. data/lib/puppet/parser/functions/fail.rb +1 -1
  208. data/lib/puppet/parser/functions/generate.rb +2 -2
  209. data/lib/puppet/parser/functions/tag.rb +1 -1
  210. data/lib/puppet/parser/functions.rb +2 -2
  211. data/lib/puppet/parser/relationship.rb +3 -1
  212. data/lib/puppet/parser/resource/param.rb +2 -2
  213. data/lib/puppet/parser/resource.rb +23 -23
  214. data/lib/puppet/parser/scope.rb +10 -10
  215. data/lib/puppet/parser/script_compiler.rb +1 -1
  216. data/lib/puppet/parser/templatewrapper.rb +1 -1
  217. data/lib/puppet/parser/type_loader.rb +10 -12
  218. data/lib/puppet/parser.rb +1 -1
  219. data/lib/puppet/pops/adaptable.rb +1 -1
  220. data/lib/puppet/pops/evaluator/access_operator.rb +8 -8
  221. data/lib/puppet/pops/evaluator/callable_signature.rb +4 -4
  222. data/lib/puppet/pops/evaluator/collector_transformer.rb +4 -4
  223. data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +7 -7
  224. data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +6 -6
  225. data/lib/puppet/pops/evaluator/compare_operator.rb +10 -10
  226. data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
  227. data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
  228. data/lib/puppet/pops/evaluator/evaluator_impl.rb +56 -60
  229. data/lib/puppet/pops/evaluator/relationship_operator.rb +2 -2
  230. data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
  231. data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
  232. data/lib/puppet/pops/functions/dispatcher.rb +3 -3
  233. data/lib/puppet/pops/functions/function.rb +14 -16
  234. data/lib/puppet/pops/issue_reporter.rb +2 -2
  235. data/lib/puppet/pops/label_provider.rb +2 -2
  236. data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
  237. data/lib/puppet/pops/loader/loader.rb +4 -4
  238. data/lib/puppet/pops/loader/loader_paths.rb +3 -3
  239. data/lib/puppet/pops/loader/module_loaders.rb +11 -11
  240. data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
  241. data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
  242. data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
  243. data/lib/puppet/pops/loader/static_loader.rb +5 -5
  244. data/lib/puppet/pops/loaders.rb +3 -3
  245. data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
  246. data/lib/puppet/pops/lookup/explainer.rb +2 -2
  247. data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
  248. data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
  249. data/lib/puppet/pops/lookup/interpolation.rb +3 -3
  250. data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
  251. data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
  252. data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
  253. data/lib/puppet/pops/lookup/module_data_provider.rb +9 -9
  254. data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
  255. data/lib/puppet/pops/merge_strategy.rb +6 -6
  256. data/lib/puppet/pops/migration/migration_checker.rb +1 -1
  257. data/lib/puppet/pops/model/ast_transformer.rb +9 -11
  258. data/lib/puppet/pops/model/factory.rb +4 -5
  259. data/lib/puppet/pops/parser/epp_parser.rb +2 -2
  260. data/lib/puppet/pops/parser/epp_support.rb +1 -1
  261. data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
  262. data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
  263. data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
  264. data/lib/puppet/pops/parser/lexer2.rb +20 -12
  265. data/lib/puppet/pops/parser/lexer_support.rb +1 -1
  266. data/lib/puppet/pops/parser/locator.rb +4 -4
  267. data/lib/puppet/pops/parser/parser_support.rb +12 -14
  268. data/lib/puppet/pops/parser/pn_parser.rb +3 -3
  269. data/lib/puppet/pops/parser/slurp_support.rb +8 -8
  270. data/lib/puppet/pops/patterns.rb +12 -12
  271. data/lib/puppet/pops/pcore.rb +1 -1
  272. data/lib/puppet/pops/pn.rb +2 -2
  273. data/lib/puppet/pops/puppet_stack.rb +1 -1
  274. data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
  275. data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
  276. data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
  277. data/lib/puppet/pops/time/timestamp.rb +1 -1
  278. data/lib/puppet/pops/types/class_loader.rb +4 -6
  279. data/lib/puppet/pops/types/iterable.rb +1 -1
  280. data/lib/puppet/pops/types/p_binary_type.rb +1 -1
  281. data/lib/puppet/pops/types/p_init_type.rb +1 -1
  282. data/lib/puppet/pops/types/p_object_type.rb +5 -5
  283. data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
  284. data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
  285. data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
  286. data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
  287. data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
  288. data/lib/puppet/pops/types/p_uri_type.rb +4 -4
  289. data/lib/puppet/pops/types/recursion_guard.rb +4 -4
  290. data/lib/puppet/pops/types/ruby_generator.rb +2 -2
  291. data/lib/puppet/pops/types/string_converter.rb +12 -8
  292. data/lib/puppet/pops/types/tree_iterators.rb +4 -6
  293. data/lib/puppet/pops/types/type_calculator.rb +10 -10
  294. data/lib/puppet/pops/types/type_factory.rb +7 -3
  295. data/lib/puppet/pops/types/type_formatter.rb +22 -24
  296. data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
  297. data/lib/puppet/pops/types/types.rb +28 -24
  298. data/lib/puppet/pops/utils.rb +38 -42
  299. data/lib/puppet/pops/validation/checker4_0.rb +10 -10
  300. data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
  301. data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
  302. data/lib/puppet/pops/validation.rb +4 -4
  303. data/lib/puppet/pops/visitor.rb +2 -2
  304. data/lib/puppet/property/ensure.rb +12 -14
  305. data/lib/puppet/property/keyvalue.rb +4 -4
  306. data/lib/puppet/property/list.rb +4 -4
  307. data/lib/puppet/property/ordered_list.rb +1 -1
  308. data/lib/puppet/property.rb +31 -33
  309. data/lib/puppet/provider/aix_object.rb +1 -1
  310. data/lib/puppet/provider/exec.rb +2 -2
  311. data/lib/puppet/provider/file/posix.rb +19 -17
  312. data/lib/puppet/provider/file/windows.rb +13 -19
  313. data/lib/puppet/provider/group/directoryservice.rb +3 -2
  314. data/lib/puppet/provider/group/groupadd.rb +32 -11
  315. data/lib/puppet/provider/group/windows_adsi.rb +2 -2
  316. data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
  317. data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
  318. data/lib/puppet/provider/nameservice/pw.rb +1 -2
  319. data/lib/puppet/provider/nameservice.rb +8 -8
  320. data/lib/puppet/provider/package/aix.rb +19 -19
  321. data/lib/puppet/provider/package/appdmg.rb +2 -2
  322. data/lib/puppet/provider/package/apple.rb +1 -1
  323. data/lib/puppet/provider/package/apt.rb +18 -18
  324. data/lib/puppet/provider/package/aptitude.rb +1 -3
  325. data/lib/puppet/provider/package/aptrpm.rb +9 -9
  326. data/lib/puppet/provider/package/blastwave.rb +10 -14
  327. data/lib/puppet/provider/package/dnfmodule.rb +3 -3
  328. data/lib/puppet/provider/package/dpkg.rb +11 -13
  329. data/lib/puppet/provider/package/fink.rb +14 -14
  330. data/lib/puppet/provider/package/freebsd.rb +1 -1
  331. data/lib/puppet/provider/package/gem.rb +12 -14
  332. data/lib/puppet/provider/package/macports.rb +2 -2
  333. data/lib/puppet/provider/package/nim.rb +10 -10
  334. data/lib/puppet/provider/package/openbsd.rb +22 -22
  335. data/lib/puppet/provider/package/opkg.rb +6 -6
  336. data/lib/puppet/provider/package/pacman.rb +35 -29
  337. data/lib/puppet/provider/package/pip.rb +25 -24
  338. data/lib/puppet/provider/package/pkg.rb +15 -15
  339. data/lib/puppet/provider/package/pkgdmg.rb +10 -10
  340. data/lib/puppet/provider/package/pkgin.rb +2 -2
  341. data/lib/puppet/provider/package/pkgng.rb +5 -5
  342. data/lib/puppet/provider/package/pkgutil.rb +17 -21
  343. data/lib/puppet/provider/package/portage.rb +59 -61
  344. data/lib/puppet/provider/package/ports.rb +12 -11
  345. data/lib/puppet/provider/package/portupgrade.rb +35 -35
  346. data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
  347. data/lib/puppet/provider/package/rpm.rb +26 -26
  348. data/lib/puppet/provider/package/rug.rb +7 -9
  349. data/lib/puppet/provider/package/sun.rb +4 -4
  350. data/lib/puppet/provider/package/up2date.rb +5 -7
  351. data/lib/puppet/provider/package/urpmi.rb +6 -6
  352. data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
  353. data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
  354. data/lib/puppet/provider/package/windows/package.rb +2 -2
  355. data/lib/puppet/provider/package/windows.rb +3 -5
  356. data/lib/puppet/provider/package/xbps.rb +127 -0
  357. data/lib/puppet/provider/package/yum.rb +33 -37
  358. data/lib/puppet/provider/package/zypper.rb +12 -14
  359. data/lib/puppet/provider/package.rb +1 -1
  360. data/lib/puppet/provider/package_targetable.rb +1 -1
  361. data/lib/puppet/provider/parsedfile.rb +9 -9
  362. data/lib/puppet/provider/service/base.rb +16 -21
  363. data/lib/puppet/provider/service/bsd.rb +4 -4
  364. data/lib/puppet/provider/service/daemontools.rb +31 -31
  365. data/lib/puppet/provider/service/debian.rb +6 -6
  366. data/lib/puppet/provider/service/freebsd.rb +36 -36
  367. data/lib/puppet/provider/service/gentoo.rb +6 -6
  368. data/lib/puppet/provider/service/init.rb +19 -19
  369. data/lib/puppet/provider/service/launchd.rb +22 -22
  370. data/lib/puppet/provider/service/openbsd.rb +10 -10
  371. data/lib/puppet/provider/service/openrc.rb +1 -1
  372. data/lib/puppet/provider/service/openwrt.rb +3 -3
  373. data/lib/puppet/provider/service/rcng.rb +3 -3
  374. data/lib/puppet/provider/service/redhat.rb +4 -4
  375. data/lib/puppet/provider/service/runit.rb +6 -6
  376. data/lib/puppet/provider/service/service.rb +5 -7
  377. data/lib/puppet/provider/service/smf.rb +28 -27
  378. data/lib/puppet/provider/service/src.rb +7 -7
  379. data/lib/puppet/provider/service/systemd.rb +31 -37
  380. data/lib/puppet/provider/service/upstart.rb +17 -17
  381. data/lib/puppet/provider/service/windows.rb +7 -7
  382. data/lib/puppet/provider/user/aix.rb +4 -2
  383. data/lib/puppet/provider/user/directoryservice.rb +34 -36
  384. data/lib/puppet/provider/user/hpux.rb +10 -14
  385. data/lib/puppet/provider/user/pw.rb +1 -1
  386. data/lib/puppet/provider/user/user_role_add.rb +16 -18
  387. data/lib/puppet/provider/user/useradd.rb +7 -7
  388. data/lib/puppet/provider/user/windows_adsi.rb +1 -1
  389. data/lib/puppet/provider.rb +8 -8
  390. data/lib/puppet/reference/indirection.rb +3 -0
  391. data/lib/puppet/reference/metaparameter.rb +1 -1
  392. data/lib/puppet/reference/providers.rb +3 -3
  393. data/lib/puppet/reference/type.rb +1 -1
  394. data/lib/puppet/relationship.rb +4 -5
  395. data/lib/puppet/reports/http.rb +1 -1
  396. data/lib/puppet/reports/log.rb +2 -2
  397. data/lib/puppet/reports/store.rb +4 -4
  398. data/lib/puppet/reports.rb +2 -2
  399. data/lib/puppet/resource/catalog.rb +16 -16
  400. data/lib/puppet/resource/status.rb +3 -3
  401. data/lib/puppet/resource/type.rb +8 -8
  402. data/lib/puppet/resource/type_collection.rb +1 -1
  403. data/lib/puppet/resource.rb +41 -41
  404. data/lib/puppet/scheduler/scheduler.rb +1 -1
  405. data/lib/puppet/scheduler/splay_job.rb +9 -0
  406. data/lib/puppet/settings/alias_setting.rb +3 -5
  407. data/lib/puppet/settings/base_setting.rb +11 -11
  408. data/lib/puppet/settings/boolean_setting.rb +2 -2
  409. data/lib/puppet/settings/config_file.rb +5 -4
  410. data/lib/puppet/settings/duration_setting.rb +2 -2
  411. data/lib/puppet/settings/environment_conf.rb +3 -3
  412. data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
  413. data/lib/puppet/settings/file_setting.rb +11 -11
  414. data/lib/puppet/settings/ini_file.rb +3 -3
  415. data/lib/puppet/settings/port_setting.rb +1 -1
  416. data/lib/puppet/settings/priority_setting.rb +2 -2
  417. data/lib/puppet/settings/ttl_setting.rb +2 -2
  418. data/lib/puppet/settings/value_translator.rb +8 -8
  419. data/lib/puppet/settings.rb +65 -70
  420. data/lib/puppet/ssl/base.rb +2 -4
  421. data/lib/puppet/ssl/certificate_request.rb +18 -22
  422. data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
  423. data/lib/puppet/ssl/oids.rb +2 -2
  424. data/lib/puppet/ssl/openssl_loader.rb +4 -4
  425. data/lib/puppet/syntax_checkers/base64.rb +3 -3
  426. data/lib/puppet/syntax_checkers/epp.rb +3 -3
  427. data/lib/puppet/syntax_checkers/json.rb +3 -3
  428. data/lib/puppet/syntax_checkers/pp.rb +3 -3
  429. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  430. data/lib/puppet/transaction/event.rb +2 -2
  431. data/lib/puppet/transaction/event_manager.rb +5 -5
  432. data/lib/puppet/transaction/persistence.rb +12 -14
  433. data/lib/puppet/transaction/report.rb +4 -4
  434. data/lib/puppet/transaction/resource_harness.rb +2 -2
  435. data/lib/puppet/transaction.rb +14 -18
  436. data/lib/puppet/type/component.rb +3 -3
  437. data/lib/puppet/type/exec.rb +51 -45
  438. data/lib/puppet/type/file/checksum_value.rb +1 -1
  439. data/lib/puppet/type/file/content.rb +6 -6
  440. data/lib/puppet/type/file/ctime.rb +2 -2
  441. data/lib/puppet/type/file/data_sync.rb +3 -3
  442. data/lib/puppet/type/file/ensure.rb +16 -15
  443. data/lib/puppet/type/file/mode.rb +9 -9
  444. data/lib/puppet/type/file/mtime.rb +2 -2
  445. data/lib/puppet/type/file/selcontext.rb +14 -14
  446. data/lib/puppet/type/file/source.rb +19 -21
  447. data/lib/puppet/type/file/target.rb +11 -11
  448. data/lib/puppet/type/file.rb +21 -21
  449. data/lib/puppet/type/filebucket.rb +3 -3
  450. data/lib/puppet/type/group.rb +3 -3
  451. data/lib/puppet/type/notify.rb +2 -2
  452. data/lib/puppet/type/package.rb +4 -4
  453. data/lib/puppet/type/resources.rb +6 -6
  454. data/lib/puppet/type/schedule.rb +9 -9
  455. data/lib/puppet/type/service.rb +6 -8
  456. data/lib/puppet/type/tidy.rb +22 -24
  457. data/lib/puppet/type/user.rb +13 -13
  458. data/lib/puppet/type.rb +76 -88
  459. data/lib/puppet/util/at_fork/solaris.rb +33 -37
  460. data/lib/puppet/util/autoload.rb +2 -2
  461. data/lib/puppet/util/backups.rb +9 -9
  462. data/lib/puppet/util/character_encoding.rb +7 -6
  463. data/lib/puppet/util/checksums.rb +2 -2
  464. data/lib/puppet/util/classgen.rb +8 -8
  465. data/lib/puppet/util/colors.rb +1 -1
  466. data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
  467. data/lib/puppet/util/command_line/trollop.rb +60 -46
  468. data/lib/puppet/util/command_line.rb +2 -2
  469. data/lib/puppet/util/constant_inflector.rb +2 -2
  470. data/lib/puppet/util/diff.rb +19 -21
  471. data/lib/puppet/util/docs.rb +2 -2
  472. data/lib/puppet/util/errors.rb +9 -9
  473. data/lib/puppet/util/execution.rb +32 -9
  474. data/lib/puppet/util/feature.rb +1 -1
  475. data/lib/puppet/util/fileparsing.rb +12 -16
  476. data/lib/puppet/util/filetype.rb +36 -40
  477. data/lib/puppet/util/inifile.rb +6 -12
  478. data/lib/puppet/util/ldap/connection.rb +1 -1
  479. data/lib/puppet/util/ldap/manager.rb +10 -12
  480. data/lib/puppet/util/lockfile.rb +6 -8
  481. data/lib/puppet/util/log/destination.rb +2 -2
  482. data/lib/puppet/util/log/destinations.rb +4 -4
  483. data/lib/puppet/util/log.rb +12 -9
  484. data/lib/puppet/util/logging.rb +11 -11
  485. data/lib/puppet/util/metric.rb +3 -3
  486. data/lib/puppet/util/monkey_patches.rb +5 -7
  487. data/lib/puppet/util/network_device/config.rb +3 -3
  488. data/lib/puppet/util/package/version/debian.rb +27 -28
  489. data/lib/puppet/util/package/version/pip.rb +5 -5
  490. data/lib/puppet/util/package/version/range/eq.rb +1 -1
  491. data/lib/puppet/util/package/version/rpm.rb +1 -1
  492. data/lib/puppet/util/package.rb +2 -2
  493. data/lib/puppet/util/pidlock.rb +2 -2
  494. data/lib/puppet/util/platform.rb +1 -1
  495. data/lib/puppet/util/plist.rb +8 -10
  496. data/lib/puppet/util/posix.rb +17 -17
  497. data/lib/puppet/util/profiler/aggregate.rb +1 -1
  498. data/lib/puppet/util/provider_features.rb +3 -3
  499. data/lib/puppet/util/rdoc/code_objects.rb +3 -3
  500. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
  501. data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
  502. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
  503. data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
  504. data/lib/puppet/util/rdoc/parser.rb +1 -1
  505. data/lib/puppet/util/reference.rb +13 -9
  506. data/lib/puppet/util/retry_action.rb +1 -1
  507. data/lib/puppet/util/rpm_compare.rb +18 -19
  508. data/lib/puppet/util/rubygems.rb +1 -1
  509. data/lib/puppet/util/selinux.rb +7 -7
  510. data/lib/puppet/util/storage.rb +10 -12
  511. data/lib/puppet/util/suidmanager.rb +18 -19
  512. data/lib/puppet/util/symbolic_file_mode.rb +71 -75
  513. data/lib/puppet/util/tag_set.rb +2 -2
  514. data/lib/puppet/util/tagging.rb +8 -10
  515. data/lib/puppet/util/terminal.rb +4 -4
  516. data/lib/puppet/util/user_attr.rb +7 -7
  517. data/lib/puppet/util/watcher.rb +3 -5
  518. data/lib/puppet/util/windows/access_control_list.rb +1 -1
  519. data/lib/puppet/util/windows/adsi.rb +42 -42
  520. data/lib/puppet/util/windows/com.rb +2 -2
  521. data/lib/puppet/util/windows/daemon.rb +64 -68
  522. data/lib/puppet/util/windows/error.rb +2 -2
  523. data/lib/puppet/util/windows/file.rb +18 -25
  524. data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
  525. data/lib/puppet/util/windows/principal.rb +8 -8
  526. data/lib/puppet/util/windows/process.rb +16 -28
  527. data/lib/puppet/util/windows/registry.rb +16 -15
  528. data/lib/puppet/util/windows/root_certs.rb +2 -2
  529. data/lib/puppet/util/windows/security.rb +31 -31
  530. data/lib/puppet/util/windows/service.rb +11 -11
  531. data/lib/puppet/util/windows/sid.rb +8 -8
  532. data/lib/puppet/util/windows/user.rb +18 -20
  533. data/lib/puppet/util/yaml.rb +1 -1
  534. data/lib/puppet/util.rb +55 -46
  535. data/lib/puppet/version.rb +2 -2
  536. data/lib/puppet/x509/pem_store.rb +1 -1
  537. data/lib/puppet.rb +3 -3
  538. data/locales/puppet.pot +604 -600
  539. data/man/man5/puppet.conf.5 +10 -2
  540. data/man/man8/puppet-agent.8 +1 -1
  541. data/man/man8/puppet-apply.8 +1 -1
  542. data/man/man8/puppet-catalog.8 +1 -1
  543. data/man/man8/puppet-config.8 +1 -1
  544. data/man/man8/puppet-describe.8 +1 -1
  545. data/man/man8/puppet-device.8 +1 -1
  546. data/man/man8/puppet-doc.8 +1 -1
  547. data/man/man8/puppet-epp.8 +1 -1
  548. data/man/man8/puppet-facts.8 +1 -1
  549. data/man/man8/puppet-filebucket.8 +1 -1
  550. data/man/man8/puppet-generate.8 +1 -1
  551. data/man/man8/puppet-help.8 +1 -1
  552. data/man/man8/puppet-lookup.8 +1 -1
  553. data/man/man8/puppet-module.8 +1 -1
  554. data/man/man8/puppet-node.8 +1 -1
  555. data/man/man8/puppet-parser.8 +1 -1
  556. data/man/man8/puppet-plugin.8 +1 -1
  557. data/man/man8/puppet-report.8 +1 -1
  558. data/man/man8/puppet-resource.8 +5 -1
  559. data/man/man8/puppet-script.8 +1 -1
  560. data/man/man8/puppet-ssl.8 +1 -1
  561. data/man/man8/puppet.8 +2 -2
  562. metadata +23 -27
  563. data/examples/hiera/etc/hiera.yaml +0 -15
  564. data/examples/hiera/etc/hieradb/common.yaml +0 -3
  565. data/examples/hiera/etc/hieradb/dc1.yaml +0 -6
  566. data/examples/hiera/etc/hieradb/development.yaml +0 -2
  567. data/examples/hiera/etc/puppet.conf +0 -3
  568. data/examples/hiera/modules/data/manifests/common.pp +0 -4
  569. data/examples/hiera/modules/ntp/manifests/data.pp +0 -4
  570. data/examples/hiera/modules/ntp/templates/ntp.conf.erb +0 -3
  571. data/examples/hiera/modules/users/manifests/development.pp +0 -4
  572. data/tasks/benchmark.rake +0 -180
  573. data/tasks/cfpropertylist.rake +0 -15
  574. data/tasks/ci.rake +0 -24
  575. data/tasks/generate_ast_model.rake +0 -90
  576. data/tasks/generate_cert_fixtures.rake +0 -199
  577. data/tasks/manpages.rake +0 -67
  578. data/tasks/memwalk.rake +0 -195
  579. data/tasks/parallel.rake +0 -410
  580. data/tasks/parser.rake +0 -22
  581. data/tasks/yard.rake +0 -59
data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb CHANGED
@@ -25,7 +25,7 @@ module RDoc
25
25
  module Page
26
26
  FONTS = "Verdana,Arial,Helvetica,sans-serif"
27
27
 
28
- STYLE = %{
28
+ STYLE = %(
29
29
  /* Reset */
30
30
  html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
31
31
  :focus{outline:0;}
@@ -244,17 +244,17 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
244
244
  .ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
245
245
  .ruby-regexp { color: #ffa07a; background: transparent; }
246
246
  .ruby-value { color: #7fffd4; background: transparent; }
247
- }
247
+ )
248
248
 
249
249
  #####################################################################
250
250
  ### H E A D E R T E M P L A T E
251
251
  #####################################################################
252
252
 
253
- XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
253
+ XHTML_PREAMBLE = %(<?xml version="1.0" encoding="%charset%"?>
254
254
  <!DOCTYPE html
255
255
  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
256
256
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
257
- }
257
+ )
258
258
 
259
259
  HEADER = XHTML_PREAMBLE + %{
260
260
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -303,20 +303,20 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
303
303
  ### C O N T E X T C O N T E N T T E M P L A T E
304
304
  #####################################################################
305
305
 
306
- CONTEXT_CONTENT = %{
307
- }
306
+ CONTEXT_CONTENT = %(
307
+ )
308
308
 
309
309
  #####################################################################
310
310
  ### F O O T E R T E M P L A T E
311
311
  #####################################################################
312
- FOOTER = %{
312
+ FOOTER = %(
313
313
  <div id="validator-badges">
314
314
  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
315
315
  </div>
316
316
 
317
317
  </body>
318
318
  </html>
319
- }
319
+ )
320
320
 
321
321
  #####################################################################
322
322
  ### F I L E P A G E H E A D E R T E M P L A T E
@@ -467,7 +467,7 @@ END:infiles
467
467
  ### M E T H O D L I S T T E M P L A T E
468
468
  #####################################################################
469
469
 
470
- PLUGIN_LIST = %{
470
+ PLUGIN_LIST = %(
471
471
 
472
472
  <div id="contextContent">
473
473
  IF:description
@@ -523,7 +523,7 @@ IF:seccomment
523
523
  ENDIF:seccomment
524
524
  ENDIF:sectitle
525
525
  END:sections
526
- }
526
+ )
527
527
 
528
528
  METHOD_LIST = %{
529
529
 
@@ -844,17 +844,17 @@ END:sections
844
844
  ### B O D Y T E M P L A T E
845
845
  #####################################################################
846
846
 
847
- BODY = HEADER + %{
847
+ BODY = HEADER + %(
848
848
 
849
849
  !INCLUDE! <!-- banner header -->
850
850
 
851
851
  <div id="bodyContent">
852
- } + METHOD_LIST + %{
852
+ ) + METHOD_LIST + %(
853
853
 
854
854
  </div>
855
- } + FOOTER
855
+ ) + FOOTER
856
856
 
857
- BODYINC = HEADER + %{
857
+ BODYINC = HEADER + %(
858
858
 
859
859
  !INCLUDE! <!-- banner header -->
860
860
 
@@ -863,13 +863,13 @@ END:sections
863
863
  !INCLUDE!
864
864
 
865
865
  </div>
866
- } + FOOTER
866
+ ) + FOOTER
867
867
 
868
868
  #####################################################################
869
869
  ### S O U R C E C O D E T E M P L A T E
870
870
  #####################################################################
871
871
 
872
- SRC_PAGE = XHTML_PREAMBLE + %{
872
+ SRC_PAGE = XHTML_PREAMBLE + %(
873
873
  <html>
874
874
  <head>
875
875
  <title>%title%</title>
@@ -880,17 +880,17 @@ END:sections
880
880
  <pre>%code%</pre>
881
881
  </body>
882
882
  </html>
883
- }
883
+ )
884
884
 
885
885
  #####################################################################
886
886
  ### I N D E X F I L E T E M P L A T E S
887
887
  #####################################################################
888
888
 
889
- FR_INDEX_BODY = %{
889
+ FR_INDEX_BODY = %(
890
890
  !INCLUDE!
891
- }
891
+ )
892
892
 
893
- FILE_INDEX = XHTML_PREAMBLE + %{
893
+ FILE_INDEX = XHTML_PREAMBLE + %(
894
894
  <!--
895
895
 
896
896
  %list_title%
@@ -914,7 +914,7 @@ END:entries
914
914
  </div>
915
915
  </body>
916
916
  </html>
917
- }
917
+ )
918
918
 
919
919
  TOP_INDEX = XHTML_PREAMBLE + %{
920
920
  <!--
@@ -1038,7 +1038,7 @@ ENDIF:plugins
1038
1038
  </html>
1039
1039
  }
1040
1040
 
1041
- INDEX = %{<?xml version="1.0" encoding="%charset%"?>
1041
+ INDEX = %(<?xml version="1.0" encoding="%charset%"?>
1042
1042
  <!DOCTYPE html
1043
1043
  PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
1044
1044
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
@@ -1061,7 +1061,7 @@ ENDIF:plugins
1061
1061
  <frame src="%initial_page%" name="docwin" />
1062
1062
  </frameset>
1063
1063
  </html>
1064
- }
1064
+ )
1065
1065
  end # module Page
1066
1066
  end # class RDoc
1067
1067
 
data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb CHANGED
@@ -69,9 +69,9 @@ module RDoc::PuppetParserCore
69
69
  # find a module
70
70
  fullpath = File.expand_path(path)
71
71
  Puppet.debug "rdoc: testing #{fullpath}"
72
- if fullpath =~ /(.*)\/([^\/]+)\/(?:manifests|plugins|lib)\/.+\.(rb)$/
73
- modpath = $1
74
- name = $2
72
+ if fullpath =~ %r{(.*)/([^/]+)/(?:manifests|plugins|lib)/.+\.(rb)$}
73
+ modpath = ::Regexp.last_match(1)
74
+ name = ::Regexp.last_match(2)
75
75
  Puppet.debug "rdoc: module #{name} into #{modpath} ?"
76
76
  environment.modulepath.each do |mp|
77
77
  if File.identical?(modpath, mp)
@@ -103,10 +103,10 @@ module RDoc::PuppetParserCore
103
103
  def scan_top_level(container, environment)
104
104
  # use the module README as documentation for the module
105
105
  comment = ""
106
- %w{README README.rdoc}.each do |rfile|
106
+ %w[README README.rdoc].each do |rfile|
107
107
  readme = File.join(File.dirname(File.dirname(@input_file_name)), rfile)
108
108
  # module README should be UTF-8, not default system encoding
109
- comment = File.open(readme, "r:UTF-8") { |f| f.read } if FileTest.readable?(readme)
109
+ comment = File.open(readme, "r:UTF-8", &:read) if FileTest.readable?(readme)
110
110
  end
111
111
  look_for_directives_in(container, comment) unless comment.empty?
112
112
 
@@ -138,7 +138,7 @@ module RDoc::PuppetParserCore
138
138
  # create documentation for plugins
139
139
  def parse_plugins(container)
140
140
  Puppet.debug "rdoc: scanning plugin or fact"
141
- if @input_file_name =~ /\/facter\/[^\/]+\.rb$/
141
+ if @input_file_name =~ %r{/facter/[^/]+\.rb$}
142
142
  parse_fact(container)
143
143
  else
144
144
  parse_puppet_plugin(container)
@@ -155,16 +155,16 @@ module RDoc::PuppetParserCore
155
155
  # fetch comments
156
156
  case line
157
157
  when /^[ \t]*# ?(.*)$/
158
- comments += $1 + "\n"
158
+ comments += ::Regexp.last_match(1) + "\n"
159
159
  when /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
160
- current_fact = RDoc::Fact.new($1, {})
160
+ current_fact = RDoc::Fact.new(::Regexp.last_match(1), {})
161
161
  look_for_directives_in(container, comments) unless comments.empty?
162
162
  current_fact.comment = comments
163
163
  parsed_facts << current_fact
164
164
  comments = ""
165
165
  Puppet.debug "rdoc: found custom fact #{current_fact.name}"
166
166
  when /^[ \t]*confine[ \t]*:(.*?)[ \t]*=>[ \t]*(.*)$/
167
- current_fact.confine = { :type => $1, :value => $2 } unless current_fact.nil?
167
+ current_fact.confine = { :type => ::Regexp.last_match(1), :value => ::Regexp.last_match(2) } unless current_fact.nil?
168
168
  else # unknown line type
169
169
  comments = ""
170
170
  end
@@ -187,9 +187,9 @@ module RDoc::PuppetParserCore
187
187
  # fetch comments
188
188
  case line
189
189
  when /^[ \t]*# ?(.*)$/
190
- comments += $1 + "\n"
190
+ comments += ::Regexp.last_match(1) + "\n"
191
191
  when /^[ \t]*(?:Puppet::Parser::Functions::)?newfunction[ \t]*\([ \t]*:(.*?)[ \t]*,[ \t]*:type[ \t]*=>[ \t]*(:rvalue|:lvalue)/
192
- current_plugin = RDoc::Plugin.new($1, "function")
192
+ current_plugin = RDoc::Plugin.new(::Regexp.last_match(1), "function")
193
193
  look_for_directives_in(container, comments) unless comments.empty?
194
194
  current_plugin.comment = comments
195
195
  current_plugin.record_location(@top_level)
@@ -197,7 +197,7 @@ module RDoc::PuppetParserCore
197
197
  comments = ""
198
198
  Puppet.debug "rdoc: found new function plugins #{current_plugin.name}"
199
199
  when /^[ \t]*Puppet::Type.newtype[ \t]*\([ \t]*:(.*?)\)/
200
- current_plugin = RDoc::Plugin.new($1, "type")
200
+ current_plugin = RDoc::Plugin.new(::Regexp.last_match(1), "type")
201
201
  look_for_directives_in(container, comments) unless comments.empty?
202
202
  current_plugin.comment = comments
203
203
  current_plugin.record_location(@top_level)
data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative '../../../../puppet/util/rdoc/parser/puppet_parser_core.rb'
3
+ require_relative '../../../../puppet/util/rdoc/parser/puppet_parser_core'
4
4
 
5
5
  module RDoc
6
6
  PUPPET_RDOC_VERSION = 2
data/lib/puppet/util/rdoc/parser.rb CHANGED
@@ -11,4 +11,4 @@ require_relative '../../../puppet/util/rdoc/code_objects'
11
11
  require 'rdoc/token_stream'
12
12
  require 'rdoc/markup/pre_process'
13
13
  require 'rdoc/parser'
14
- require_relative 'parser/puppet_parser_rdoc2.rb'
14
+ require_relative 'parser/puppet_parser_rdoc2'
data/lib/puppet/util/reference.rb CHANGED
@@ -13,11 +13,11 @@ class Puppet::Util::Reference
13
13
  instance_load(:reference, 'puppet/reference')
14
14
 
15
15
  def self.modes
16
- %w{pdf text}
16
+ %w[pdf text]
17
17
  end
18
18
 
19
19
  def self.newreference(name, options = {}, &block)
20
- ref = self.new(name, **options, &block)
20
+ ref = new(name, **options, &block)
21
21
  instance_hash(:reference)[name.intern] = ref
22
22
 
23
23
  ref
@@ -37,13 +37,17 @@ class Puppet::Util::Reference
37
37
  rst2latex = which('rst2latex') || which('rst2latex.py') ||
38
38
  raise(_("Could not find rst2latex"))
39
39
 
40
- cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
40
+ cmd = %(#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex)
41
41
  Puppet::Util.replace_file("/tmp/puppetdoc.txt") { |f| f.puts text }
42
42
  # There used to be an attempt to use secure_open / replace_file to secure
43
43
  # the target, too, but that did nothing: the race was still here. We can
44
44
  # get exactly the same benefit from running this effort:
45
- Puppet::FileSystem.unlink('/tmp/puppetdoc.tex') rescue nil
46
- output = %x{#{cmd}}
45
+ begin
46
+ Puppet::FileSystem.unlink('/tmp/puppetdoc.tex')
47
+ rescue
48
+ nil
49
+ end
50
+ output = %x(#{cmd})
47
51
  unless $CHILD_STATUS == 0
48
52
  $stderr.puts _("rst2latex failed")
49
53
  $stderr.puts output
@@ -53,7 +57,7 @@ class Puppet::Util::Reference
53
57
 
54
58
  # Now convert to pdf
55
59
  Dir.chdir("/tmp") do
56
- %x{texi2pdf puppetdoc.tex >/dev/null 2>/dev/null}
60
+ %x(texi2pdf puppetdoc.tex >/dev/null 2>/dev/null)
57
61
  end
58
62
  end
59
63
 
@@ -67,14 +71,14 @@ class Puppet::Util::Reference
67
71
 
68
72
  def doc
69
73
  if defined?(@doc)
70
- return "#{@name} - #{@doc}"
74
+ "#{@name} - #{@doc}"
71
75
  else
72
- return @title
76
+ @title
73
77
  end
74
78
  end
75
79
 
76
80
  def dynamic?
77
- self.dynamic
81
+ dynamic
78
82
  end
79
83
 
80
84
  def initialize(name, title: nil, depth: nil, dynamic: nil, doc: nil, &block)
data/lib/puppet/util/retry_action.rb CHANGED
@@ -15,7 +15,7 @@ module Puppet::Util::RetryAction
15
15
  def self.retry_action(options = {})
16
16
  # Retry actions for a specified amount of time. This method will allow the final
17
17
  # retry to complete even if that extends beyond the timeout period.
18
- if !block_given?
18
+ unless block_given?
19
19
  raise RetryException::NoBlockGiven
20
20
  end
21
21
 
data/lib/puppet/util/rpm_compare.rb CHANGED
@@ -1,12 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'English'
3
4
  module Puppet::Util::RpmCompare
4
- ARCH_LIST = %w(
5
+ ARCH_LIST = %w[
5
6
  noarch i386 i686 ppc ppc64 armv3l armv4b armv4l armv4tl armv5tel
6
7
  armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
7
- ).freeze
8
+ ].freeze
8
9
 
9
- ARCH_REGEX = Regexp.new(ARCH_LIST.join('|\.'))
10
+ ARCH_REGEX = Regexp.new(ARCH_LIST.map { |arch| "\\.#{arch}" }.join('|'))
10
11
 
11
12
  # This is an attempt at implementing RPM's
12
13
  # lib/rpmvercmp.c rpmvercmp(a, b) in Ruby.
@@ -52,14 +53,14 @@ module Puppet::Util::RpmCompare
52
53
  # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
53
54
  if str1 =~ /^[0-9]+/
54
55
  if str1 =~ /^[0-9]+/
55
- segment1 = $~.to_s
56
- str1 = $~.post_match
56
+ segment1 = $LAST_MATCH_INFO.to_s
57
+ str1 = $LAST_MATCH_INFO.post_match
57
58
  else
58
59
  segment1 = ''
59
60
  end
60
61
  if str2 =~ /^[0-9]+/
61
- segment2 = $~.to_s
62
- str2 = $~.post_match
62
+ segment2 = $LAST_MATCH_INFO.to_s
63
+ str2 = $LAST_MATCH_INFO.post_match
63
64
  else
64
65
  segment2 = ''
65
66
  end
@@ -67,14 +68,14 @@ module Puppet::Util::RpmCompare
67
68
  # else grab the chunk of continuous alphas from each string (which may be '')
68
69
  else
69
70
  if str1 =~ /^[A-Za-z]+/
70
- segment1 = $~.to_s
71
- str1 = $~.post_match
71
+ segment1 = $LAST_MATCH_INFO.to_s
72
+ str1 = $LAST_MATCH_INFO.post_match
72
73
  else
73
74
  segment1 = ''
74
75
  end
75
76
  if str2 =~ /^[A-Za-z]+/
76
- segment2 = $~.to_s
77
- str2 = $~.post_match
77
+ segment2 = $LAST_MATCH_INFO.to_s
78
+ str2 = $LAST_MATCH_INFO.post_match
78
79
  else
79
80
  segment2 = ''
80
81
  end
@@ -141,7 +142,7 @@ module Puppet::Util::RpmCompare
141
142
  version = full_version
142
143
  release = nil
143
144
  end
144
- return { :epoch => epoch, :version => version, :release => release, :arch => architecture }
145
+ { :epoch => epoch, :version => version, :release => release, :arch => architecture }
145
146
  end
146
147
 
147
148
  # this method is a native implementation of the
@@ -149,10 +150,10 @@ module Puppet::Util::RpmCompare
149
150
  # found in python/header-py.c, as used by rpm.
150
151
  def compare_values(s1, s2)
151
152
  return 0 if s1.nil? && s2.nil?
152
- return 1 if (not s1.nil?) && s2.nil?
153
- return -1 if s1.nil? && (not s2.nil?)
153
+ return 1 if !s1.nil? && s2.nil?
154
+ return -1 if s1.nil? && !s2.nil?
154
155
 
155
- return rpmvercmp(s1, s2)
156
+ rpmvercmp(s1, s2)
156
157
  end
157
158
 
158
159
  # how rpm compares two package versions:
@@ -173,7 +174,7 @@ module Puppet::Util::RpmCompare
173
174
  should_hash = rpm_parse_evr(should)
174
175
  is_hash = rpm_parse_evr(is)
175
176
 
176
- if !should_hash[:epoch].nil?
177
+ unless should_hash[:epoch].nil?
177
178
  rc = compare_values(should_hash[:epoch], is_hash[:epoch])
178
179
  return rc unless rc == 0
179
180
  end
@@ -190,8 +191,6 @@ module Puppet::Util::RpmCompare
190
191
  # This should NOT be triggered if we're trying to ensure latest.
191
192
  return 0 if should_hash[:release].nil?
192
193
 
193
- rc = compare_values(should_hash[:release], is_hash[:release])
194
-
195
- return rc
194
+ compare_values(should_hash[:release], is_hash[:release])
196
195
  end
197
196
  end
data/lib/puppet/util/rubygems.rb CHANGED
@@ -16,7 +16,7 @@ module Puppet::Util::RubyGems
16
16
  # rubygems installs. So when Bundler is around we have to act
17
17
  # as though rubygems is not, e.g. we shouldn't be able to load
18
18
  # a gem that Bundler doesn't want us to see.
19
- defined? ::Gem and not defined? ::Bundler
19
+ defined? ::Gem and !defined? ::Bundler
20
20
  end
21
21
 
22
22
  # @api private
data/lib/puppet/util/selinux.rb CHANGED
@@ -14,9 +14,9 @@ Puppet.features.selinux? # check, but continue even if it's not
14
14
  require 'pathname'
15
15
 
16
16
  module Puppet::Util::SELinux
17
- S_IFREG = 0100000
18
- S_IFDIR = 0040000
19
- S_IFLNK = 0120000
17
+ S_IFREG = 0o100000
18
+ S_IFDIR = 0o040000
19
+ S_IFLNK = 0o120000
20
20
 
21
21
  def self.selinux_support?
22
22
  return false unless defined?(Selinux)
@@ -142,10 +142,10 @@ module Puppet::Util::SELinux
142
142
 
143
143
  retval = Selinux.lsetfilecon(file, context)
144
144
  if retval == 0
145
- return true
145
+ true
146
146
  else
147
147
  Puppet.warning _("Failed to set SELinux context %{context} on %{file}") % { context: context, file: file }
148
- return false
148
+ false
149
149
  end
150
150
  end
151
151
 
@@ -215,7 +215,7 @@ module Puppet::Util::SELinux
215
215
  fstype = find_fs(file)
216
216
  return false if fstype.nil?
217
217
 
218
- filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs', 'tmpfs', 'zfs']
218
+ filesystems = %w[ext2 ext3 ext4 gfs gfs2 xfs jfs btrfs tmpfs zfs]
219
219
  filesystems.include?(fstype)
220
220
  end
221
221
 
@@ -294,7 +294,7 @@ module Puppet::Util::SELinux
294
294
  end
295
295
 
296
296
  # Should never be reached...
297
- return mounts['/']
297
+ mounts['/']
298
298
  end
299
299
 
300
300
  ##
data/lib/puppet/util/storage.rb CHANGED
@@ -40,14 +40,14 @@ class Puppet::Util::Storage
40
40
  @@state = {}
41
41
  end
42
42
 
43
- self.init
43
+ init
44
44
 
45
45
  def self.load
46
46
  Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir])
47
47
  filename = Puppet[:statefile]
48
48
 
49
49
  unless Puppet::FileSystem.exist?(filename)
50
- self.init if @@state.nil?
50
+ init if @@state.nil?
51
51
  return
52
52
  end
53
53
  unless File.file?(filename)
@@ -55,22 +55,20 @@ class Puppet::Util::Storage
55
55
  return
56
56
  end
57
57
  Puppet::Util.benchmark(:debug, "Loaded state in %{seconds} seconds") do
58
+ @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
59
+ rescue Puppet::Util::Yaml::YamlLoadError => detail
60
+ Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
61
+
58
62
  begin
59
- @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
60
- rescue Puppet::Util::Yaml::YamlLoadError => detail
61
- Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
62
-
63
- begin
64
- File.rename(filename, filename + ".bad")
65
- rescue
66
- raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
67
- end
63
+ File.rename(filename, filename + ".bad")
64
+ rescue
65
+ raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
68
66
  end
69
67
  end
70
68
 
71
69
  unless @@state.is_a?(Hash)
72
70
  Puppet.err _("State got corrupted")
73
- self.init
71
+ init
74
72
  end
75
73
  end
76
74
 
data/lib/puppet/util/suidmanager.rb CHANGED
@@ -25,23 +25,21 @@ module Puppet::Util::SUIDManager
25
25
  module_function :osx_maj_ver
26
26
 
27
27
  def groups=(grouplist)
28
- begin
29
- Process.groups = grouplist
30
- rescue Errno::EINVAL => e
31
- # We catch Errno::EINVAL as some operating systems (OS X in particular) can
32
- # cause troubles when using Process#groups= to change *this* user / process
33
- # list of supplementary groups membership. This is done via Ruby's function
34
- # "static VALUE proc_setgroups(VALUE obj, VALUE ary)" which is effectively
35
- # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
36
- # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
37
- #
38
- # This does not appear to be a problem with Ruby but rather an issue on the
39
- # operating system side. Therefore we catch the exception and look whether
40
- # we run under OS X or not -- if so, then we acknowledge the problem and
41
- # re-throw the exception otherwise.
42
- if !osx_maj_ver || osx_maj_ver.empty?
43
- raise e
44
- end
28
+ Process.groups = grouplist
29
+ rescue Errno::EINVAL => e
30
+ # We catch Errno::EINVAL as some operating systems (OS X in particular) can
31
+ # cause troubles when using Process#groups= to change *this* user / process
32
+ # list of supplementary groups membership. This is done via Ruby's function
33
+ # "static VALUE proc_setgroups(VALUE obj, VALUE ary)" which is effectively
34
+ # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
35
+ # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
36
+ #
37
+ # This does not appear to be a problem with Ruby but rather an issue on the
38
+ # operating system side. Therefore we catch the exception and look whether
39
+ # we run under OS X or not -- if so, then we acknowledge the problem and
40
+ # re-throw the exception otherwise.
41
+ if !osx_maj_ver || osx_maj_ver.empty?
42
+ raise e
45
43
  end
46
44
  end
47
45
  module_function :groups=
@@ -67,7 +65,8 @@ module Puppet::Util::SUIDManager
67
65
  return yield unless root?
68
66
  return yield unless new_uid or new_gid
69
67
 
70
- old_euid, old_egid = self.euid, self.egid
68
+ old_euid = euid
69
+ old_egid = egid
71
70
  begin
72
71
  change_privileges(new_uid, new_gid, false)
73
72
 
@@ -147,7 +146,7 @@ module Puppet::Util::SUIDManager
147
146
  raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
148
147
 
149
148
  ret = Puppet::Util.send(type, id)
150
- if ret == nil
149
+ if ret.nil?
151
150
  raise Puppet::Error, _("Invalid %{klass}: %{id}") % { klass: map[type], id: id }
152
151
  end
153
152