puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (543) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +29 -26
  3. data/ext/windows/service/daemon.rb +49 -55
  4. data/lib/hiera/scope.rb +3 -3
  5. data/lib/hiera_puppet.rb +1 -1
  6. data/lib/puppet/agent/disabler.rb +1 -1
  7. data/lib/puppet/application/agent.rb +2 -2
  8. data/lib/puppet/application/apply.rb +2 -2
  9. data/lib/puppet/application/describe.rb +6 -6
  10. data/lib/puppet/application/device.rb +99 -100
  11. data/lib/puppet/application/doc.rb +1 -1
  12. data/lib/puppet/application/face_base.rb +7 -7
  13. data/lib/puppet/application/filebucket.rb +1 -1
  14. data/lib/puppet/application/lookup.rb +5 -5
  15. data/lib/puppet/application/resource.rb +10 -3
  16. data/lib/puppet/application/ssl.rb +3 -3
  17. data/lib/puppet/application.rb +16 -18
  18. data/lib/puppet/coercion.rb +1 -1
  19. data/lib/puppet/configurer/downloader.rb +9 -4
  20. data/lib/puppet/configurer/fact_handler.rb +12 -13
  21. data/lib/puppet/configurer.rb +16 -18
  22. data/lib/puppet/confine/feature.rb +1 -1
  23. data/lib/puppet/confine/variable.rb +1 -1
  24. data/lib/puppet/confine.rb +2 -2
  25. data/lib/puppet/confine_collection.rb +1 -1
  26. data/lib/puppet/confiner.rb +2 -2
  27. data/lib/puppet/daemon.rb +3 -3
  28. data/lib/puppet/datatypes.rb +5 -6
  29. data/lib/puppet/defaults.rb +14 -8
  30. data/lib/puppet/environments.rb +3 -7
  31. data/lib/puppet/error.rb +3 -3
  32. data/lib/puppet/external/dot.rb +42 -34
  33. data/lib/puppet/face/catalog/select.rb +1 -1
  34. data/lib/puppet/face/epp.rb +7 -9
  35. data/lib/puppet/face/help.rb +12 -12
  36. data/lib/puppet/face/module/changes.rb +1 -3
  37. data/lib/puppet/face/module/list.rb +37 -37
  38. data/lib/puppet/face/node/clean.rb +1 -1
  39. data/lib/puppet/face/parser.rb +6 -8
  40. data/lib/puppet/face/report.rb +5 -7
  41. data/lib/puppet/facter_impl.rb +1 -1
  42. data/lib/puppet/feature/base.rb +9 -11
  43. data/lib/puppet/feature/pe_license.rb +1 -1
  44. data/lib/puppet/feature/ssh.rb +1 -1
  45. data/lib/puppet/feature/telnet.rb +3 -5
  46. data/lib/puppet/feature/zlib.rb +1 -1
  47. data/lib/puppet/ffi/windows/constants.rb +1 -1
  48. data/lib/puppet/ffi/windows/functions.rb +2 -2
  49. data/lib/puppet/ffi/windows/structs.rb +3 -3
  50. data/lib/puppet/file_bucket/dipper.rb +4 -4
  51. data/lib/puppet/file_bucket/file.rb +4 -4
  52. data/lib/puppet/file_serving/base.rb +5 -5
  53. data/lib/puppet/file_serving/configuration/parser.rb +9 -9
  54. data/lib/puppet/file_serving/configuration.rb +3 -3
  55. data/lib/puppet/file_serving/fileset.rb +13 -13
  56. data/lib/puppet/file_serving/http_metadata.rb +1 -1
  57. data/lib/puppet/file_serving/metadata.rb +13 -9
  58. data/lib/puppet/file_serving/mount/file.rb +6 -6
  59. data/lib/puppet/file_serving/mount/locales.rb +2 -4
  60. data/lib/puppet/file_serving/mount/pluginfacts.rb +2 -4
  61. data/lib/puppet/file_serving/mount/plugins.rb +2 -4
  62. data/lib/puppet/file_serving/mount.rb +1 -1
  63. data/lib/puppet/file_system/file_impl.rb +3 -3
  64. data/lib/puppet/file_system/memory_impl.rb +1 -1
  65. data/lib/puppet/file_system/path_pattern.rb +1 -1
  66. data/lib/puppet/file_system/uniquefile.rb +17 -16
  67. data/lib/puppet/file_system/windows.rb +26 -18
  68. data/lib/puppet/forge/cache.rb +2 -2
  69. data/lib/puppet/forge/errors.rb +1 -1
  70. data/lib/puppet/forge/repository.rb +2 -2
  71. data/lib/puppet/forge.rb +13 -19
  72. data/lib/puppet/functions/abs.rb +2 -2
  73. data/lib/puppet/functions/camelcase.rb +1 -1
  74. data/lib/puppet/functions/compare.rb +2 -2
  75. data/lib/puppet/functions/contain.rb +1 -1
  76. data/lib/puppet/functions/defined.rb +2 -2
  77. data/lib/puppet/functions/dig.rb +1 -1
  78. data/lib/puppet/functions/eyaml_lookup_key.rb +11 -13
  79. data/lib/puppet/functions/get.rb +1 -1
  80. data/lib/puppet/functions/hocon_data.rb +3 -5
  81. data/lib/puppet/functions/import.rb +1 -1
  82. data/lib/puppet/functions/json_data.rb +4 -6
  83. data/lib/puppet/functions/max.rb +2 -2
  84. data/lib/puppet/functions/min.rb +2 -2
  85. data/lib/puppet/functions/new.rb +1 -1
  86. data/lib/puppet/functions/reduce.rb +6 -10
  87. data/lib/puppet/functions/regsubst.rb +2 -2
  88. data/lib/puppet/functions/require.rb +1 -1
  89. data/lib/puppet/functions/yaml_data.rb +11 -13
  90. data/lib/puppet/functions.rb +32 -37
  91. data/lib/puppet/generate/type.rb +2 -2
  92. data/lib/puppet/gettext/config.rb +9 -9
  93. data/lib/puppet/graph/rb_tree_map.rb +31 -23
  94. data/lib/puppet/graph/relationship_graph.rb +12 -12
  95. data/lib/puppet/graph/simple_graph.rb +8 -10
  96. data/lib/puppet/http/client.rb +1 -1
  97. data/lib/puppet/http/dns.rb +4 -4
  98. data/lib/puppet/http/external_client.rb +1 -1
  99. data/lib/puppet/http/factory.rb +1 -1
  100. data/lib/puppet/http/proxy.rb +15 -15
  101. data/lib/puppet/http/redirector.rb +6 -2
  102. data/lib/puppet/http/resolver.rb +2 -2
  103. data/lib/puppet/http/retry_after_handler.rb +2 -2
  104. data/lib/puppet/http/service/ca.rb +1 -1
  105. data/lib/puppet/http/service/compiler.rb +4 -4
  106. data/lib/puppet/http/service/file_server.rb +1 -1
  107. data/lib/puppet/http/service/report.rb +2 -2
  108. data/lib/puppet/http/service.rb +9 -13
  109. data/lib/puppet/http/session.rb +1 -1
  110. data/lib/puppet/http/site.rb +1 -1
  111. data/lib/puppet/indirector/catalog/compiler.rb +44 -45
  112. data/lib/puppet/indirector/catalog/rest.rb +7 -5
  113. data/lib/puppet/indirector/catalog/store_configs.rb +1 -1
  114. data/lib/puppet/indirector/exec.rb +2 -2
  115. data/lib/puppet/indirector/face.rb +7 -9
  116. data/lib/puppet/indirector/fact_search.rb +1 -1
  117. data/lib/puppet/indirector/facts/facter.rb +6 -6
  118. data/lib/puppet/indirector/facts/json.rb +1 -1
  119. data/lib/puppet/indirector/facts/store_configs.rb +1 -1
  120. data/lib/puppet/indirector/file_bucket_file/file.rb +17 -17
  121. data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -3
  122. data/lib/puppet/indirector/file_content/rest.rb +1 -1
  123. data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
  124. data/lib/puppet/indirector/hiera.rb +1 -1
  125. data/lib/puppet/indirector/indirection.rb +27 -29
  126. data/lib/puppet/indirector/json.rb +4 -4
  127. data/lib/puppet/indirector/memory.rb +2 -2
  128. data/lib/puppet/indirector/msgpack.rb +5 -5
  129. data/lib/puppet/indirector/node/store_configs.rb +1 -1
  130. data/lib/puppet/indirector/none.rb +1 -1
  131. data/lib/puppet/indirector/report/json.rb +1 -1
  132. data/lib/puppet/indirector/report/yaml.rb +1 -1
  133. data/lib/puppet/indirector/request.rb +4 -4
  134. data/lib/puppet/indirector/resource/ral.rb +2 -4
  135. data/lib/puppet/indirector/resource/store_configs.rb +1 -1
  136. data/lib/puppet/indirector/terminus.rb +4 -4
  137. data/lib/puppet/indirector/yaml.rb +3 -3
  138. data/lib/puppet/info_service/class_information_service.rb +5 -8
  139. data/lib/puppet/info_service/task_information_service.rb +6 -7
  140. data/lib/puppet/interface/action.rb +5 -5
  141. data/lib/puppet/interface/action_manager.rb +5 -5
  142. data/lib/puppet/interface/documentation.rb +5 -5
  143. data/lib/puppet/interface/face_collection.rb +7 -7
  144. data/lib/puppet/interface/option.rb +2 -2
  145. data/lib/puppet/interface/option_manager.rb +6 -6
  146. data/lib/puppet/interface.rb +4 -4
  147. data/lib/puppet/metatype/manager.rb +2 -2
  148. data/lib/puppet/module/plan.rb +10 -10
  149. data/lib/puppet/module/task.rb +8 -8
  150. data/lib/puppet/module.rb +39 -41
  151. data/lib/puppet/module_tool/applications/application.rb +10 -8
  152. data/lib/puppet/module_tool/applications/installer.rb +53 -50
  153. data/lib/puppet/module_tool/applications/unpacker.rb +6 -8
  154. data/lib/puppet/module_tool/applications/upgrader.rb +37 -34
  155. data/lib/puppet/module_tool/checksums.rb +2 -2
  156. data/lib/puppet/module_tool/dependency.rb +1 -1
  157. data/lib/puppet/module_tool/errors/base.rb +1 -1
  158. data/lib/puppet/module_tool/install_directory.rb +1 -1
  159. data/lib/puppet/module_tool/local_tarball.rb +3 -5
  160. data/lib/puppet/module_tool/metadata.rb +12 -8
  161. data/lib/puppet/module_tool/shared_behaviors.rb +27 -12
  162. data/lib/puppet/module_tool/tar/mini.rb +3 -3
  163. data/lib/puppet/module_tool.rb +4 -4
  164. data/lib/puppet/network/client_request.rb +5 -3
  165. data/lib/puppet/network/format.rb +2 -2
  166. data/lib/puppet/network/format_support.rb +1 -1
  167. data/lib/puppet/network/formats.rb +1 -1
  168. data/lib/puppet/network/http/api/indirected_routes.rb +24 -44
  169. data/lib/puppet/network/http/api/server/v3.rb +1 -1
  170. data/lib/puppet/network/http/connection.rb +1 -1
  171. data/lib/puppet/network/http/handler.rb +8 -12
  172. data/lib/puppet/network/http/request.rb +1 -1
  173. data/lib/puppet/network/http/route.rb +9 -9
  174. data/lib/puppet/node/environment.rb +21 -23
  175. data/lib/puppet/node/facts.rb +1 -1
  176. data/lib/puppet/node.rb +5 -5
  177. data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
  178. data/lib/puppet/pal/pal_impl.rb +48 -50
  179. data/lib/puppet/pal/plan_signature.rb +1 -1
  180. data/lib/puppet/pal/task_signature.rb +1 -1
  181. data/lib/puppet/parameter/package_options.rb +1 -1
  182. data/lib/puppet/parameter/value.rb +2 -2
  183. data/lib/puppet/parameter/value_collection.rb +7 -7
  184. data/lib/puppet/parameter.rb +8 -9
  185. data/lib/puppet/parser/ast/block_expression.rb +2 -2
  186. data/lib/puppet/parser/ast/hostclass.rb +1 -1
  187. data/lib/puppet/parser/ast/pops_bridge.rb +3 -4
  188. data/lib/puppet/parser/ast/resource.rb +4 -4
  189. data/lib/puppet/parser/ast/resourceparam.rb +4 -4
  190. data/lib/puppet/parser/ast.rb +14 -15
  191. data/lib/puppet/parser/compiler.rb +26 -28
  192. data/lib/puppet/parser/functions/create_resources.rb +3 -3
  193. data/lib/puppet/parser/functions/fail.rb +1 -1
  194. data/lib/puppet/parser/functions/generate.rb +2 -2
  195. data/lib/puppet/parser/functions/tag.rb +1 -1
  196. data/lib/puppet/parser/functions.rb +2 -2
  197. data/lib/puppet/parser/relationship.rb +3 -1
  198. data/lib/puppet/parser/resource/param.rb +2 -2
  199. data/lib/puppet/parser/resource.rb +23 -23
  200. data/lib/puppet/parser/scope.rb +10 -10
  201. data/lib/puppet/parser/script_compiler.rb +1 -1
  202. data/lib/puppet/parser/templatewrapper.rb +1 -1
  203. data/lib/puppet/parser/type_loader.rb +10 -12
  204. data/lib/puppet/parser.rb +1 -1
  205. data/lib/puppet/pops/adaptable.rb +1 -1
  206. data/lib/puppet/pops/evaluator/access_operator.rb +8 -8
  207. data/lib/puppet/pops/evaluator/callable_signature.rb +4 -4
  208. data/lib/puppet/pops/evaluator/collector_transformer.rb +4 -4
  209. data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +7 -7
  210. data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +6 -6
  211. data/lib/puppet/pops/evaluator/compare_operator.rb +10 -10
  212. data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
  213. data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
  214. data/lib/puppet/pops/evaluator/evaluator_impl.rb +56 -60
  215. data/lib/puppet/pops/evaluator/literal_evaluator.rb +4 -0
  216. data/lib/puppet/pops/evaluator/relationship_operator.rb +2 -2
  217. data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
  218. data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
  219. data/lib/puppet/pops/functions/dispatcher.rb +3 -3
  220. data/lib/puppet/pops/functions/function.rb +14 -16
  221. data/lib/puppet/pops/issue_reporter.rb +2 -2
  222. data/lib/puppet/pops/label_provider.rb +2 -2
  223. data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
  224. data/lib/puppet/pops/loader/loader.rb +4 -4
  225. data/lib/puppet/pops/loader/loader_paths.rb +3 -3
  226. data/lib/puppet/pops/loader/module_loaders.rb +11 -11
  227. data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
  228. data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
  229. data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
  230. data/lib/puppet/pops/loader/static_loader.rb +3 -3
  231. data/lib/puppet/pops/loaders.rb +3 -3
  232. data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
  233. data/lib/puppet/pops/lookup/explainer.rb +2 -2
  234. data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
  235. data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
  236. data/lib/puppet/pops/lookup/interpolation.rb +3 -3
  237. data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
  238. data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
  239. data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
  240. data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
  241. data/lib/puppet/pops/merge_strategy.rb +6 -6
  242. data/lib/puppet/pops/migration/migration_checker.rb +1 -1
  243. data/lib/puppet/pops/model/ast_transformer.rb +9 -11
  244. data/lib/puppet/pops/model/factory.rb +4 -5
  245. data/lib/puppet/pops/parser/epp_parser.rb +2 -2
  246. data/lib/puppet/pops/parser/epp_support.rb +1 -1
  247. data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
  248. data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
  249. data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
  250. data/lib/puppet/pops/parser/lexer2.rb +20 -12
  251. data/lib/puppet/pops/parser/lexer_support.rb +1 -1
  252. data/lib/puppet/pops/parser/locator.rb +4 -4
  253. data/lib/puppet/pops/parser/parser_support.rb +12 -14
  254. data/lib/puppet/pops/parser/pn_parser.rb +3 -3
  255. data/lib/puppet/pops/parser/slurp_support.rb +8 -8
  256. data/lib/puppet/pops/patterns.rb +12 -12
  257. data/lib/puppet/pops/pcore.rb +1 -1
  258. data/lib/puppet/pops/pn.rb +2 -2
  259. data/lib/puppet/pops/puppet_stack.rb +1 -1
  260. data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
  261. data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
  262. data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
  263. data/lib/puppet/pops/time/timestamp.rb +1 -1
  264. data/lib/puppet/pops/types/class_loader.rb +4 -6
  265. data/lib/puppet/pops/types/iterable.rb +1 -1
  266. data/lib/puppet/pops/types/p_binary_type.rb +1 -1
  267. data/lib/puppet/pops/types/p_init_type.rb +1 -1
  268. data/lib/puppet/pops/types/p_object_type.rb +5 -5
  269. data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
  270. data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
  271. data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
  272. data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
  273. data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
  274. data/lib/puppet/pops/types/p_uri_type.rb +4 -4
  275. data/lib/puppet/pops/types/recursion_guard.rb +4 -4
  276. data/lib/puppet/pops/types/ruby_generator.rb +2 -2
  277. data/lib/puppet/pops/types/string_converter.rb +12 -8
  278. data/lib/puppet/pops/types/tree_iterators.rb +4 -6
  279. data/lib/puppet/pops/types/type_calculator.rb +10 -10
  280. data/lib/puppet/pops/types/type_factory.rb +7 -3
  281. data/lib/puppet/pops/types/type_formatter.rb +22 -24
  282. data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
  283. data/lib/puppet/pops/types/types.rb +28 -24
  284. data/lib/puppet/pops/utils.rb +38 -42
  285. data/lib/puppet/pops/validation/checker4_0.rb +10 -10
  286. data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
  287. data/lib/puppet/pops/validation/validator_factory_4_0.rb +2 -0
  288. data/lib/puppet/pops/validation.rb +4 -4
  289. data/lib/puppet/pops/visitor.rb +2 -2
  290. data/lib/puppet/property/ensure.rb +12 -14
  291. data/lib/puppet/property/keyvalue.rb +4 -4
  292. data/lib/puppet/property/list.rb +4 -4
  293. data/lib/puppet/property/ordered_list.rb +1 -1
  294. data/lib/puppet/property.rb +31 -33
  295. data/lib/puppet/provider/exec.rb +2 -2
  296. data/lib/puppet/provider/file/posix.rb +19 -17
  297. data/lib/puppet/provider/file/windows.rb +13 -19
  298. data/lib/puppet/provider/group/directoryservice.rb +3 -2
  299. data/lib/puppet/provider/group/groupadd.rb +4 -4
  300. data/lib/puppet/provider/group/windows_adsi.rb +2 -2
  301. data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
  302. data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
  303. data/lib/puppet/provider/nameservice/pw.rb +1 -2
  304. data/lib/puppet/provider/nameservice.rb +8 -8
  305. data/lib/puppet/provider/package/aix.rb +19 -19
  306. data/lib/puppet/provider/package/appdmg.rb +2 -2
  307. data/lib/puppet/provider/package/apple.rb +1 -1
  308. data/lib/puppet/provider/package/apt.rb +18 -18
  309. data/lib/puppet/provider/package/aptitude.rb +1 -3
  310. data/lib/puppet/provider/package/aptrpm.rb +9 -9
  311. data/lib/puppet/provider/package/blastwave.rb +10 -14
  312. data/lib/puppet/provider/package/dnfmodule.rb +3 -3
  313. data/lib/puppet/provider/package/dpkg.rb +11 -13
  314. data/lib/puppet/provider/package/fink.rb +14 -14
  315. data/lib/puppet/provider/package/freebsd.rb +1 -1
  316. data/lib/puppet/provider/package/gem.rb +12 -14
  317. data/lib/puppet/provider/package/macports.rb +2 -2
  318. data/lib/puppet/provider/package/nim.rb +10 -10
  319. data/lib/puppet/provider/package/openbsd.rb +22 -22
  320. data/lib/puppet/provider/package/opkg.rb +6 -6
  321. data/lib/puppet/provider/package/pacman.rb +35 -29
  322. data/lib/puppet/provider/package/pip.rb +25 -24
  323. data/lib/puppet/provider/package/pkg.rb +15 -15
  324. data/lib/puppet/provider/package/pkgdmg.rb +10 -10
  325. data/lib/puppet/provider/package/pkgin.rb +2 -2
  326. data/lib/puppet/provider/package/pkgng.rb +5 -5
  327. data/lib/puppet/provider/package/pkgutil.rb +17 -21
  328. data/lib/puppet/provider/package/portage.rb +59 -61
  329. data/lib/puppet/provider/package/ports.rb +12 -11
  330. data/lib/puppet/provider/package/portupgrade.rb +35 -35
  331. data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
  332. data/lib/puppet/provider/package/rpm.rb +26 -26
  333. data/lib/puppet/provider/package/rug.rb +7 -9
  334. data/lib/puppet/provider/package/sun.rb +4 -4
  335. data/lib/puppet/provider/package/up2date.rb +5 -7
  336. data/lib/puppet/provider/package/urpmi.rb +6 -6
  337. data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
  338. data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
  339. data/lib/puppet/provider/package/windows/package.rb +2 -2
  340. data/lib/puppet/provider/package/windows.rb +3 -5
  341. data/lib/puppet/provider/package/yum.rb +33 -37
  342. data/lib/puppet/provider/package/zypper.rb +12 -14
  343. data/lib/puppet/provider/package.rb +1 -1
  344. data/lib/puppet/provider/package_targetable.rb +1 -1
  345. data/lib/puppet/provider/parsedfile.rb +9 -9
  346. data/lib/puppet/provider/service/base.rb +16 -21
  347. data/lib/puppet/provider/service/bsd.rb +4 -4
  348. data/lib/puppet/provider/service/daemontools.rb +31 -31
  349. data/lib/puppet/provider/service/debian.rb +6 -6
  350. data/lib/puppet/provider/service/freebsd.rb +36 -36
  351. data/lib/puppet/provider/service/gentoo.rb +6 -6
  352. data/lib/puppet/provider/service/init.rb +19 -19
  353. data/lib/puppet/provider/service/launchd.rb +22 -22
  354. data/lib/puppet/provider/service/openbsd.rb +10 -10
  355. data/lib/puppet/provider/service/openrc.rb +1 -1
  356. data/lib/puppet/provider/service/openwrt.rb +3 -3
  357. data/lib/puppet/provider/service/rcng.rb +3 -3
  358. data/lib/puppet/provider/service/redhat.rb +4 -4
  359. data/lib/puppet/provider/service/runit.rb +6 -6
  360. data/lib/puppet/provider/service/service.rb +5 -7
  361. data/lib/puppet/provider/service/smf.rb +28 -27
  362. data/lib/puppet/provider/service/src.rb +7 -7
  363. data/lib/puppet/provider/service/systemd.rb +31 -37
  364. data/lib/puppet/provider/service/upstart.rb +17 -17
  365. data/lib/puppet/provider/service/windows.rb +7 -7
  366. data/lib/puppet/provider/user/aix.rb +4 -2
  367. data/lib/puppet/provider/user/directoryservice.rb +34 -36
  368. data/lib/puppet/provider/user/hpux.rb +10 -14
  369. data/lib/puppet/provider/user/pw.rb +1 -1
  370. data/lib/puppet/provider/user/user_role_add.rb +16 -18
  371. data/lib/puppet/provider/user/useradd.rb +7 -7
  372. data/lib/puppet/provider/user/windows_adsi.rb +1 -1
  373. data/lib/puppet/provider.rb +8 -8
  374. data/lib/puppet/reference/indirection.rb +3 -0
  375. data/lib/puppet/reference/metaparameter.rb +1 -1
  376. data/lib/puppet/reference/providers.rb +3 -3
  377. data/lib/puppet/reference/type.rb +1 -1
  378. data/lib/puppet/relationship.rb +4 -5
  379. data/lib/puppet/reports/http.rb +1 -1
  380. data/lib/puppet/reports/log.rb +2 -2
  381. data/lib/puppet/reports/store.rb +4 -4
  382. data/lib/puppet/reports.rb +2 -2
  383. data/lib/puppet/resource/catalog.rb +16 -16
  384. data/lib/puppet/resource/status.rb +3 -3
  385. data/lib/puppet/resource/type.rb +8 -8
  386. data/lib/puppet/resource/type_collection.rb +1 -1
  387. data/lib/puppet/resource.rb +41 -41
  388. data/lib/puppet/scheduler/scheduler.rb +1 -1
  389. data/lib/puppet/settings/alias_setting.rb +3 -5
  390. data/lib/puppet/settings/base_setting.rb +11 -11
  391. data/lib/puppet/settings/boolean_setting.rb +2 -2
  392. data/lib/puppet/settings/config_file.rb +5 -4
  393. data/lib/puppet/settings/duration_setting.rb +2 -2
  394. data/lib/puppet/settings/environment_conf.rb +3 -3
  395. data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
  396. data/lib/puppet/settings/file_setting.rb +11 -11
  397. data/lib/puppet/settings/ini_file.rb +3 -3
  398. data/lib/puppet/settings/port_setting.rb +1 -1
  399. data/lib/puppet/settings/priority_setting.rb +2 -2
  400. data/lib/puppet/settings/ttl_setting.rb +2 -2
  401. data/lib/puppet/settings/value_translator.rb +8 -8
  402. data/lib/puppet/settings.rb +65 -70
  403. data/lib/puppet/ssl/base.rb +2 -4
  404. data/lib/puppet/ssl/certificate_request.rb +18 -22
  405. data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
  406. data/lib/puppet/ssl/oids.rb +2 -2
  407. data/lib/puppet/ssl/openssl_loader.rb +4 -4
  408. data/lib/puppet/syntax_checkers/base64.rb +3 -3
  409. data/lib/puppet/syntax_checkers/epp.rb +3 -3
  410. data/lib/puppet/syntax_checkers/json.rb +3 -3
  411. data/lib/puppet/syntax_checkers/pp.rb +3 -3
  412. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  413. data/lib/puppet/transaction/event.rb +2 -2
  414. data/lib/puppet/transaction/event_manager.rb +5 -5
  415. data/lib/puppet/transaction/persistence.rb +12 -14
  416. data/lib/puppet/transaction/report.rb +4 -4
  417. data/lib/puppet/transaction/resource_harness.rb +2 -2
  418. data/lib/puppet/transaction.rb +14 -18
  419. data/lib/puppet/type/component.rb +3 -3
  420. data/lib/puppet/type/exec.rb +43 -45
  421. data/lib/puppet/type/file/checksum_value.rb +1 -1
  422. data/lib/puppet/type/file/content.rb +6 -6
  423. data/lib/puppet/type/file/ctime.rb +2 -2
  424. data/lib/puppet/type/file/data_sync.rb +3 -3
  425. data/lib/puppet/type/file/ensure.rb +16 -15
  426. data/lib/puppet/type/file/mode.rb +9 -9
  427. data/lib/puppet/type/file/mtime.rb +2 -2
  428. data/lib/puppet/type/file/selcontext.rb +14 -14
  429. data/lib/puppet/type/file/source.rb +19 -21
  430. data/lib/puppet/type/file/target.rb +11 -11
  431. data/lib/puppet/type/file.rb +21 -21
  432. data/lib/puppet/type/filebucket.rb +3 -3
  433. data/lib/puppet/type/group.rb +3 -3
  434. data/lib/puppet/type/notify.rb +2 -2
  435. data/lib/puppet/type/package.rb +4 -4
  436. data/lib/puppet/type/resources.rb +6 -6
  437. data/lib/puppet/type/schedule.rb +9 -9
  438. data/lib/puppet/type/service.rb +6 -8
  439. data/lib/puppet/type/tidy.rb +22 -24
  440. data/lib/puppet/type/user.rb +13 -13
  441. data/lib/puppet/type.rb +76 -88
  442. data/lib/puppet/util/at_fork/solaris.rb +33 -37
  443. data/lib/puppet/util/autoload.rb +2 -2
  444. data/lib/puppet/util/backups.rb +9 -9
  445. data/lib/puppet/util/character_encoding.rb +7 -6
  446. data/lib/puppet/util/checksums.rb +2 -2
  447. data/lib/puppet/util/classgen.rb +8 -8
  448. data/lib/puppet/util/colors.rb +1 -1
  449. data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
  450. data/lib/puppet/util/command_line/trollop.rb +42 -46
  451. data/lib/puppet/util/command_line.rb +2 -2
  452. data/lib/puppet/util/constant_inflector.rb +2 -2
  453. data/lib/puppet/util/diff.rb +19 -21
  454. data/lib/puppet/util/docs.rb +2 -2
  455. data/lib/puppet/util/errors.rb +9 -9
  456. data/lib/puppet/util/execution.rb +32 -9
  457. data/lib/puppet/util/feature.rb +1 -1
  458. data/lib/puppet/util/fileparsing.rb +12 -16
  459. data/lib/puppet/util/filetype.rb +36 -40
  460. data/lib/puppet/util/inifile.rb +6 -12
  461. data/lib/puppet/util/ldap/connection.rb +1 -1
  462. data/lib/puppet/util/ldap/manager.rb +10 -12
  463. data/lib/puppet/util/lockfile.rb +6 -8
  464. data/lib/puppet/util/log/destination.rb +2 -2
  465. data/lib/puppet/util/log/destinations.rb +4 -4
  466. data/lib/puppet/util/log.rb +12 -9
  467. data/lib/puppet/util/logging.rb +11 -11
  468. data/lib/puppet/util/metric.rb +3 -3
  469. data/lib/puppet/util/monkey_patches.rb +5 -7
  470. data/lib/puppet/util/network_device/config.rb +3 -3
  471. data/lib/puppet/util/package/version/debian.rb +27 -28
  472. data/lib/puppet/util/package/version/pip.rb +5 -5
  473. data/lib/puppet/util/package/version/range/eq.rb +1 -1
  474. data/lib/puppet/util/package/version/rpm.rb +1 -1
  475. data/lib/puppet/util/package.rb +2 -2
  476. data/lib/puppet/util/pidlock.rb +2 -2
  477. data/lib/puppet/util/platform.rb +1 -1
  478. data/lib/puppet/util/plist.rb +8 -10
  479. data/lib/puppet/util/posix.rb +17 -17
  480. data/lib/puppet/util/profiler/aggregate.rb +1 -1
  481. data/lib/puppet/util/provider_features.rb +3 -3
  482. data/lib/puppet/util/rdoc/code_objects.rb +3 -3
  483. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
  484. data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
  485. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
  486. data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
  487. data/lib/puppet/util/rdoc/parser.rb +1 -1
  488. data/lib/puppet/util/reference.rb +13 -9
  489. data/lib/puppet/util/retry_action.rb +1 -1
  490. data/lib/puppet/util/rpm_compare.rb +17 -18
  491. data/lib/puppet/util/rubygems.rb +1 -1
  492. data/lib/puppet/util/selinux.rb +7 -7
  493. data/lib/puppet/util/storage.rb +10 -12
  494. data/lib/puppet/util/suidmanager.rb +18 -19
  495. data/lib/puppet/util/symbolic_file_mode.rb +71 -75
  496. data/lib/puppet/util/tag_set.rb +2 -2
  497. data/lib/puppet/util/tagging.rb +8 -10
  498. data/lib/puppet/util/terminal.rb +4 -4
  499. data/lib/puppet/util/user_attr.rb +7 -7
  500. data/lib/puppet/util/watcher.rb +3 -5
  501. data/lib/puppet/util/windows/access_control_list.rb +1 -1
  502. data/lib/puppet/util/windows/adsi.rb +42 -42
  503. data/lib/puppet/util/windows/daemon.rb +64 -68
  504. data/lib/puppet/util/windows/error.rb +2 -2
  505. data/lib/puppet/util/windows/file.rb +18 -25
  506. data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
  507. data/lib/puppet/util/windows/principal.rb +8 -8
  508. data/lib/puppet/util/windows/process.rb +16 -28
  509. data/lib/puppet/util/windows/registry.rb +16 -15
  510. data/lib/puppet/util/windows/root_certs.rb +2 -2
  511. data/lib/puppet/util/windows/security.rb +31 -31
  512. data/lib/puppet/util/windows/service.rb +11 -11
  513. data/lib/puppet/util/windows/sid.rb +8 -8
  514. data/lib/puppet/util/windows/user.rb +18 -20
  515. data/lib/puppet/util/yaml.rb +1 -1
  516. data/lib/puppet/util.rb +55 -46
  517. data/lib/puppet/version.rb +2 -2
  518. data/lib/puppet/x509/pem_store.rb +1 -1
  519. data/lib/puppet.rb +3 -3
  520. data/man/man5/puppet.conf.5 +10 -2
  521. data/man/man8/puppet-agent.8 +1 -1
  522. data/man/man8/puppet-apply.8 +1 -1
  523. data/man/man8/puppet-catalog.8 +1 -1
  524. data/man/man8/puppet-config.8 +1 -1
  525. data/man/man8/puppet-describe.8 +1 -1
  526. data/man/man8/puppet-device.8 +1 -1
  527. data/man/man8/puppet-doc.8 +1 -1
  528. data/man/man8/puppet-epp.8 +1 -1
  529. data/man/man8/puppet-facts.8 +1 -1
  530. data/man/man8/puppet-filebucket.8 +1 -1
  531. data/man/man8/puppet-generate.8 +1 -1
  532. data/man/man8/puppet-help.8 +1 -1
  533. data/man/man8/puppet-lookup.8 +1 -1
  534. data/man/man8/puppet-module.8 +1 -1
  535. data/man/man8/puppet-node.8 +1 -1
  536. data/man/man8/puppet-parser.8 +1 -1
  537. data/man/man8/puppet-plugin.8 +1 -1
  538. data/man/man8/puppet-report.8 +1 -1
  539. data/man/man8/puppet-resource.8 +5 -1
  540. data/man/man8/puppet-script.8 +1 -1
  541. data/man/man8/puppet-ssl.8 +1 -1
  542. data/man/man8/puppet.8 +2 -2
  543. metadata +2 -2
