puppet 8.5.1-x64-mingw32 → 8.6.0-x64-mingw32

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 (542) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +23 -20
  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/relationship_operator.rb +2 -2
  216. data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
  217. data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
  218. data/lib/puppet/pops/functions/dispatcher.rb +3 -3
  219. data/lib/puppet/pops/functions/function.rb +14 -16
  220. data/lib/puppet/pops/issue_reporter.rb +2 -2
  221. data/lib/puppet/pops/label_provider.rb +2 -2
  222. data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
  223. data/lib/puppet/pops/loader/loader.rb +4 -4
  224. data/lib/puppet/pops/loader/loader_paths.rb +3 -3
  225. data/lib/puppet/pops/loader/module_loaders.rb +11 -11
  226. data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
  227. data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
  228. data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
  229. data/lib/puppet/pops/loader/static_loader.rb +3 -3
  230. data/lib/puppet/pops/loaders.rb +3 -3
  231. data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
  232. data/lib/puppet/pops/lookup/explainer.rb +2 -2
  233. data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
  234. data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
  235. data/lib/puppet/pops/lookup/interpolation.rb +3 -3
  236. data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
  237. data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
  238. data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
  239. data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
  240. data/lib/puppet/pops/merge_strategy.rb +6 -6
  241. data/lib/puppet/pops/migration/migration_checker.rb +1 -1
  242. data/lib/puppet/pops/model/ast_transformer.rb +9 -11
  243. data/lib/puppet/pops/model/factory.rb +4 -5
  244. data/lib/puppet/pops/parser/epp_parser.rb +2 -2
  245. data/lib/puppet/pops/parser/epp_support.rb +1 -1
  246. data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
  247. data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
  248. data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
  249. data/lib/puppet/pops/parser/lexer2.rb +20 -12
  250. data/lib/puppet/pops/parser/lexer_support.rb +1 -1
  251. data/lib/puppet/pops/parser/locator.rb +4 -4
  252. data/lib/puppet/pops/parser/parser_support.rb +12 -14
  253. data/lib/puppet/pops/parser/pn_parser.rb +3 -3
  254. data/lib/puppet/pops/parser/slurp_support.rb +8 -8
  255. data/lib/puppet/pops/patterns.rb +12 -12
  256. data/lib/puppet/pops/pcore.rb +1 -1
  257. data/lib/puppet/pops/pn.rb +2 -2
  258. data/lib/puppet/pops/puppet_stack.rb +1 -1
  259. data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
  260. data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
  261. data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
  262. data/lib/puppet/pops/time/timestamp.rb +1 -1
  263. data/lib/puppet/pops/types/class_loader.rb +4 -6
  264. data/lib/puppet/pops/types/iterable.rb +1 -1
  265. data/lib/puppet/pops/types/p_binary_type.rb +1 -1
  266. data/lib/puppet/pops/types/p_init_type.rb +1 -1
  267. data/lib/puppet/pops/types/p_object_type.rb +5 -5
  268. data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
  269. data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
  270. data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
  271. data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
  272. data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
  273. data/lib/puppet/pops/types/p_uri_type.rb +4 -4
  274. data/lib/puppet/pops/types/recursion_guard.rb +4 -4
  275. data/lib/puppet/pops/types/ruby_generator.rb +2 -2
  276. data/lib/puppet/pops/types/string_converter.rb +12 -8
  277. data/lib/puppet/pops/types/tree_iterators.rb +4 -6
  278. data/lib/puppet/pops/types/type_calculator.rb +10 -10
  279. data/lib/puppet/pops/types/type_factory.rb +7 -3
  280. data/lib/puppet/pops/types/type_formatter.rb +22 -24
  281. data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
  282. data/lib/puppet/pops/types/types.rb +28 -24
  283. data/lib/puppet/pops/utils.rb +38 -42
  284. data/lib/puppet/pops/validation/checker4_0.rb +10 -10
  285. data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
  286. data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
  287. data/lib/puppet/pops/validation.rb +4 -4
  288. data/lib/puppet/pops/visitor.rb +2 -2
  289. data/lib/puppet/property/ensure.rb +12 -14
  290. data/lib/puppet/property/keyvalue.rb +4 -4
  291. data/lib/puppet/property/list.rb +4 -4
  292. data/lib/puppet/property/ordered_list.rb +1 -1
  293. data/lib/puppet/property.rb +31 -33
  294. data/lib/puppet/provider/exec.rb +2 -2
  295. data/lib/puppet/provider/file/posix.rb +19 -17
  296. data/lib/puppet/provider/file/windows.rb +13 -19
  297. data/lib/puppet/provider/group/directoryservice.rb +3 -2
  298. data/lib/puppet/provider/group/groupadd.rb +4 -4
  299. data/lib/puppet/provider/group/windows_adsi.rb +2 -2
  300. data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
  301. data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
  302. data/lib/puppet/provider/nameservice/pw.rb +1 -2
  303. data/lib/puppet/provider/nameservice.rb +8 -8
  304. data/lib/puppet/provider/package/aix.rb +19 -19
  305. data/lib/puppet/provider/package/appdmg.rb +2 -2
  306. data/lib/puppet/provider/package/apple.rb +1 -1
  307. data/lib/puppet/provider/package/apt.rb +18 -18
  308. data/lib/puppet/provider/package/aptitude.rb +1 -3
  309. data/lib/puppet/provider/package/aptrpm.rb +9 -9
  310. data/lib/puppet/provider/package/blastwave.rb +10 -14
  311. data/lib/puppet/provider/package/dnfmodule.rb +3 -3
  312. data/lib/puppet/provider/package/dpkg.rb +11 -13
  313. data/lib/puppet/provider/package/fink.rb +14 -14
  314. data/lib/puppet/provider/package/freebsd.rb +1 -1
  315. data/lib/puppet/provider/package/gem.rb +12 -14
  316. data/lib/puppet/provider/package/macports.rb +2 -2
  317. data/lib/puppet/provider/package/nim.rb +10 -10
  318. data/lib/puppet/provider/package/openbsd.rb +22 -22
  319. data/lib/puppet/provider/package/opkg.rb +6 -6
  320. data/lib/puppet/provider/package/pacman.rb +35 -29
  321. data/lib/puppet/provider/package/pip.rb +25 -24
  322. data/lib/puppet/provider/package/pkg.rb +15 -15
  323. data/lib/puppet/provider/package/pkgdmg.rb +10 -10
  324. data/lib/puppet/provider/package/pkgin.rb +2 -2
  325. data/lib/puppet/provider/package/pkgng.rb +5 -5
  326. data/lib/puppet/provider/package/pkgutil.rb +17 -21
  327. data/lib/puppet/provider/package/portage.rb +59 -61
  328. data/lib/puppet/provider/package/ports.rb +12 -11
  329. data/lib/puppet/provider/package/portupgrade.rb +35 -35
  330. data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
  331. data/lib/puppet/provider/package/rpm.rb +26 -26
  332. data/lib/puppet/provider/package/rug.rb +7 -9
  333. data/lib/puppet/provider/package/sun.rb +4 -4
  334. data/lib/puppet/provider/package/up2date.rb +5 -7
  335. data/lib/puppet/provider/package/urpmi.rb +6 -6
  336. data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
  337. data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
  338. data/lib/puppet/provider/package/windows/package.rb +2 -2
  339. data/lib/puppet/provider/package/windows.rb +3 -5
  340. data/lib/puppet/provider/package/yum.rb +33 -37
  341. data/lib/puppet/provider/package/zypper.rb +12 -14
  342. data/lib/puppet/provider/package.rb +1 -1
  343. data/lib/puppet/provider/package_targetable.rb +1 -1
  344. data/lib/puppet/provider/parsedfile.rb +9 -9
  345. data/lib/puppet/provider/service/base.rb +16 -21
  346. data/lib/puppet/provider/service/bsd.rb +4 -4
  347. data/lib/puppet/provider/service/daemontools.rb +31 -31
  348. data/lib/puppet/provider/service/debian.rb +6 -6
  349. data/lib/puppet/provider/service/freebsd.rb +36 -36
  350. data/lib/puppet/provider/service/gentoo.rb +6 -6
  351. data/lib/puppet/provider/service/init.rb +19 -19
  352. data/lib/puppet/provider/service/launchd.rb +22 -22
  353. data/lib/puppet/provider/service/openbsd.rb +10 -10
  354. data/lib/puppet/provider/service/openrc.rb +1 -1
  355. data/lib/puppet/provider/service/openwrt.rb +3 -3
  356. data/lib/puppet/provider/service/rcng.rb +3 -3
  357. data/lib/puppet/provider/service/redhat.rb +4 -4
  358. data/lib/puppet/provider/service/runit.rb +6 -6
  359. data/lib/puppet/provider/service/service.rb +5 -7
  360. data/lib/puppet/provider/service/smf.rb +28 -27
  361. data/lib/puppet/provider/service/src.rb +7 -7
  362. data/lib/puppet/provider/service/systemd.rb +31 -37
  363. data/lib/puppet/provider/service/upstart.rb +17 -17
  364. data/lib/puppet/provider/service/windows.rb +7 -7
  365. data/lib/puppet/provider/user/aix.rb +4 -2
  366. data/lib/puppet/provider/user/directoryservice.rb +34 -36
  367. data/lib/puppet/provider/user/hpux.rb +10 -14
  368. data/lib/puppet/provider/user/pw.rb +1 -1
  369. data/lib/puppet/provider/user/user_role_add.rb +16 -18
  370. data/lib/puppet/provider/user/useradd.rb +7 -7
  371. data/lib/puppet/provider/user/windows_adsi.rb +1 -1
  372. data/lib/puppet/provider.rb +8 -8
  373. data/lib/puppet/reference/indirection.rb +3 -0
  374. data/lib/puppet/reference/metaparameter.rb +1 -1
  375. data/lib/puppet/reference/providers.rb +3 -3
  376. data/lib/puppet/reference/type.rb +1 -1
  377. data/lib/puppet/relationship.rb +4 -5
  378. data/lib/puppet/reports/http.rb +1 -1
  379. data/lib/puppet/reports/log.rb +2 -2
  380. data/lib/puppet/reports/store.rb +4 -4
  381. data/lib/puppet/reports.rb +2 -2
  382. data/lib/puppet/resource/catalog.rb +16 -16
  383. data/lib/puppet/resource/status.rb +3 -3
  384. data/lib/puppet/resource/type.rb +8 -8
  385. data/lib/puppet/resource/type_collection.rb +1 -1
  386. data/lib/puppet/resource.rb +41 -41
  387. data/lib/puppet/scheduler/scheduler.rb +1 -1
  388. data/lib/puppet/settings/alias_setting.rb +3 -5
  389. data/lib/puppet/settings/base_setting.rb +11 -11
  390. data/lib/puppet/settings/boolean_setting.rb +2 -2
  391. data/lib/puppet/settings/config_file.rb +5 -4
  392. data/lib/puppet/settings/duration_setting.rb +2 -2
  393. data/lib/puppet/settings/environment_conf.rb +3 -3
  394. data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
  395. data/lib/puppet/settings/file_setting.rb +11 -11
  396. data/lib/puppet/settings/ini_file.rb +3 -3
  397. data/lib/puppet/settings/port_setting.rb +1 -1
  398. data/lib/puppet/settings/priority_setting.rb +2 -2
  399. data/lib/puppet/settings/ttl_setting.rb +2 -2
  400. data/lib/puppet/settings/value_translator.rb +8 -8
  401. data/lib/puppet/settings.rb +65 -70
  402. data/lib/puppet/ssl/base.rb +2 -4
  403. data/lib/puppet/ssl/certificate_request.rb +18 -22
  404. data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
  405. data/lib/puppet/ssl/oids.rb +2 -2
  406. data/lib/puppet/ssl/openssl_loader.rb +4 -4
  407. data/lib/puppet/syntax_checkers/base64.rb +3 -3
  408. data/lib/puppet/syntax_checkers/epp.rb +3 -3
  409. data/lib/puppet/syntax_checkers/json.rb +3 -3
  410. data/lib/puppet/syntax_checkers/pp.rb +3 -3
  411. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  412. data/lib/puppet/transaction/event.rb +2 -2
  413. data/lib/puppet/transaction/event_manager.rb +5 -5
  414. data/lib/puppet/transaction/persistence.rb +12 -14
  415. data/lib/puppet/transaction/report.rb +4 -4
  416. data/lib/puppet/transaction/resource_harness.rb +2 -2
  417. data/lib/puppet/transaction.rb +14 -18
  418. data/lib/puppet/type/component.rb +3 -3
  419. data/lib/puppet/type/exec.rb +43 -45
  420. data/lib/puppet/type/file/checksum_value.rb +1 -1
  421. data/lib/puppet/type/file/content.rb +6 -6
  422. data/lib/puppet/type/file/ctime.rb +2 -2
  423. data/lib/puppet/type/file/data_sync.rb +3 -3
  424. data/lib/puppet/type/file/ensure.rb +16 -15
  425. data/lib/puppet/type/file/mode.rb +9 -9
  426. data/lib/puppet/type/file/mtime.rb +2 -2
  427. data/lib/puppet/type/file/selcontext.rb +14 -14
  428. data/lib/puppet/type/file/source.rb +19 -21
  429. data/lib/puppet/type/file/target.rb +11 -11
  430. data/lib/puppet/type/file.rb +21 -21
  431. data/lib/puppet/type/filebucket.rb +3 -3
  432. data/lib/puppet/type/group.rb +3 -3
  433. data/lib/puppet/type/notify.rb +2 -2
  434. data/lib/puppet/type/package.rb +4 -4
  435. data/lib/puppet/type/resources.rb +6 -6
  436. data/lib/puppet/type/schedule.rb +9 -9
  437. data/lib/puppet/type/service.rb +6 -8
  438. data/lib/puppet/type/tidy.rb +22 -24
  439. data/lib/puppet/type/user.rb +13 -13
  440. data/lib/puppet/type.rb +76 -88
  441. data/lib/puppet/util/at_fork/solaris.rb +33 -37
  442. data/lib/puppet/util/autoload.rb +2 -2
  443. data/lib/puppet/util/backups.rb +9 -9
  444. data/lib/puppet/util/character_encoding.rb +7 -6
  445. data/lib/puppet/util/checksums.rb +2 -2
  446. data/lib/puppet/util/classgen.rb +8 -8
  447. data/lib/puppet/util/colors.rb +1 -1
  448. data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
  449. data/lib/puppet/util/command_line/trollop.rb +42 -46
  450. data/lib/puppet/util/command_line.rb +2 -2
  451. data/lib/puppet/util/constant_inflector.rb +2 -2
  452. data/lib/puppet/util/diff.rb +19 -21
  453. data/lib/puppet/util/docs.rb +2 -2
  454. data/lib/puppet/util/errors.rb +9 -9
  455. data/lib/puppet/util/execution.rb +32 -9
  456. data/lib/puppet/util/feature.rb +1 -1
  457. data/lib/puppet/util/fileparsing.rb +12 -16
  458. data/lib/puppet/util/filetype.rb +36 -40
  459. data/lib/puppet/util/inifile.rb +6 -12
  460. data/lib/puppet/util/ldap/connection.rb +1 -1
  461. data/lib/puppet/util/ldap/manager.rb +10 -12
  462. data/lib/puppet/util/lockfile.rb +6 -8
  463. data/lib/puppet/util/log/destination.rb +2 -2
  464. data/lib/puppet/util/log/destinations.rb +4 -4
  465. data/lib/puppet/util/log.rb +12 -9
  466. data/lib/puppet/util/logging.rb +11 -11
  467. data/lib/puppet/util/metric.rb +3 -3
  468. data/lib/puppet/util/monkey_patches.rb +5 -7
  469. data/lib/puppet/util/network_device/config.rb +3 -3
  470. data/lib/puppet/util/package/version/debian.rb +27 -28
  471. data/lib/puppet/util/package/version/pip.rb +5 -5
  472. data/lib/puppet/util/package/version/range/eq.rb +1 -1
  473. data/lib/puppet/util/package/version/rpm.rb +1 -1
  474. data/lib/puppet/util/package.rb +2 -2
  475. data/lib/puppet/util/pidlock.rb +2 -2
  476. data/lib/puppet/util/platform.rb +1 -1
  477. data/lib/puppet/util/plist.rb +8 -10
  478. data/lib/puppet/util/posix.rb +17 -17
  479. data/lib/puppet/util/profiler/aggregate.rb +1 -1
  480. data/lib/puppet/util/provider_features.rb +3 -3
  481. data/lib/puppet/util/rdoc/code_objects.rb +3 -3
  482. data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
  483. data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
  484. data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
  485. data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
  486. data/lib/puppet/util/rdoc/parser.rb +1 -1
  487. data/lib/puppet/util/reference.rb +13 -9
  488. data/lib/puppet/util/retry_action.rb +1 -1
  489. data/lib/puppet/util/rpm_compare.rb +17 -18
  490. data/lib/puppet/util/rubygems.rb +1 -1
  491. data/lib/puppet/util/selinux.rb +7 -7
  492. data/lib/puppet/util/storage.rb +10 -12
  493. data/lib/puppet/util/suidmanager.rb +18 -19
  494. data/lib/puppet/util/symbolic_file_mode.rb +71 -75
  495. data/lib/puppet/util/tag_set.rb +2 -2
  496. data/lib/puppet/util/tagging.rb +8 -10
  497. data/lib/puppet/util/terminal.rb +4 -4
  498. data/lib/puppet/util/user_attr.rb +7 -7
  499. data/lib/puppet/util/watcher.rb +3 -5
  500. data/lib/puppet/util/windows/access_control_list.rb +1 -1
  501. data/lib/puppet/util/windows/adsi.rb +42 -42
  502. data/lib/puppet/util/windows/daemon.rb +64 -68
  503. data/lib/puppet/util/windows/error.rb +2 -2
  504. data/lib/puppet/util/windows/file.rb +18 -25
  505. data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
  506. data/lib/puppet/util/windows/principal.rb +8 -8
  507. data/lib/puppet/util/windows/process.rb +16 -28
  508. data/lib/puppet/util/windows/registry.rb +16 -15
  509. data/lib/puppet/util/windows/root_certs.rb +2 -2
  510. data/lib/puppet/util/windows/security.rb +31 -31
  511. data/lib/puppet/util/windows/service.rb +11 -11
  512. data/lib/puppet/util/windows/sid.rb +8 -8
  513. data/lib/puppet/util/windows/user.rb +18 -20
  514. data/lib/puppet/util/yaml.rb +1 -1
  515. data/lib/puppet/util.rb +55 -46
  516. data/lib/puppet/version.rb +2 -2
  517. data/lib/puppet/x509/pem_store.rb +1 -1
  518. data/lib/puppet.rb +3 -3
  519. data/man/man5/puppet.conf.5 +10 -2
  520. data/man/man8/puppet-agent.8 +1 -1
  521. data/man/man8/puppet-apply.8 +1 -1
  522. data/man/man8/puppet-catalog.8 +1 -1
  523. data/man/man8/puppet-config.8 +1 -1
  524. data/man/man8/puppet-describe.8 +1 -1
  525. data/man/man8/puppet-device.8 +1 -1
  526. data/man/man8/puppet-doc.8 +1 -1
  527. data/man/man8/puppet-epp.8 +1 -1
  528. data/man/man8/puppet-facts.8 +1 -1
  529. data/man/man8/puppet-filebucket.8 +1 -1
  530. data/man/man8/puppet-generate.8 +1 -1
  531. data/man/man8/puppet-help.8 +1 -1
  532. data/man/man8/puppet-lookup.8 +1 -1
  533. data/man/man8/puppet-module.8 +1 -1
  534. data/man/man8/puppet-node.8 +1 -1
  535. data/man/man8/puppet-parser.8 +1 -1
  536. data/man/man8/puppet-plugin.8 +1 -1
  537. data/man/man8/puppet-report.8 +1 -1
  538. data/man/man8/puppet-resource.8 +5 -1
  539. data/man/man8/puppet-script.8 +1 -1
  540. data/man/man8/puppet-ssl.8 +1 -1
  541. data/man/man8/puppet.8 +2 -2
  542. metadata +2 -2
