puppet 8.5.1-x86-mingw32 → 8.6.0-x86-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
@@ -38,7 +38,7 @@ module Puppet::Util::Package::Version
38
38
  def self.parse(version)
39
39
  raise ValidationFailure, version.to_s unless version.is_a? String
40
40
 
41
- matched = version.match(Regexp.new(("^\\s*") + VERSION_PATTERN + ("\\s*$"), Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
41
+ matched = version.match(Regexp.new("^\\s*" + VERSION_PATTERN + "\\s*$", Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
42
42
  raise ValidationFailure, version unless matched
43
43
 
44
44
  new(matched)
@@ -59,7 +59,7 @@ module Puppet::Util::Package::Version
59
59
  parts.push(@pre_data.join) if @pre_data
60
60
  parts.push(".post#{@post_data[1]}") if @post_data
61
61
  parts.push(".dev#{@dev_data[1]}") if @dev_data
62
- parts.push("+#{@local_data.join(".")}") if @local_data
62
+ parts.push("+#{@local_data.join('.')}") if @local_data
63
63
 
64
64
  parts.join
65
65
  end
@@ -93,16 +93,16 @@ module Puppet::Util::Package::Version
93
93
 
94
94
  def parse_letter_version(letter, number)
95
95
  if letter
96
- number = 0 if !number
96
+ number ||= 0
97
97
  letter.downcase!
98
98
 
99
99
  if letter == "alpha"
100
100
  letter = "a"
101
101
  elsif letter == "beta"
102
102
  letter = "b"
103
- elsif ["c", "pre", "preview"].include?(letter)
103
+ elsif %w[c pre preview].include?(letter)
104
104
  letter = "rc"
105
- elsif ["rev", "r"].include?(letter)
105
+ elsif %w[rev r].include?(letter)
106
106
  letter = "post"
107
107
  end
108
108
 
@@ -6,7 +6,7 @@ module Puppet::Util::Package::Version
6
6
  class Range
7
7
  class Eq < Simple
8
8
  def to_s
9
- "#{@version}"
9
+ @version.to_s
10
10
  end
11
11
 
12
12
  def include?(version)
@@ -41,7 +41,7 @@ module Puppet::Util::Package::Version
41
41
  def <=>(other)
42
42
  raise ArgumentError, _("Cannot compare, as %{other} is not a Rpm Version") % { other: other } unless other.is_a?(self.class)
43
43
 
44
- rpm_compare_evr(self.to_s, other.to_s)
44
+ rpm_compare_evr(to_s, other.to_s)
45
45
  end
46
46
 
47
47
  private
@@ -12,7 +12,7 @@ module Puppet::Util::Package
12
12
  ax = version_a.scan(vre)
13
13
  bx = version_b.scan(vre)
14
14
 
15
- while (ax.length > 0 && bx.length > 0)
15
+ while ax.length > 0 && bx.length > 0
16
16
  a = ax.shift
17
17
  b = bx.shift
18
18
 
@@ -35,7 +35,7 @@ module Puppet::Util::Package
35
35
 
36
36
  def self.normalize(version)
37
37
  version = version.split('-')
38
- version.first.sub!(/([\.0]+)$/, '')
38
+ version.first.sub!(/([.0]+)$/, '')
39
39
 
40
40
  version.join('-')
41
41
  end
@@ -25,7 +25,7 @@ class Puppet::Util::Pidlock
25
25
 
26
26
  def unlock
27
27
  if mine?
28
- return @lockfile.unlock
28
+ @lockfile.unlock
29
29
  else
30
30
  false
31
31
  end
@@ -59,7 +59,7 @@ class Puppet::Util::Pidlock
59
59
 
60
60
  def clear_if_stale
61
61
  pid = lock_pid
62
- return @lockfile.unlock if pid == nil
62
+ return @lockfile.unlock if pid.nil?
63
63
  return if Process.pid == pid
64
64
 
65
65
  errors = [Errno::ESRCH]
@@ -24,7 +24,7 @@ module Puppet
24
24
  def default_paths
25
25
  return [] if windows?
26
26
 
27
- %w{/usr/sbin /sbin}
27
+ %w[/usr/sbin /sbin]
28
28
  end
29
29
  module_function :default_paths
30
30
 
@@ -51,12 +51,12 @@ module Puppet::Util::Plist
51
51
  Puppet.warning(message)
52
52
  end
53
53
  end
54
- return nil
54
+ nil
55
55
  end
56
56
 
57
57
  # Read plist text using the CFPropertyList gem.
58
58
  def parse_plist(plist_data, file_path = '')
59
- bad_xml_doctype = /^.*<!DOCTYPE plist PUBLIC -\/\/Apple Computer.*$/
59
+ bad_xml_doctype = %r{^.*<!DOCTYPE plist PUBLIC -//Apple Computer.*$}
60
60
  # Depending on where parse_plist is called from, plist_data can be either XML or binary.
61
61
  # If we get XML, make sure ruby knows it's UTF-8 so we avoid invalid byte sequence errors.
62
62
  if plist_data.include?('encoding="UTF-8"') && plist_data.encoding != Encoding::UTF_8
@@ -138,20 +138,18 @@ module Puppet::Util::Plist
138
138
  when :plain
139
139
  CFPropertyList::List::FORMAT_PLAIN
140
140
  else
141
- raise FormatError.new "Unknown plist format #{format}"
141
+ raise FormatError, "Unknown plist format #{format}"
142
142
  end
143
143
  end
144
144
 
145
145
  # This method will write a plist file using a specified format (or XML
146
146
  # by default)
147
147
  def write_plist_file(plist, file_path, format = :xml)
148
- begin
149
- plist_to_save = CFPropertyList::List.new
150
- plist_to_save.value = CFPropertyList.guess(plist)
151
- plist_to_save.save(file_path, to_format(format), :formatted => true)
152
- rescue IOError => e
153
- Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
154
- end
148
+ plist_to_save = CFPropertyList::List.new
149
+ plist_to_save.value = CFPropertyList.guess(plist)
150
+ plist_to_save.save(file_path, to_format(format), :formatted => true)
151
+ rescue IOError => e
152
+ Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
155
153
  end
156
154
 
157
155
  def dump_plist(plist_data, format = :xml)
@@ -3,12 +3,12 @@
3
3
  # Utility methods for interacting with POSIX objects; mostly user and group
4
4
  module Puppet::Util::POSIX
5
5
  # This is a list of environment variables that we will set when we want to override the POSIX locale
6
- LOCALE_ENV_VARS = ['LANG', 'LC_ALL', 'LC_MESSAGES', 'LANGUAGE',
7
- 'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME']
6
+ LOCALE_ENV_VARS = %w[LANG LC_ALL LC_MESSAGES LANGUAGE
7
+ LC_COLLATE LC_CTYPE LC_MONETARY LC_NUMERIC LC_TIME]
8
8
 
9
9
  # This is a list of user-related environment variables that we will unset when we want to provide a pristine
10
10
  # environment for "exec" runs
11
- USER_ENV_VARS = ['HOME', 'USER', 'LOGNAME']
11
+ USER_ENV_VARS = %w[HOME USER LOGNAME]
12
12
 
13
13
  class << self
14
14
  # Returns an array of all the groups that the user's a member of.
@@ -87,10 +87,10 @@ module Puppet::Util::POSIX
87
87
  end
88
88
 
89
89
  begin
90
- return Etc.send(method, id).send(field)
90
+ Etc.send(method, id).send(field)
91
91
  rescue NoMethodError, ArgumentError
92
92
  # ignore it; we couldn't find the object
93
- return nil
93
+ nil
94
94
  end
95
95
  end
96
96
 
@@ -128,30 +128,30 @@ module Puppet::Util::POSIX
128
128
  # Determine what the field name is for users and groups.
129
129
  def idfield(space)
130
130
  case space.intern
131
- when :gr, :group; return :gid
132
- when :pw, :user, :passwd; return :uid
131
+ when :gr, :group; :gid
132
+ when :pw, :user, :passwd; :uid
133
133
  else
134
- raise ArgumentError.new(_("Can only handle users and groups"))
134
+ raise ArgumentError, _("Can only handle users and groups")
135
135
  end
136
136
  end
137
137
 
138
138
  # Determine what the method is to get users and groups by id
139
139
  def methodbyid(space)
140
140
  case space.intern
141
- when :gr, :group; return :getgrgid
142
- when :pw, :user, :passwd; return :getpwuid
141
+ when :gr, :group; :getgrgid
142
+ when :pw, :user, :passwd; :getpwuid
143
143
  else
144
- raise ArgumentError.new(_("Can only handle users and groups"))
144
+ raise ArgumentError, _("Can only handle users and groups")
145
145
  end
146
146
  end
147
147
 
148
148
  # Determine what the method is to get users and groups by name
149
149
  def methodbyname(space)
150
150
  case space.intern
151
- when :gr, :group; return :getgrnam
152
- when :pw, :user, :passwd; return :getpwnam
151
+ when :gr, :group; :getgrnam
152
+ when :pw, :user, :passwd; :getpwnam
153
153
  else
154
- raise ArgumentError.new(_("Can only handle users and groups"))
154
+ raise ArgumentError, _("Can only handle users and groups")
155
155
  end
156
156
  end
157
157
 
@@ -194,13 +194,13 @@ module Puppet::Util::POSIX
194
194
 
195
195
  if id == check_value_id
196
196
  Puppet.debug("Multiple entries found for resource: '#{location}' with #{id_field}: #{id}")
197
- return id
197
+ id
198
198
  else
199
199
  Puppet.debug("The value retrieved: '#{check_value}' is different than the required state: '#{field}', searching in all entries")
200
- return search_posix_field(location, id_field, field)
200
+ search_posix_field(location, id_field, field)
201
201
  end
202
202
  else
203
- return id
203
+ id
204
204
  end
205
205
  end
206
206
  end
@@ -55,7 +55,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
55
55
  attr_reader :count, :time
56
56
 
57
57
  def [](key)
58
- if !has_key?(key)
58
+ unless has_key?(key)
59
59
  self[key] = Metric.new
60
60
  end
61
61
  super(key)
@@ -22,13 +22,13 @@ module Puppet::Util::ProviderFeatures
22
22
  # @param obj [Object, Class] the object or class to check if requirements are met
23
23
  # @return [Boolean] whether all requirements for this feature are met or not.
24
24
  def available?(obj)
25
- if self.methods
26
- return !!methods_available?(obj)
25
+ if methods
26
+ !!methods_available?(obj)
27
27
  else
28
28
  # In this case, the provider has to declare support for this
29
29
  # feature, and that's been checked before we ever get to the
30
30
  # method checks.
31
- return false
31
+ false
32
32
  end
33
33
  end
34
34
 
@@ -73,7 +73,7 @@ module RDoc
73
73
 
74
74
  @node_container ||= add_module(NormalModule, "__nodes__")
75
75
  cls = @node_container.add_class(PuppetNode, name, superclass)
76
- @nodes[name] = cls if !@done_documenting
76
+ @nodes[name] = cls unless @done_documenting
77
77
  cls
78
78
  end
79
79
 
@@ -147,7 +147,7 @@ module RDoc
147
147
  # ourselves.
148
148
  def find_symbol(symbol, method = nil)
149
149
  result = super(symbol)
150
- if not result and symbol =~ /::/
150
+ if !result and symbol =~ /::/
151
151
  modules = symbol.split(/::/)
152
152
  unless modules.empty?
153
153
  module_name = modules.shift
@@ -168,7 +168,7 @@ module RDoc
168
168
  end
169
169
  end
170
170
  if result && method
171
- if !result.respond_to?(:find_local_symbol)
171
+ unless result.respond_to?(:find_local_symbol)
172
172
  p result.name
173
173
  p method
174
174
  fail
@@ -40,7 +40,7 @@ module Generators
40
40
  def new_markup(str, remove_para = false)
41
41
  first = @markup.nil?
42
42
  res = old_markup(str, remove_para)
43
- if first and not @markup.nil?
43
+ if first and !@markup.nil?
44
44
  @markup.add_special(/\b([a-z]\w+(::\w+)*)/, :CROSSREF)
45
45
  # we need to call it again, since we added a rule
46
46
  res = old_markup(str, remove_para)
@@ -138,22 +138,22 @@ module Generators
138
138
  end
139
139
 
140
140
  classes.each do |k|
141
- @allclasses[k.index_name] = k if !@allclasses.has_key?(k.index_name)
141
+ @allclasses[k.index_name] = k unless @allclasses.has_key?(k.index_name)
142
142
  end
143
143
 
144
144
  # generate nodes and plugins found
145
145
  classes.each do |k|
146
- if k.context.is_module?
147
- k.context.each_node do |_name, node|
148
- nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
149
- @nodes << nodes.last
150
- end
151
- k.context.each_plugin do |plugin|
152
- @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
153
- end
154
- k.context.each_fact do |fact|
155
- @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
156
- end
146
+ next unless k.context.is_module?
147
+
148
+ k.context.each_node do |_name, node|
149
+ nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
150
+ @nodes << nodes.last
151
+ end
152
+ k.context.each_plugin do |plugin|
153
+ @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
154
+ end
155
+ k.context.each_fact do |fact|
156
+ @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
157
157
  end
158
158
  end
159
159
 
@@ -164,11 +164,11 @@ module Generators
164
164
  # scan all classes to create the child's references
165
165
  @allclasses.values.each do |klass|
166
166
  superklass = klass.context.superclass
167
- if superklass
168
- superklass = AllReferences[superklass]
169
- if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
170
- superklass.context.add_child(klass.context)
171
- end
167
+ next unless superklass
168
+
169
+ superklass = AllReferences[superklass]
170
+ if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
171
+ superklass.context.add_child(klass.context)
172
172
  end
173
173
  end
174
174
 
@@ -237,14 +237,13 @@ module Generators
237
237
  def gen_class_index
238
238
  gen_an_index(@classes, 'All Classes', RDoc::Page::CLASS_INDEX, "fr_class_index.html")
239
239
  @allfiles.each do |file|
240
- unless file['file'].context.file_relative_name =~ /\.rb$/
240
+ next if file['file'].context.file_relative_name =~ /\.rb$/
241
241
 
242
- gen_composite_index(
243
- file,
244
- RDoc::Page::COMBO_INDEX,
245
- "#{MODULE_DIR}/fr_#{file["file"].context.module_name}.html"
246
- )
247
- end
242
+ gen_composite_index(
243
+ file,
244
+ RDoc::Page::COMBO_INDEX,
245
+ "#{MODULE_DIR}/fr_#{file['file'].context.module_name}.html"
246
+ )
248
247
  end
249
248
  end
250
249
 
@@ -274,10 +273,10 @@ module Generators
274
273
  res3 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{fact.name})"].path), "name" => CGI.escapeHTML(fact.name) }
275
274
  end
276
275
  end
277
- unless f.plugins.nil?
278
- f.plugins.each do |plugin|
279
- res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
280
- end
276
+ next if f.plugins.nil?
277
+
278
+ f.plugins.each do |plugin|
279
+ res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
281
280
  end
282
281
  end
283
282
 
@@ -396,14 +395,14 @@ module Generators
396
395
  resources = @resources.sort
397
396
  resources.each do |r|
398
397
  row = {}
399
- if r.section == section and r.document_self
400
- row["name"] = CGI.escapeHTML(r.name)
401
- desc = r.description.strip
402
- row["m_desc"] = desc unless desc.empty?
403
- row["aref"] = r.aref
404
- row["params"] = r.params
405
- outer << row
406
- end
398
+ next unless r.section == section and r.document_self
399
+
400
+ row["name"] = CGI.escapeHTML(r.name)
401
+ desc = r.description.strip
402
+ row["m_desc"] = desc unless desc.empty?
403
+ row["aref"] = r.aref
404
+ row["params"] = r.params
405
+ outer << row
407
406
  end
408
407
  outer
409
408
  end
@@ -419,12 +418,12 @@ module Generators
419
418
 
420
419
  @context.sections.each do |section|
421
420
  secdata = @values["sections"].select { |s| s["secsequence"] == section.sequence }
422
- if secdata.size == 1
423
- secdata = secdata[0]
421
+ next unless secdata.size == 1
424
422
 
425
- rdl = build_resource_detail_list(section)
426
- secdata["resource_list"] = rdl unless rdl.empty?
427
- end
423
+ secdata = secdata[0]
424
+
425
+ rdl = build_resource_detail_list(section)
426
+ secdata["resource_list"] = rdl unless rdl.empty?
428
427
  end
429
428
 
430
429
  rl = build_require_list(@context)
@@ -483,7 +482,7 @@ module Generators
483
482
  # which is also its url
484
483
  def http_url(full_name, prefix)
485
484
  path = full_name.dup
486
- path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
485
+ path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
487
486
  File.join(prefix, path.split("::").collect { |p| Digest::MD5.hexdigest(p) }) + ".html"
488
487
  end
489
488
 
@@ -571,17 +570,17 @@ module Generators
571
570
  atts.each do |att|
572
571
  next unless att.section == section
573
572
 
574
- if att.visibility == :public || att.visibility == :protected || @options.show_all
575
- entry = {
576
- "name" => CGI.escapeHTML(att.name),
577
- "rw" => att.rw,
578
- "a_desc" => markup(att.comment, true)
579
- }
580
- unless att.visibility == :public || att.visibility == :protected
581
- entry["rw"] << "-"
582
- end
583
- res << entry
573
+ next unless att.visibility == :public || att.visibility == :protected || @options.show_all
574
+
575
+ entry = {
576
+ "name" => CGI.escapeHTML(att.name),
577
+ "rw" => att.rw,
578
+ "a_desc" => markup(att.comment, true)
579
+ }
580
+ unless att.visibility == :public || att.visibility == :protected
581
+ entry["rw"] << "-"
584
582
  end
583
+ res << entry
585
584
  end
586
585
  res
587
586
  end
@@ -643,7 +642,7 @@ module Generators
643
642
  end
644
643
 
645
644
  def <=>(other)
646
- self.name <=> other.name
645
+ name <=> other.name
647
646
  end
648
647
  end
649
648
 
@@ -668,13 +667,13 @@ module Generators
668
667
  prefix = "&nbsp;&nbsp;::" * level;
669
668
 
670
669
  context.nodes.sort.each do |node|
671
- if node.document_self
672
- res <<
673
- prefix <<
674
- "Node " <<
675
- href(url(node.viewer.path), "link", node.full_name) <<
676
- "<br />\n"
677
- end
670
+ next unless node.document_self
671
+
672
+ res <<
673
+ prefix <<
674
+ "Node " <<
675
+ href(url(node.viewer.path), "link", node.full_name) <<
676
+ "<br />\n"
678
677
  end
679
678
  res
680
679
  end
@@ -725,7 +724,7 @@ module Generators
725
724
  # which is also its url
726
725
  def http_url(full_name, prefix)
727
726
  path = full_name.dup
728
- path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
727
+ path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
729
728
  File.join(prefix, path.split("::")) + ".html"
730
729
  end
731
730
 
@@ -810,7 +809,7 @@ module Generators
810
809
  end
811
810
 
812
811
  def <=>(other)
813
- self.name <=> other.name
812
+ name <=> other.name
814
813
  end
815
814
  end
816
815
 
@@ -850,7 +849,7 @@ module Generators
850
849
  end
851
850
 
852
851
  def index_name
853
- "#{@context.name}"
852
+ @context.name.to_s
854
853
  end
855
854
 
856
855
  def params