@@ -53,21 +53,21 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
53
53
 
54
54
  updates = {}
55
55
  sources.each do |source|
56
- execute(self.srclistcmd(source)).each_line do |line|
57
- if line =~ /^[^#][^:]*:([^:]*):([^:]*)/
58
- current = {}
59
- current[:name] = $1
60
- current[:version] = $2
61
- current[:source] = source
56
+ execute(srclistcmd(source)).each_line do |line|
57
+ next unless line =~ /^[^#][^:]*:([^:]*):([^:]*)/
62
58
 
63
- if updates.key?(current[:name])
64
- previous = updates[current[:name]]
59
+ current = {}
60
+ current[:name] = Regexp.last_match(1)
61
+ current[:version] = Regexp.last_match(2)
62
+ current[:source] = source
65
63
 
66
- updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
64
+ if updates.key?(current[:name])
65
+ previous = updates[current[:name]]
67
66
 
68
- else
69
- updates[current[:name]] = current
70
- end
67
+ updates[current[:name]] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
68
+
69
+ else
70
+ updates[current[:name]] = current
71
71
  end
72
72
  end
73
73
  end
@@ -137,9 +137,9 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
137
137
  end
138
138
 
139
139
  if hash[:pkgname]
140
- return list.shift
140
+ list.shift
141
141
  else
142
- return list
142
+ list
143
143
  end
144
144
  end
145
145
 
@@ -152,12 +152,12 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
152
152
  def latest
153
153
  upd = latest_info
154
154
 
155
- unless upd.nil?
156
- return "#{upd[:version]}"
157
- else
155
+ if upd.nil?
158
156
  raise Puppet::DevError, _("Tried to get latest on a missing package") if properties[:ensure] == :absent
159
157
 
160
- return properties[:ensure]
158
+ properties[:ensure]
159
+ else
160
+ (upd[:version]).to_s
161
161
  end
162
162
  end
163
163
 
@@ -166,6 +166,6 @@ Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package d
166
166
  end
167
167
 
168
168
  def update
169
- self.install(false)
169
+ install(false)
170
170
  end
171
171
  end
@@ -57,7 +57,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
57
57
  cached_source = source
58
58
  tmpdir = Dir.mktmpdir
59
59
  begin
60
- if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
60
+ if %r{\A[A-Za-z][A-Za-z0-9+\-.]*://} =~ cached_source
61
61
  cached_source = File.join(tmpdir, name)
62
62
  begin
63
63
  curl "-o", cached_source, "-C", "-", "-L", "-s", "--url", source
@@ -85,7 +85,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
85
85
  installapp("#{fspath}/#{pkg}", name, source)
86
86
  end
87
87
  end
88
- Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." if !found_app
88
+ Puppet.debug "Unable to find .app in .appdmg. #{name} will not be installed." unless found_app
89
89
  ensure
90
90
  hdiutil "eject", mounts[0]
91
91
  end
@@ -15,7 +15,7 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
15
15
 
16
16
  def self.instances
17
17
  instance_by_name.collect do |name|
18
- self.new(
18
+ new(
19
19
  :name => name,
20
20
  :provider => :apple,
21
21
  :ensure => :installed
@@ -45,7 +45,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
45
45
  def query
46
46
  hash = super
47
47
 
48
- if !%i(absent purged).include?(hash[:ensure]) && aptmark('showmanual', @resource[:name]).strip == @resource[:name]
48
+ if !%i[absent purged].include?(hash[:ensure]) && aptmark('showmanual', @resource[:name]).strip == @resource[:name]
49
49
  hash[:mark] = :manual
50
50
  end
51
51
 
@@ -108,7 +108,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
108
108
  end
109
109
  end
110
110
 
111
- return versions.sort.last if versions.any?
111
+ return versions.max if versions.any?
112
112
 
113
113
  Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
114
114
  should_range
@@ -117,7 +117,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
117
117
  # Install a package using 'apt-get'. This function needs to support
118
118
  # installing a specific version.
119
119
  def install
120
- self.run_preseed if @resource[:responsefile]
120
+ run_preseed if @resource[:responsefile]
121
121
  should = @resource[:ensure]
122
122
 
123
123
  if should.is_a?(String)
@@ -133,7 +133,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
133
133
  end
134
134
 
135
135
  checkforcdrom
136
- cmd = %w{-q -y}
136
+ cmd = %w[-q -y]
137
137
 
138
138
  config = @resource[:configfiles]
139
139
  if config
@@ -165,17 +165,17 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
165
165
  end
166
166
  # rubocop:enable Style/RedundantCondition
167
167
 
168
- self.unhold if self.properties[:mark] == :hold
168
+ unhold if properties[:mark] == :hold
169
169
  begin
170
170
  aptget(*cmd)
171
171
  ensure
172
- self.hold if @resource[:mark] == :hold
172
+ hold if @resource[:mark] == :hold
173
173
  end
174
174
 
175
175
  # If a source file was specified, we must make sure the expected version was installed from specified file
176
- if source && !%i(present installed).include?(should)
177
- is = self.query
178
- raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
176
+ if source && !%i[present installed].include?(should)
177
+ is = query
178
+ raise Puppet::Error, _("Could not find package %{name}") % { name: name } unless is
179
179
 
180
180
  version = is[:ensure]
181
181
 
@@ -189,10 +189,10 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
189
189
  output = aptcache :policy, @resource[:name]
190
190
 
191
191
  if output =~ /Candidate:\s+(\S+)\s/
192
- return $1
192
+ Regexp.last_match(1)
193
193
  else
194
- self.err _("Could not find latest version")
195
- return nil
194
+ err _("Could not find latest version")
195
+ nil
196
196
  end
197
197
  end
198
198
 
@@ -202,26 +202,26 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
202
202
  def run_preseed
203
203
  response = @resource[:responsefile]
204
204
  if response && Puppet::FileSystem.exist?(response)
205
- self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
205
+ info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
206
206
 
207
207
  preseed response
208
208
  else
209
- self.info _("No responsefile specified or non existent, not preseeding anything")
209
+ info _("No responsefile specified or non existent, not preseeding anything")
210
210
  end
211
211
  end
212
212
 
213
213
  def uninstall
214
- self.run_preseed if @resource[:responsefile]
214
+ run_preseed if @resource[:responsefile]
215
215
  args = ['-y', '-q']
216
- args << '--allow-change-held-packages' if self.properties[:mark] == :hold
216
+ args << '--allow-change-held-packages' if properties[:mark] == :hold
217
217
  args << :remove << @resource[:name]
218
218
  aptget(*args)
219
219
  end
220
220
 
221
221
  def purge
222
- self.run_preseed if @resource[:responsefile]
222
+ run_preseed if @resource[:responsefile]
223
223
  args = ['-y', '-q']
224
- args << '--allow-change-held-packages' if self.properties[:mark] == :hold
224
+ args << '--allow-change-held-packages' if properties[:mark] == :hold
225
225
  args << :remove << '--purge' << @resource[:name]
226
226
  aptget(*args)
227
227
  # workaround a "bug" in apt, that already removed packages are not purged
@@ -19,9 +19,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
19
19
 
20
20
  # Yay, stupid aptitude doesn't throw an error when the package is missing.
21
21
  if args.include?(:install) and output.to_s =~ /Couldn't find any package/
22
- raise Puppet::Error.new(
23
- _("Could not find package %{name}") % { name: self.name }
24
- )
22
+ raise Puppet::Error, _("Could not find package %{name}") % { name: name }
25
23
  end
26
24
  end
27
25
 
@@ -39,7 +39,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
39
39
  # Add the package version
40
40
  str += "=#{should}"
41
41
  end
42
- cmd = %w{-q -y}
42
+ cmd = %w[-q -y]
43
43
 
44
44
  cmd << 'install' << str
45
45
 
@@ -51,30 +51,30 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do
51
51
  output = aptcache :showpkg, @resource[:name]
52
52
 
53
53
  if output =~ /Versions:\s*\n((\n|.)+)^$/
54
- versions = $1
54
+ versions = Regexp.last_match(1)
55
55
  available_versions = versions.split(/\n/).filter_map { |version|
56
- if version =~ /^([^\(]+)\(/
57
- $1
56
+ if version =~ /^([^(]+)\(/
57
+ Regexp.last_match(1)
58
58
  else
59
- self.warning _("Could not match version '%{version}'") % { version: version }
59
+ warning _("Could not match version '%{version}'") % { version: version }
60
60
  nil
61
61
  end
62
62
  }.sort { |a, b| versioncmp(a, b) }
63
63
 
64
64
  if available_versions.length == 0
65
- self.debug "No latest version"
65
+ debug "No latest version"
66
66
  print output if Puppet[:debug]
67
67
  end
68
68
 
69
69
  # Get the latest and greatest version number
70
- return available_versions.pop
70
+ available_versions.pop
71
71
  else
72
- self.err _("Could not match string")
72
+ err _("Could not match string")
73
73
  end
74
74
  end
75
75
 
76
76
  def update
77
- self.install
77
+ install
78
78
  end
79
79
 
80
80
  def uninstall
@@ -50,12 +50,12 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
50
50
  end
51
51
 
52
52
  if hash[:justme]
53
- return list[0]
53
+ list[0]
54
54
  else
55
55
  list.reject! { |h|
56
56
  h[:ensure] == :absent
57
57
  }
58
- return list
58
+ list
59
59
  end
60
60
  end
61
61
 
@@ -63,23 +63,23 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
63
63
  def self.blastsplit(line)
64
64
  if line =~ /\s*(\S+)\s+((\[Not installed\])|(\S+))\s+(\S+)/
65
65
  hash = {}
66
- hash[:name] = $1
67
- hash[:ensure] = if $2 == "[Not installed]"
66
+ hash[:name] = Regexp.last_match(1)
67
+ hash[:ensure] = if Regexp.last_match(2) == "[Not installed]"
68
68
  :absent
69
69
  else
70
- $2
70
+ Regexp.last_match(2)
71
71
  end
72
- hash[:avail] = $5
72
+ hash[:avail] = Regexp.last_match(5)
73
73
 
74
74
  hash[:avail] = hash[:ensure] if hash[:avail] == "SAME"
75
75
 
76
76
  # Use the name method, so it works with subclasses.
77
- hash[:provider] = self.name
77
+ hash[:provider] = name
78
78
 
79
- return hash
79
+ hash
80
80
  else
81
81
  Puppet.warning _("Cannot match %{line}") % { line: line }
82
- return nil
82
+ nil
83
83
  end
84
84
  end
85
85
 
@@ -95,11 +95,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
95
95
 
96
96
  def query
97
97
  hash = self.class.blastlist(:justme => @resource[:name])
98
- if hash
99
- hash
100
- else
101
- { :ensure => :absent }
102
- end
98
+ hash || { :ensure => :absent }
103
99
  end
104
100
 
105
101
  # Remove the old package, and install the new one
@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
35
35
 
36
36
  def self.instances
37
37
  packages = []
38
- cmd = "#{command(:dnf)} module list -d 0 -e #{error_level}"
38
+ cmd = "#{command(:dnf)} module list -y -d 0 -e #{error_level}"
39
39
  execute(cmd).each_line do |line|
40
40
  # select only lines with actual packages since DNF clutters the output
41
41
  next unless line =~ /\[[eix]\][, ]/
@@ -95,7 +95,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
95
95
  # module has no default profile and no profile was requested, so just enable the stream
96
96
  # DNF versions prior to 4.2.8 do not need this workaround
97
97
  # see https://bugzilla.redhat.com/show_bug.cgi?id=1669527
98
- if @resource[:flavor] == nil && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(args)}$/
98
+ if @resource[:flavor].nil? && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(args)}$/
99
99
  enable(args)
100
100
  else
101
101
  raise
@@ -113,7 +113,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
113
113
  end
114
114
  return true if pkg
115
115
  end
116
- return false
116
+ false
117
117
  end
118
118
 
119
119
  def enable(args = @resource[:name])
@@ -45,10 +45,10 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
45
45
 
46
46
  # Note: self:: is required here to keep these constants in the context of what will
47
47
  # eventually become this Puppet::Type::Package::ProviderDpkg class.
48
- self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version}\\n'}
49
- self::DPKG_QUERY_PROVIDES_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} [${Provides}]\\n'}
50
- self::FIELDS_REGEX = %r{^'?(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
51
- self::FIELDS_REGEX_WITH_PROVIDES = %r{^'?(\S+) +(\S+) +(\S+) (\S+) (\S*) \[.*\]$}
48
+ self::DPKG_QUERY_FORMAT_STRING = "'${Status} ${Package} ${Version}\\n'"
49
+ self::DPKG_QUERY_PROVIDES_FORMAT_STRING = "'${Status} ${Package} ${Version} [${Provides}]\\n'"
50
+ self::FIELDS_REGEX = /^'?(\S+) +(\S+) +(\S+) (\S+) (\S*)$/
51
+ self::FIELDS_REGEX_WITH_PROVIDES = /^'?(\S+) +(\S+) +(\S+) (\S+) (\S*) \[.*\]$/
52
52
  self::FIELDS = [:desired, :error, :status, :name, :ensure]
53
53
 
54
54
  def self.defaultto_allow_virtual
@@ -69,11 +69,11 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
69
69
  hash[field] = value
70
70
  end
71
71
 
72
- hash[:provider] = self.name
72
+ hash[:provider] = name
73
73
 
74
74
  if hash[:status] == 'not-installed'
75
75
  hash[:ensure] = :purged
76
- elsif ['config-files', 'half-installed', 'unpacked', 'half-configured'].include?(hash[:status])
76
+ elsif %w[config-files half-installed unpacked half-configured].include?(hash[:status])
77
77
  hash[:ensure] = :absent
78
78
  end
79
79
  hash[:mark] = hash[:desired] == 'hold' ? :hold : :none
@@ -81,7 +81,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
81
81
  Puppet.debug("Failed to match dpkg-query line #{line.inspect}")
82
82
  end
83
83
 
84
- return hash
84
+ hash
85
85
  end
86
86
 
87
87
  public
@@ -101,16 +101,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
101
101
  end
102
102
  args << '-i' << file
103
103
 
104
- self.unhold if self.properties[:mark] == :hold
104
+ unhold if properties[:mark] == :hold
105
105
  begin
106
106
  dpkg(*args)
107
107
  ensure
108
- self.hold if @resource[:mark] == :hold
108
+ hold if @resource[:mark] == :hold
109
109
  end
110
110
  end
111
111
 
112
112
  def update
113
- self.install
113
+ install
114
114
  end
115
115
 
116
116
  # Return the version from the package.
@@ -159,9 +159,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
159
159
  hash ||= { :ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok' }
160
160
 
161
161
  if hash[:error] != "ok"
162
- raise Puppet::Error.new(
163
- "Package #{hash[:name]}, version #{hash[:ensure]} is in error state: #{hash[:error]}"
164
- )
162
+ raise Puppet::Error, "Package #{hash[:name]}, version #{hash[:ensure]} is in error state: #{hash[:error]}"
165
163
  end
166
164
 
167
165
  hash
@@ -24,7 +24,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
24
24
  # Install a package using 'apt-get'. This function needs to support
25
25
  # installing a specific version.
26
26
  def install
27
- self.run_preseed if @resource[:responsefile]
27
+ run_preseed if @resource[:responsefile]
28
28
  should = @resource.should(:ensure)
29
29
 
30
30
  str = @resource[:name]
@@ -35,15 +35,15 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
35
35
  # Add the package version
36
36
  str += "=#{should}"
37
37
  end
38
- cmd = %w{-b -q -y}
38
+ cmd = %w[-b -q -y]
39
39
 
40
40
  cmd << :install << str
41
41
 
42
- self.unhold if self.properties[:mark] == :hold
42
+ unhold if properties[:mark] == :hold
43
43
  begin
44
44
  finkcmd(cmd)
45
45
  ensure
46
- self.hold if @resource[:mark] == :hold
46
+ hold if @resource[:mark] == :hold
47
47
  end
48
48
  end
49
49
 
@@ -52,10 +52,10 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
52
52
  output = aptcache :policy, @resource[:name]
53
53
 
54
54
  if output =~ /Candidate:\s+(\S+)\s/
55
- return $1
55
+ Regexp.last_match(1)
56
56
  else
57
- self.err _("Could not find latest version")
58
- return nil
57
+ err _("Could not find latest version")
58
+ nil
59
59
  end
60
60
  end
61
61
 
@@ -65,34 +65,34 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
65
65
  def run_preseed
66
66
  response = @resource[:responsefile]
67
67
  if response && Puppet::FileSystem.exist?(response)
68
- self.info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
68
+ info(_("Preseeding %{response} to debconf-set-selections") % { response: response })
69
69
 
70
70
  preseed response
71
71
  else
72
- self.info _("No responsefile specified or non existent, not preseeding anything")
72
+ info _("No responsefile specified or non existent, not preseeding anything")
73
73
  end
74
74
  end
75
75
 
76
76
  def update
77
- self.install
77
+ install
78
78
  end
79
79
 
80
80
  def uninstall
81
- self.unhold if self.properties[:mark] == :hold
81
+ unhold if properties[:mark] == :hold
82
82
  begin
83
83
  finkcmd "-y", "-q", :remove, @model[:name]
84
84
  rescue StandardError, LoadError => e
85
- self.hold if self.properties[:mark] == :hold
85
+ hold if properties[:mark] == :hold
86
86
  raise e
87
87
  end
88
88
  end
89
89
 
90
90
  def purge
91
- self.unhold if self.properties[:mark] == :hold
91
+ unhold if properties[:mark] == :hold
92
92
  begin
93
93
  aptget '-y', '-q', 'remove', '--purge', @resource[:name]
94
94
  rescue StandardError, LoadError => e
95
- self.hold if self.properties[:mark] == :hold
95
+ hold if properties[:mark] == :hold
96
96
  raise e
97
97
  end
98
98
  end
@@ -18,7 +18,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
18
18
  end
19
19
 
20
20
  def install
21
- if @resource[:source] =~ /\/$/
21
+ if @resource[:source] =~ %r{/$}
22
22
  if @resource[:source] =~ /^(ftp|https?):/
23
23
  Puppet::Util.withenv :PACKAGESITE => @resource[:source] do
24
24
  pkgadd "-r", @resource[:name]
@@ -126,9 +126,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
126
126
  end
127
127
 
128
128
  if options[:justme]
129
- return list.shift
129
+ list.shift
130
130
  else
131
- return list
131
+ list
132
132
  end
133
133
  end
134
134
 
@@ -140,8 +140,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
140
140
  # so we don't need to check for them
141
141
 
142
142
  if desc =~ /^(\S+)\s+\((.+)\)/
143
- gem_name = $1
144
- versions = $2.sub('default: ', '').split(/,\s*/)
143
+ gem_name = Regexp.last_match(1)
144
+ versions = Regexp.last_match(2).sub('default: ', '').split(/,\s*/)
145
145
  {
146
146
  :name => gem_name,
147
147
  :ensure => versions.map { |v| v.split[0] },
@@ -168,12 +168,10 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
168
168
  end
169
169
 
170
170
  return is.any? do |version|
171
- begin
172
- should_range.include?(GEM_VERSION.parse(version))
173
- rescue GEM_VERSION::ValidationFailure
174
- Puppet.debug("Cannot parse #{version} as a ruby gem version")
175
- false
176
- end
171
+ should_range.include?(GEM_VERSION.parse(version))
172
+ rescue GEM_VERSION::ValidationFailure
173
+ Puppet.debug("Cannot parse #{version} as a ruby gem version")
174
+ false
177
175
  end
178
176
  end
179
177
 
@@ -211,7 +209,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
211
209
  end
212
210
 
213
211
  if Puppet::Util::Platform.windows?
214
- command_options << "-v" << %Q["#{should}"] if useversion && !should.is_a?(Symbol)
212
+ command_options << "-v" << %Q("#{should}") if useversion && !should.is_a?(Symbol)
215
213
  elsif useversion && !should.is_a?(Symbol)
216
214
  command_options << "-v" << should
217
215
  end
@@ -238,14 +236,14 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
238
236
  command_options << uri.path
239
237
  when 'puppet'
240
238
  # we don't support puppet:// URLs (yet)
241
- raise Puppet::Error.new(_("puppet:// URLs are not supported as gem sources"))
239
+ raise Puppet::Error, _("puppet:// URLs are not supported as gem sources")
242
240
  else
243
241
  # check whether it's an absolute file path to help Windows out
244
242
  if Puppet::Util.absolute_path?(source)
245
243
  command_options << source
246
244
  else
247
245
  # interpret it as a gem repository
248
- command_options << "--source" << "#{source}" << resource[:name]
246
+ command_options << "--source" << source.to_s << resource[:name]
249
247
  end
250
248
  end
251
249
  else
@@ -284,7 +282,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
284
282
  end
285
283
 
286
284
  def update
287
- self.install(false)
285
+ install(false)
288
286
  end
289
287
 
290
288
  def install_options
@@ -44,7 +44,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
44
44
  fields.zip(match.captures) { |field, value|
45
45
  hash[field] = value
46
46
  }
47
- hash[:provider] = self.name
47
+ hash[:provider] = name
48
48
  return hash
49
49
  end
50
50
  nil
@@ -76,7 +76,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
76
76
  result = self.class.parse_installed_query_line(execute([command(:port), "-q", :installed, @resource[:name]], :failonfail => false, :combine => false))
77
77
  return {} if result.nil?
78
78
 
79
- return result
79
+ result
80
80
  end
81
81
 
82
82
  def latest