@@ -39,11 +39,9 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
39
39
 
40
40
  def self.post_resource_eval
41
41
  @paths.each do |path|
42
- begin
43
- Puppet::FileSystem.unlink(path)
44
- rescue => detail
45
- raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message }, detail)
46
- end
42
+ Puppet::FileSystem.unlink(path)
43
+ rescue => detail
44
+ raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message }, detail)
47
45
  end if @paths
48
46
  end
49
47
 
@@ -59,12 +59,10 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
59
59
  end
60
60
 
61
61
  is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
62
- begin
63
- is_version = RPM_VERSION.parse(version)
64
- should_version.include?(is_version)
65
- rescue RPM_VERSION::ValidationFailure
66
- Puppet.debug("Cannot parse #{is} as a RPM version")
67
- end
62
+ is_version = RPM_VERSION.parse(version)
63
+ should_version.include?(is_version)
64
+ rescue RPM_VERSION::ValidationFailure
65
+ Puppet.debug("Cannot parse #{is} as a RPM version")
68
66
  end
69
67
  end
70
68
  end
@@ -126,9 +124,9 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
126
124
  when 100
127
125
  updates = parse_updates(output)
128
126
  when 0
129
- self.debug "#{command(:cmd)} check-update exited with 0; no package updates available."
127
+ debug "#{command(:cmd)} check-update exited with 0; no package updates available."
130
128
  else
131
- self.warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
129
+ warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
132
130
  end
133
131
  updates
134
132
  end
@@ -213,15 +211,13 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
213
211
  end
214
212
  versions = []
215
213
  available_versions(@resource[:name], disablerepo, enablerepo, disableexcludes).each do |version|
216
- begin
217
- rpm_version = RPM_VERSION.parse(version)
218
- versions << rpm_version if should_range.include?(rpm_version)
219
- rescue RPM_VERSION::ValidationFailure
220
- Puppet.debug("Cannot parse #{version} as a RPM version")
221
- end
214
+ rpm_version = RPM_VERSION.parse(version)
215
+ versions << rpm_version if should_range.include?(rpm_version)
216
+ rescue RPM_VERSION::ValidationFailure
217
+ Puppet.debug("Cannot parse #{version} as a RPM version")
222
218
  end
223
219
 
224
- version = versions.sort.last if versions.any?
220
+ version = versions.max if versions.any?
225
221
 
226
222
  if version
227
223
  version = version.to_s.sub(/^\d+:/, '')
@@ -255,17 +251,17 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
255
251
  end
256
252
 
257
253
  should = @resource.should(:ensure)
258
- self.debug "Ensuring => #{should}"
254
+ debug "Ensuring => #{should}"
259
255
  operation = :install
260
256
 
261
257
  case should
262
258
  when :latest
263
- current_package = self.query
259
+ current_package = query
264
260
  if current_package && !current_package[:ensure].to_s.empty?
265
261
  operation = update_command
266
- self.debug "Ensuring latest, so using #{operation}"
262
+ debug "Ensuring latest, so using #{operation}"
267
263
  else
268
- self.debug "Ensuring latest, but package is absent, so using install"
264
+ debug "Ensuring latest, but package is absent, so using install"
269
265
  operation = :install
270
266
  end
271
267
  should = nil
@@ -274,7 +270,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
274
270
  # version feed it to yum directly
275
271
  if @resource[:source]
276
272
  wanted = @resource[:source]
277
- self.debug "Installing directly from #{wanted}"
273
+ debug "Installing directly from #{wanted}"
278
274
  end
279
275
  should = nil
280
276
  when false, :absent
@@ -286,26 +282,26 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
286
282
  # version, and also supplying the path to a package that supplies that
287
283
  # version.
288
284
  wanted = @resource[:source]
289
- self.debug "Installing directly from #{wanted}"
285
+ debug "Installing directly from #{wanted}"
290
286
  else
291
287
  # No explicit source was specified, so add the package version
292
288
  should = best_version(should)
293
289
  wanted += "-#{should}"
294
290
  if wanted.scan(self.class::ARCH_REGEX)
295
- self.debug "Detected Arch argument in package! - Moving arch to end of version string"
291
+ debug "Detected Arch argument in package! - Moving arch to end of version string"
296
292
  wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/, '\1\3\2')
297
293
  end
298
294
  end
299
- current_package = self.query
295
+ current_package = query
300
296
  if current_package
301
297
  if @resource[:install_only]
302
- self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
298
+ debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
303
299
  operation = update_command
304
300
  elsif rpm_compare_evr(should, current_package[:ensure]) < 0
305
- self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
301
+ debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
306
302
  operation = :downgrade
307
303
  elsif rpm_compare_evr(should, current_package[:ensure]) > 0
308
- self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
304
+ debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
309
305
  operation = update_command
310
306
  end
311
307
  end
@@ -313,7 +309,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
313
309
 
314
310
  # Yum on el-4 and el-5 returns exit status 0 when trying to install a package it doesn't recognize;
315
311
  # ensure we capture output to check for errors.
316
- no_debug = if Puppet.runtime[:facter].value('os.release.major').to_i > 5 then ["-d", "0"] else [] end
312
+ no_debug = Puppet.runtime[:facter].value('os.release.major').to_i > 5 ? ["-d", "0"] : []
317
313
  command = [command(:cmd)] + no_debug + ["-e", error_level, "-y", install_options, operation, wanted].compact
318
314
  output = execute(command)
319
315
 
@@ -323,8 +319,8 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
323
319
 
324
320
  # If a version was specified, query again to see if it is a matching version
325
321
  if should
326
- is = self.query
327
- raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
322
+ is = query
323
+ raise Puppet::Error, _("Could not find package %{name}") % { name: name } unless is
328
324
 
329
325
  version = is[:ensure]
330
326
  # FIXME: Should we raise an exception even if should == :latest
@@ -337,23 +333,23 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
337
333
  # What's the latest package version available?
338
334
  def latest
339
335
  upd = self.class.latest_package_version(@resource[:name], disablerepo, enablerepo, disableexcludes)
340
- unless upd.nil?
341
- # FIXME: there could be more than one update for a package
342
- # because of multiarch
343
- return "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
344
- else
336
+ if upd.nil?
345
337
  # Yum didn't find updates, pretend the current version is the latest
346
- self.debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
338
+ debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
347
339
  version = properties[:ensure]
348
340
  raise Puppet::DevError, _("Tried to get latest on a missing package") if version == :absent || version == :purged
349
341
 
350
- return version
342
+ version
343
+ else
344
+ # FIXME: there could be more than one update for a package
345
+ # because of multiarch
346
+ "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
351
347
  end
352
348
  end
353
349
 
354
350
  def update
355
351
  # Install in yum can be used for update, too
356
- self.install
352
+ install
357
353
  end
358
354
 
359
355
  def purge
@@ -82,7 +82,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
82
82
  end
83
83
  end
84
84
 
85
- return versions.sort.last if versions.any?
85
+ return versions.max if versions.any?
86
86
 
87
87
  Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
88
88
  should
@@ -92,7 +92,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
92
92
  # Install a package using 'zypper'.
93
93
  def install
94
94
  should = @resource.should(:ensure)
95
- self.debug "Ensuring => #{should}"
95
+ debug "Ensuring => #{should}"
96
96
  wanted = @resource[:name]
97
97
 
98
98
  # XXX: We don't actually deal with epochs here.
@@ -112,8 +112,8 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
112
112
  # Assume that this will work on newer zypper versions
113
113
 
114
114
  # extract version numbers and convert to integers
115
- major, minor, patch = zypper_version.scan(/\d+/).map { |x| x.to_i }
116
- self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
115
+ major, minor, patch = zypper_version.scan(/\d+/).map(&:to_i)
116
+ debug "Detected zypper version #{major}.#{minor}.#{patch}"
117
117
 
118
118
  # zypper version < 1.0 does not support --quiet flag
119
119
  if major < 1
@@ -144,29 +144,27 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
144
144
 
145
145
  zypper(*options)
146
146
 
147
- unless self.query
148
- raise Puppet::ExecutionFailure.new(
149
- _("Could not find package %{name}") % { name: self.name }
150
- )
147
+ unless query
148
+ raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: name }
151
149
  end
152
150
  end
153
151
 
154
152
  # What's the latest package version available?
155
153
  def latest
156
- return self.class.latest_package_version(@resource[:name]) ||
157
- # zypper didn't find updates, pretend the current
158
- # version is the latest
159
- @property_hash[:ensure]
154
+ self.class.latest_package_version(@resource[:name]) ||
155
+ # zypper didn't find updates, pretend the current
156
+ # version is the latest
157
+ @property_hash[:ensure]
160
158
  end
161
159
 
162
160
  def update
163
161
  # zypper install can be used for update, too
164
- self.install
162
+ install
165
163
  end
166
164
 
167
165
  def uninstall
168
166
  # extract version numbers and convert to integers
169
- major, minor, _ = zypper_version.scan(/\d+/).map { |x| x.to_i }
167
+ major, minor, _ = zypper_version.scan(/\d+/).map(&:to_i)
170
168
 
171
169
  if major < 1
172
170
  super
@@ -25,7 +25,7 @@ class Puppet::Provider::Package < Puppet::Provider
25
25
  # Purged is the "most uninstalled" a package can be, so a purged package will be in-sync with
26
26
  # either `ensure => absent` or `ensure => purged`; an absent package will be out of sync with `ensure => purged`.
27
27
  default_status = self.class.feature?(:purgeable) ? :purged : :absent
28
- @property_hash = query || { :ensure => (default_status) }
28
+ @property_hash = query || { :ensure => default_status }
29
29
  @property_hash[:ensure] = default_status if @property_hash.empty?
30
30
  end
31
31
  @property_hash.dup
@@ -34,7 +34,7 @@ class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
34
34
  catalog_packages.each do |catalog_package|
35
35
  if catalog_package[:name] == instance.name && catalog_package.original_parameters[:command] == command
36
36
  catalog_package.provider = instance
37
- self.debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: (command || :default) }
37
+ debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: command || :default }
38
38
  end
39
39
  end
40
40
  end
@@ -116,9 +116,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
116
116
  # Return the header placed at the top of each generated file, warning
117
117
  # users that modifying this file manually is probably a bad idea.
118
118
  def self.header
119
- %{# HEADER: This file was autogenerated at #{Time.now}
119
+ %(# HEADER: This file was autogenerated at #{Time.now}
120
120
  # HEADER: by puppet. While it can still be managed manually, it
121
- # HEADER: is definitely not recommended.\n}
121
+ # HEADER: is definitely not recommended.\n)
122
122
  end
123
123
 
124
124
  # An optional regular expression matched by third party headers.
@@ -282,7 +282,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
282
282
  begin
283
283
  target_records = retrieve(target)
284
284
  unless target_records
285
- raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name }
285
+ raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name }
286
286
  end
287
287
  rescue Puppet::Util::FileType::FileReadError => detail
288
288
  if @raise_prefetch_errors
@@ -292,7 +292,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
292
292
  @failed_prefetch_targets[target] = detail.to_s
293
293
  else
294
294
  puts detail.backtrace if Puppet[:trace]
295
- Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: self.resource_type.name, name: self.name, target: target, detail: detail }
295
+ Puppet.err _("Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty") % { resource: resource_type.name, name: name, target: target, detail: detail }
296
296
  end
297
297
 
298
298
  target_records = []
@@ -306,7 +306,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
306
306
 
307
307
  target_records = prefetch_hook(target_records) if respond_to?(:prefetch_hook)
308
308
 
309
- raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: self.name } unless target_records
309
+ raise Puppet::DevError, _("Prefetching %{target} for provider %{name} returned nil") % { target: target, name: name } unless target_records
310
310
 
311
311
  target_records
312
312
  end
@@ -325,13 +325,13 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
325
325
  text = target_object(path).read
326
326
  if text.nil? or text == ""
327
327
  # there is no file
328
- return []
328
+ []
329
329
  else
330
330
  # Set the target, for logging.
331
331
  old = @target
332
332
  begin
333
333
  @target = path
334
- return self.parse(text)
334
+ parse(text)
335
335
  rescue Puppet::Error => detail
336
336
  detail.file = @target if detail.respond_to?(:file=)
337
337
  raise detail
@@ -380,9 +380,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
380
380
  def self.targets(resources = nil)
381
381
  targets = []
382
382
  # First get the default target
383
- raise Puppet::DevError, _("Parsed Providers must define a default target") unless self.default_target
383
+ raise Puppet::DevError, _("Parsed Providers must define a default target") unless default_target
384
384
 
385
- targets << self.default_target
385
+ targets << default_target
386
386
 
387
387
  # Then get each of the file objects
388
388
  targets += @target_objects.keys
@@ -35,7 +35,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
35
35
  regex = Regexp.new(@resource[:pattern])
36
36
  ps = getps
37
37
 
38
- self.debug "Executing '#{ps}'"
38
+ debug "Executing '#{ps}'"
39
39
  table = Puppet::Util::Execution.execute(ps)
40
40
 
41
41
  # The output of the PS command can be a mashup of several different
@@ -51,11 +51,11 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
51
51
  table = table.scrub unless table.valid_encoding?
52
52
 
53
53
  table.each_line { |line|
54
- if regex.match(line)
55
- self.debug "Process matched: #{line}"
56
- ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
57
- return ary[1]
58
- end
54
+ next unless regex.match(line)
55
+
56
+ debug "Process matched: #{line}"
57
+ ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
58
+ return ary[1]
59
59
  }
60
60
 
61
61
  nil
@@ -74,17 +74,17 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
74
74
 
75
75
  # Explicitly calling exitstatus to facilitate testing
76
76
  if status.exitstatus == 0
77
- return :running
77
+ :running
78
78
  else
79
- return :stopped
79
+ :stopped
80
80
  end
81
81
  else
82
82
  pid = getpid
83
83
  if pid
84
- self.debug "PID is #{pid}"
85
- return :running
84
+ debug "PID is #{pid}"
85
+ :running
86
86
  else
87
- return :stopped
87
+ :stopped
88
88
  end
89
89
  end
90
90
  end
@@ -102,12 +102,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
102
102
  # The command used to start. Generated if the 'binary' argument
103
103
  # is passed.
104
104
  def startcmd
105
- if @resource[:binary]
106
- return @resource[:binary]
107
- else
108
- raise Puppet::Error,
109
- "Services must specify a start command or a binary"
110
- end
105
+ @resource[:binary] || raise(Puppet::Error, "Services must specify a start command or a binary")
111
106
  end
112
107
 
113
108
  # Stop the service. If a 'stop' parameter is specified, it
@@ -122,15 +117,15 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
122
117
  else
123
118
  pid = getpid
124
119
  unless pid
125
- self.info _("%{name} is not running") % { name: self.name }
120
+ info _("%{name} is not running") % { name: name }
126
121
  return false
127
122
  end
128
123
  begin
129
124
  output = kill pid
130
- rescue Puppet::ExecutionFailure
131
- @resource.fail Puppet::Error, "Could not kill #{self.name}, PID #{pid}: #{output}", $!
125
+ rescue Puppet::ExecutionFailure => e
126
+ @resource.fail Puppet::Error, "Could not kill #{name}, PID #{pid}: #{output}", e
132
127
  end
133
- return true
128
+ true
134
129
  end
135
130
  end
136
131
 
@@ -34,9 +34,9 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
34
34
  # enable service by creating a service file under rc.conf.d with the
35
35
  # proper contents
36
36
  def enable
37
- Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
37
+ Dir.mkdir(rcconf_dir) unless Puppet::FileSystem.exist?(rcconf_dir)
38
38
  rcfile = File.join(rcconf_dir, @resource[:name])
39
- File.open(rcfile, File::WRONLY | File::APPEND | File::CREAT, 0644) { |f|
39
+ File.open(rcfile, File::WRONLY | File::APPEND | File::CREAT, 0o644) { |f|
40
40
  f << "%s_enable=\"YES\"\n" % @resource[:name]
41
41
  }
42
42
  end
@@ -44,10 +44,10 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
44
44
  # Override stop/start commands to use one<cmd>'s and the avoid race condition
45
45
  # where provider tries to stop/start the service before it is enabled
46
46
  def startcmd
47
- [self.initscript, :onestart]
47
+ [initscript, :onestart]
48
48
  end
49
49
 
50
50
  def stopcmd
51
- [self.initscript, :onestop]
51
+ [initscript, :onestop]
52
52
  end
53
53
  end
@@ -60,9 +60,9 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
60
60
  # returns all providers for all existing services in @defpath
61
61
  # ie enabled or not
62
62
  def self.instances
63
- path = self.defpath
63
+ path = defpath
64
64
  unless path
65
- Puppet.info("#{self.name} is unsuitable because service directory is nil")
65
+ Puppet.info("#{name} is unsuitable because service directory is nil")
66
66
  return
67
67
  end
68
68
  unless FileTest.directory?(path)
@@ -82,7 +82,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
82
82
 
83
83
  # returns the daemon dir on this node
84
84
  def self.daemondir
85
- self.defpath
85
+ defpath
86
86
  end
87
87
 
88
88
  # find the service dir on this node
@@ -102,7 +102,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
102
102
  # returns the full path of this service when enabled
103
103
  # (ie in the service directory)
104
104
  def service
105
- File.join(self.servicedir, resource[:name])
105
+ File.join(servicedir, resource[:name])
106
106
  end
107
107
 
108
108
  # returns the full path to the current daemon directory
@@ -110,14 +110,14 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
110
110
  # definition
111
111
  def daemon
112
112
  path = resource[:path]
113
- raise Puppet::Error.new("#{self.class.name} must specify a path for daemon directory") unless path
113
+ raise Puppet::Error, "#{self.class.name} must specify a path for daemon directory" unless path
114
114
 
115
115
  File.join(path, resource[:name])
116
116
  end
117
117
 
118
118
  def status
119
119
  begin
120
- output = svstat self.service
120
+ output = svstat service
121
121
  if output =~ /:\s+up \(/
122
122
  return :running
123
123
  end
@@ -131,66 +131,66 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
131
131
  if resource[:manifest]
132
132
  Puppet.notice "Configuring #{resource[:name]}"
133
133
  command = [resource[:manifest], resource[:name]]
134
- system("#{command}")
134
+ system(command.to_s)
135
135
  end
136
136
  rescue Puppet::ExecutionFailure => detail
137
- raise Puppet::Error.new("Cannot config #{self.service} to enable it: #{detail}", detail)
137
+ raise Puppet::Error.new("Cannot config #{service} to enable it: #{detail}", detail)
138
138
  end
139
139
 
140
140
  def enabled?
141
- case self.status
141
+ case status
142
142
  when :running
143
143
  # obviously if the daemon is running then it is enabled
144
- return :true
144
+ :true
145
145
  else
146
146
  # the service is enabled if it is linked
147
- return Puppet::FileSystem.symlink?(self.service) ? :true : :false
147
+ Puppet::FileSystem.symlink?(service) ? :true : :false
148
148
  end
149
149
  end
150
150
 
151
151
  def enable
152
- if !FileTest.directory?(self.daemon)
152
+ unless FileTest.directory?(daemon)
153
153
  Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
154
- self.setupservice
154
+ setupservice
155
155
  end
156
- if self.daemon
157
- if !Puppet::FileSystem.symlink?(self.service)
158
- Puppet.notice "Enabling #{self.service}: linking #{self.daemon} -> #{self.service}"
159
- Puppet::FileSystem.symlink(self.daemon, self.service)
156
+ if daemon
157
+ unless Puppet::FileSystem.symlink?(service)
158
+ Puppet.notice "Enabling #{service}: linking #{daemon} -> #{service}"
159
+ Puppet::FileSystem.symlink(daemon, service)
160
160
  end
161
161
  end
162
- rescue Puppet::ExecutionFailure
163
- raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
162
+ rescue Puppet::ExecutionFailure => e
163
+ raise Puppet::Error.new("No daemon directory found for #{service}", e)
164
164
  end
165
165
 
166
166
  def disable
167
167
  begin
168
- if !FileTest.directory?(self.daemon)
168
+ unless FileTest.directory?(daemon)
169
169
  Puppet.notice "No daemon dir, calling setupservice for #{resource[:name]}"
170
- self.setupservice
170
+ setupservice
171
171
  end
172
- if self.daemon
173
- if Puppet::FileSystem.symlink?(self.service)
174
- Puppet.notice "Disabling #{self.service}: removing link #{self.daemon} -> #{self.service}"
175
- Puppet::FileSystem.unlink(self.service)
172
+ if daemon
173
+ if Puppet::FileSystem.symlink?(service)
174
+ Puppet.notice "Disabling #{service}: removing link #{daemon} -> #{service}"
175
+ Puppet::FileSystem.unlink(service)
176
176
  end
177
177
  end
178
- rescue Puppet::ExecutionFailure
179
- raise Puppet::Error.new("No daemon directory found for #{self.service}", $!)
178
+ rescue Puppet::ExecutionFailure => e
179
+ raise Puppet::Error.new("No daemon directory found for #{service}", e)
180
180
  end
181
- self.stop
181
+ stop
182
182
  end
183
183
 
184
184
  def restart
185
- svc "-t", self.service
185
+ svc "-t", service
186
186
  end
187
187
 
188
188
  def start
189
189
  enable unless enabled? == :true
190
- svc "-u", self.service
190
+ svc "-u", service
191
191
  end
192
192
 
193
193
  def stop
194
- svc "-d", self.service
194
+ svc "-d", service
195
195
  end
196
196
  end
@@ -21,8 +21,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
21
21
 
22
22
  confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
23
23
 
24
- defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => ['1', '2']
25
- defaultfor 'os.name' => :debian, 'os.release.major' => ['5', '6', '7']
24
+ defaultfor 'os.name' => :cumuluslinux, 'os.release.major' => %w[1 2]
25
+ defaultfor 'os.name' => :debian, 'os.release.major' => %w[5 6 7]
26
26
  defaultfor 'os.name' => :devuan
27
27
 
28
28
  # Remove the symlinks
@@ -42,7 +42,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
42
42
  # 106 is the exit status when the policy layer supplies a fallback action
43
43
  # See x-man-page://invoke-rc.d
44
44
  if [104, 106].include?(status.exitstatus)
45
- return :true
45
+ :true
46
46
  elsif [101, 105].include?(status.exitstatus)
47
47
  # 101 is action not allowed, which means we have to do the check manually.
48
48
  # 105 is unknown, which generally means the initscript does not support query
@@ -50,12 +50,12 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
50
50
  # For those that do not, perform the checks manually
51
51
  # http://www.debian.org/doc/debian-policy/ch-opersys.html
52
52
  if get_start_link_count >= 4
53
- return :true
53
+ :true
54
54
  else
55
- return :false
55
+ :false
56
56
  end
57
57
  else
58
- return :false
58
+ :false
59
59
  end
60
60
  end
61
61