puppet 5.4.0-x64-mingw32 → 5.5.0-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (441) hide show
  1. data/Gemfile +3 -3
  2. data/MAINTAINERS +0 -19
  3. data/README.md +5 -5
  4. data/Rakefile +26 -0
  5. data/conf/auth.conf +5 -0
  6. data/ext/project_data.yaml +1 -0
  7. data/ext/regexp_nodes/regexp_nodes.rb +3 -4
  8. data/lib/puppet/application/apply.rb +1 -1
  9. data/lib/puppet/application/cert.rb +3 -1
  10. data/lib/puppet/application/device.rb +100 -13
  11. data/lib/puppet/application/facts.rb +5 -0
  12. data/lib/puppet/application/lookup.rb +12 -2
  13. data/lib/puppet/configurer.rb +37 -17
  14. data/lib/puppet/confine.rb +4 -1
  15. data/lib/puppet/datatypes.rb +1 -1
  16. data/lib/puppet/environments.rb +1 -1
  17. data/lib/puppet/error.rb +6 -3
  18. data/lib/puppet/external/dot.rb +0 -7
  19. data/lib/puppet/external/nagios/parser.rb +1 -1
  20. data/lib/puppet/face/config.rb +92 -10
  21. data/lib/puppet/face/epp.rb +31 -6
  22. data/lib/puppet/face/facts.rb +49 -0
  23. data/lib/puppet/face/help.rb +33 -35
  24. data/lib/puppet/face/help/action.erb +1 -1
  25. data/lib/puppet/face/help/face.erb +1 -1
  26. data/lib/puppet/face/man.rb +55 -12
  27. data/lib/puppet/face/parser.rb +30 -3
  28. data/lib/puppet/file_bucket/file.rb +0 -2
  29. data/lib/puppet/file_serving/base.rb +10 -10
  30. data/lib/puppet/forge.rb +3 -3
  31. data/lib/puppet/forge/errors.rb +3 -3
  32. data/lib/puppet/functions.rb +1 -3
  33. data/lib/puppet/functions/alert.rb +1 -1
  34. data/lib/puppet/functions/all.rb +6 -6
  35. data/lib/puppet/functions/annotate.rb +10 -10
  36. data/lib/puppet/functions/any.rb +6 -6
  37. data/lib/puppet/functions/assert_type.rb +4 -4
  38. data/lib/puppet/functions/binary_file.rb +14 -2
  39. data/lib/puppet/functions/break.rb +31 -2
  40. data/lib/puppet/functions/call.rb +4 -4
  41. data/lib/puppet/functions/contain.rb +19 -3
  42. data/lib/puppet/functions/convert_to.rb +6 -5
  43. data/lib/puppet/functions/crit.rb +1 -1
  44. data/lib/puppet/functions/debug.rb +1 -1
  45. data/lib/puppet/functions/defined.rb +11 -9
  46. data/lib/puppet/functions/dig.rb +26 -2
  47. data/lib/puppet/functions/each.rb +8 -8
  48. data/lib/puppet/functions/emerg.rb +1 -1
  49. data/lib/puppet/functions/empty.rb +79 -0
  50. data/lib/puppet/functions/err.rb +1 -1
  51. data/lib/puppet/functions/eyaml_lookup_key.rb +3 -1
  52. data/lib/puppet/functions/filter.rb +7 -7
  53. data/lib/puppet/functions/find_file.rb +15 -1
  54. data/lib/puppet/functions/flatten.rb +64 -0
  55. data/lib/puppet/functions/hiera.rb +6 -6
  56. data/lib/puppet/functions/hiera_array.rb +6 -6
  57. data/lib/puppet/functions/hiera_hash.rb +6 -6
  58. data/lib/puppet/functions/hiera_include.rb +8 -8
  59. data/lib/puppet/functions/include.rb +28 -2
  60. data/lib/puppet/functions/info.rb +1 -1
  61. data/lib/puppet/functions/inline_epp.rb +2 -2
  62. data/lib/puppet/functions/join.rb +56 -0
  63. data/lib/puppet/functions/json_data.rb +2 -2
  64. data/lib/puppet/functions/keys.rb +25 -0
  65. data/lib/puppet/functions/length.rb +44 -0
  66. data/lib/puppet/functions/lest.rb +39 -1
  67. data/lib/puppet/functions/lookup.rb +2 -1
  68. data/lib/puppet/functions/map.rb +10 -9
  69. data/lib/puppet/functions/match.rb +6 -6
  70. data/lib/puppet/functions/new.rb +995 -2
  71. data/lib/puppet/functions/next.rb +1 -1
  72. data/lib/puppet/functions/notice.rb +1 -1
  73. data/lib/puppet/functions/reduce.rb +6 -6
  74. data/lib/puppet/functions/regsubst.rb +9 -3
  75. data/lib/puppet/functions/require.rb +36 -2
  76. data/lib/puppet/functions/return.rb +1 -1
  77. data/lib/puppet/functions/reverse_each.rb +71 -2
  78. data/lib/puppet/functions/slice.rb +23 -9
  79. data/lib/puppet/functions/split.rb +12 -10
  80. data/lib/puppet/functions/step.rb +73 -1
  81. data/lib/puppet/functions/strftime.rb +176 -2
  82. data/lib/puppet/functions/then.rb +65 -2
  83. data/lib/puppet/functions/tree_each.rb +19 -19
  84. data/lib/puppet/functions/type.rb +42 -1
  85. data/lib/puppet/functions/unique.rb +13 -13
  86. data/lib/puppet/functions/unwrap.rb +8 -4
  87. data/lib/puppet/functions/values.rb +25 -0
  88. data/lib/puppet/functions/versioncmp.rb +1 -1
  89. data/lib/puppet/functions/warning.rb +1 -1
  90. data/lib/puppet/functions/with.rb +6 -4
  91. data/lib/puppet/functions/yaml_data.rb +3 -1
  92. data/lib/puppet/indirector/certificate_status/file.rb +1 -1
  93. data/lib/puppet/indirector/facts/facter.rb +1 -3
  94. data/lib/puppet/indirector/facts/rest.rb +21 -0
  95. data/lib/puppet/indirector/facts/yaml.rb +0 -4
  96. data/lib/puppet/indirector/rest.rb +2 -2
  97. data/lib/puppet/module.rb +3 -3
  98. data/lib/puppet/module/task.rb +2 -3
  99. data/lib/puppet/module_tool/applications/application.rb +4 -4
  100. data/lib/puppet/module_tool/applications/builder.rb +2 -2
  101. data/lib/puppet/module_tool/applications/checksummer.rb +3 -3
  102. data/lib/puppet/module_tool/applications/unpacker.rb +2 -2
  103. data/lib/puppet/module_tool/metadata.rb +3 -3
  104. data/lib/puppet/network/authconfig.rb +1 -1
  105. data/lib/puppet/network/format_support.rb +1 -1
  106. data/lib/puppet/network/formats.rb +5 -7
  107. data/lib/puppet/network/http/api/indirected_routes.rb +1 -0
  108. data/lib/puppet/network/http/api/master/v3/environment.rb +2 -2
  109. data/lib/puppet/network/http/api/master/v3/environments.rb +2 -2
  110. data/lib/puppet/network/http/error.rb +3 -3
  111. data/lib/puppet/network/resolver.rb +1 -2
  112. data/lib/puppet/parser/compiler.rb +12 -5
  113. data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +1 -1
  114. data/lib/puppet/parser/functions/fqdn_rand.rb +15 -4
  115. data/lib/puppet/parser/functions/new.rb +31 -46
  116. data/lib/puppet/parser/parser_factory.rb +1 -1
  117. data/lib/puppet/parser/resource.rb +1 -1
  118. data/lib/puppet/parser/type_loader.rb +11 -11
  119. data/lib/puppet/pops/evaluator/closure.rb +1 -1
  120. data/lib/puppet/pops/evaluator/collector_transformer.rb +1 -1
  121. data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
  122. data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +2 -2
  123. data/lib/puppet/pops/evaluator/runtime3_support.rb +5 -2
  124. data/lib/puppet/pops/functions/dispatch.rb +1 -1
  125. data/lib/puppet/pops/issue_reporter.rb +18 -1
  126. data/lib/puppet/pops/issues.rb +6 -3
  127. data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -2
  128. data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -2
  129. data/lib/puppet/pops/loader/task_instantiator.rb +5 -5
  130. data/lib/puppet/pops/loader/type_definition_instantiator.rb +4 -1
  131. data/lib/puppet/pops/loaders.rb +18 -7
  132. data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
  133. data/lib/puppet/pops/lookup/lookup_adapter.rb +55 -6
  134. data/lib/puppet/pops/model/factory.rb +6 -3
  135. data/lib/puppet/pops/model/model_tree_dumper.rb +4 -0
  136. data/lib/puppet/pops/model/pn_transformer.rb +400 -0
  137. data/lib/puppet/pops/parser/egrammar.ra +1 -1
  138. data/lib/puppet/pops/parser/eparser.rb +1 -1
  139. data/lib/puppet/pops/parser/heredoc_support.rb +1 -1
  140. data/lib/puppet/pops/parser/lexer_support.rb +3 -2
  141. data/lib/puppet/pops/parser/locator.rb +0 -2
  142. data/lib/puppet/pops/parser/pn_parser.rb +316 -0
  143. data/lib/puppet/pops/pcore.rb +17 -17
  144. data/lib/puppet/pops/pn.rb +236 -0
  145. data/lib/puppet/pops/serialization/json.rb +7 -7
  146. data/lib/puppet/pops/types/class_loader.rb +6 -3
  147. data/lib/puppet/pops/types/implementation_registry.rb +28 -35
  148. data/lib/puppet/pops/types/p_object_type.rb +3 -3
  149. data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
  150. data/lib/puppet/pops/types/p_type_set_type.rb +24 -1
  151. data/lib/puppet/pops/types/ruby_generator.rb +3 -4
  152. data/lib/puppet/pops/types/type_calculator.rb +1 -1
  153. data/lib/puppet/pops/types/type_factory.rb +0 -4
  154. data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
  155. data/lib/puppet/pops/types/type_parser.rb +14 -7
  156. data/lib/puppet/pops/types/types.rb +1 -1
  157. data/lib/puppet/pops/utils.rb +2 -2
  158. data/lib/puppet/pops/validation/checker4_0.rb +6 -2
  159. data/lib/puppet/provider/group/groupadd.rb +3 -1
  160. data/lib/puppet/provider/group/windows_adsi.rb +4 -7
  161. data/lib/puppet/provider/nameservice.rb +3 -3
  162. data/lib/puppet/provider/package/pacman.rb +4 -4
  163. data/lib/puppet/provider/package/pip.rb +3 -3
  164. data/lib/puppet/provider/package/pkgdmg.rb +3 -3
  165. data/lib/puppet/provider/package/pkgutil.rb +2 -2
  166. data/lib/puppet/provider/package/portage.rb +9 -9
  167. data/lib/puppet/provider/package/zypper.rb +2 -2
  168. data/lib/puppet/provider/service/base.rb +1 -1
  169. data/lib/puppet/provider/service/smf.rb +3 -2
  170. data/lib/puppet/provider/service/systemd.rb +1 -1
  171. data/lib/puppet/provider/user/useradd.rb +6 -2
  172. data/lib/puppet/provider/user/windows_adsi.rb +1 -1
  173. data/lib/puppet/provider/yumrepo/inifile.rb +20 -9
  174. data/lib/puppet/provider/zfs/zfs.rb +1 -1
  175. data/lib/puppet/reference/configuration.rb +2 -0
  176. data/lib/puppet/reference/type.rb +11 -11
  177. data/lib/puppet/resource.rb +1 -1
  178. data/lib/puppet/resource/capability_finder.rb +5 -5
  179. data/lib/puppet/resource/catalog.rb +6 -3
  180. data/lib/puppet/resource/status.rb +9 -2
  181. data/lib/puppet/resource/type.rb +1 -1
  182. data/lib/puppet/settings.rb +31 -19
  183. data/lib/puppet/settings/base_setting.rb +5 -0
  184. data/lib/puppet/settings/config_file.rb +1 -1
  185. data/lib/puppet/settings/ttl_setting.rb +5 -0
  186. data/lib/puppet/ssl/certificate_factory.rb +2 -2
  187. data/lib/puppet/ssl/certificate_request.rb +0 -2
  188. data/lib/puppet/syntax_checkers/json.rb +1 -1
  189. data/lib/puppet/transaction/additional_resource_generator.rb +2 -2
  190. data/lib/puppet/transaction/event.rb +1 -1
  191. data/lib/puppet/transaction/report.rb +18 -12
  192. data/lib/puppet/type.rb +9 -13
  193. data/lib/puppet/type/augeas.rb +2 -2
  194. data/lib/puppet/type/cron.rb +11 -6
  195. data/lib/puppet/type/exec.rb +1 -1
  196. data/lib/puppet/type/file.rb +4 -5
  197. data/lib/puppet/type/host.rb +1 -1
  198. data/lib/puppet/type/k5login.rb +30 -54
  199. data/lib/puppet/type/package.rb +3 -3
  200. data/lib/puppet/type/schedule.rb +12 -12
  201. data/lib/puppet/type/scheduled_task.rb +2 -2
  202. data/lib/puppet/type/ssh_authorized_key.rb +5 -5
  203. data/lib/puppet/type/sshkey.rb +2 -2
  204. data/lib/puppet/type/tidy.rb +1 -1
  205. data/lib/puppet/type/user.rb +1 -1
  206. data/lib/puppet/type/yumrepo.rb +26 -5
  207. data/lib/puppet/util.rb +0 -4
  208. data/lib/puppet/util/backups.rb +1 -1
  209. data/lib/puppet/util/inifile.rb +3 -4
  210. data/lib/puppet/util/json.rb +68 -0
  211. data/lib/puppet/util/json_lockfile.rb +3 -3
  212. data/lib/puppet/util/log.rb +2 -5
  213. data/lib/puppet/util/log/destinations.rb +2 -2
  214. data/lib/puppet/util/network_device/cisco/facts.rb +1 -1
  215. data/lib/puppet/util/plist.rb +1 -1
  216. data/lib/puppet/util/reference.rb +1 -8
  217. data/lib/puppet/util/tagging.rb +1 -1
  218. data/lib/puppet/util/warnings.rb +0 -2
  219. data/lib/puppet/util/windows/adsi.rb +15 -18
  220. data/lib/puppet/util/windows/com.rb +2 -1
  221. data/lib/puppet/util/windows/file.rb +2 -2
  222. data/lib/puppet/util/windows/principal.rb +7 -6
  223. data/lib/puppet/util/windows/sid.rb +60 -7
  224. data/lib/puppet/util/windows/taskscheduler.rb +0 -9
  225. data/lib/puppet/version.rb +1 -1
  226. data/lib/puppet_pal.rb +53 -48
  227. data/locales/ja/puppet.po +1357 -912
  228. data/locales/puppet.pot +549 -466
  229. data/man/man5/puppet.conf.5 +103 -20
  230. data/man/man8/puppet-agent.8 +6 -2
  231. data/man/man8/puppet-apply.8 +2 -2
  232. data/man/man8/puppet-ca.8 +1 -1
  233. data/man/man8/puppet-catalog.8 +1 -1
  234. data/man/man8/puppet-cert.8 +1 -1
  235. data/man/man8/puppet-certificate.8 +1 -1
  236. data/man/man8/puppet-certificate_request.8 +1 -1
  237. data/man/man8/puppet-certificate_revocation_list.8 +1 -1
  238. data/man/man8/puppet-config.8 +35 -1
  239. data/man/man8/puppet-describe.8 +1 -1
  240. data/man/man8/puppet-device.8 +33 -11
  241. data/man/man8/puppet-doc.8 +1 -1
  242. data/man/man8/puppet-epp.8 +34 -12
  243. data/man/man8/puppet-facts.8 +50 -1
  244. data/man/man8/puppet-filebucket.8 +38 -11
  245. data/man/man8/puppet-generate.8 +1 -1
  246. data/man/man8/puppet-help.8 +1 -1
  247. data/man/man8/puppet-key.8 +1 -1
  248. data/man/man8/puppet-lookup.8 +1 -1
  249. data/man/man8/puppet-man.8 +10 -4
  250. data/man/man8/puppet-master.8 +1 -1
  251. data/man/man8/puppet-module.8 +15 -6
  252. data/man/man8/puppet-node.8 +1 -1
  253. data/man/man8/puppet-parser.8 +31 -8
  254. data/man/man8/puppet-plugin.8 +1 -1
  255. data/man/man8/puppet-report.8 +1 -1
  256. data/man/man8/puppet-resource.8 +1 -1
  257. data/man/man8/puppet-script.8 +67 -0
  258. data/man/man8/puppet-status.8 +1 -1
  259. data/man/man8/puppet.8 +3 -3
  260. data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet_x/awesome2/echo_scheme_handler.rb +1 -1
  261. data/spec/integration/application/apply_spec.rb +15 -15
  262. data/spec/integration/application/lookup_spec.rb +21 -0
  263. data/spec/integration/faces/config_spec.rb +16 -4
  264. data/spec/integration/network/http/api/indirected_routes_spec.rb +5 -5
  265. data/spec/integration/parser/catalog_spec.rb +1 -1
  266. data/spec/integration/parser/collection_spec.rb +2 -2
  267. data/spec/integration/parser/compiler_spec.rb +17 -18
  268. data/spec/integration/parser/pcore_resource_spec.rb +2 -2
  269. data/spec/integration/parser/scope_spec.rb +2 -2
  270. data/spec/integration/ssl/certificate_authority_spec.rb +7 -7
  271. data/spec/integration/ssl/certificate_revocation_list_spec.rb +1 -1
  272. data/spec/integration/ssl/key_spec.rb +1 -1
  273. data/spec/integration/transaction/report_spec.rb +3 -3
  274. data/spec/integration/transaction_spec.rb +0 -1
  275. data/spec/integration/type/file_spec.rb +10 -11
  276. data/spec/integration/type_spec.rb +1 -2
  277. data/spec/integration/util/windows/adsi_spec.rb +86 -1
  278. data/spec/integration/util/windows/principal_spec.rb +11 -2
  279. data/spec/integration/util/windows/security_spec.rb +2 -2
  280. data/spec/lib/matchers/json.rb +4 -4
  281. data/spec/lib/puppet_spec/language.rb +34 -35
  282. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +2 -2
  283. data/spec/shared_behaviours/file_server_terminus.rb +0 -2
  284. data/spec/shared_behaviours/things_that_declare_options.rb +2 -2
  285. data/spec/spec_helper.rb +1 -1
  286. data/spec/unit/application/cert_spec.rb +21 -9
  287. data/spec/unit/application/device_spec.rb +96 -2
  288. data/spec/unit/application/face_base_spec.rb +2 -2
  289. data/spec/unit/application/lookup_spec.rb +0 -1
  290. data/spec/unit/configurer_spec.rb +14 -0
  291. data/spec/unit/confine_spec.rb +16 -0
  292. data/spec/unit/data_providers/hiera_data_provider_spec.rb +4 -4
  293. data/spec/unit/datatypes_spec.rb +49 -0
  294. data/spec/unit/environments_spec.rb +7 -0
  295. data/spec/unit/face/config_spec.rb +116 -12
  296. data/spec/unit/face/epp_face_spec.rb +53 -2
  297. data/spec/unit/face/facts_spec.rb +53 -0
  298. data/spec/unit/face/help_spec.rb +62 -69
  299. data/spec/unit/face/man_spec.rb +26 -0
  300. data/spec/unit/face/module/list_spec.rb +0 -1
  301. data/spec/unit/face/parser_spec.rb +78 -0
  302. data/spec/unit/file_bucket/dipper_spec.rb +0 -4
  303. data/spec/unit/file_serving/content_spec.rb +0 -1
  304. data/spec/unit/file_serving/fileset_spec.rb +0 -1
  305. data/spec/unit/file_serving/metadata_spec.rb +0 -1
  306. data/spec/unit/file_serving/terminus_selector_spec.rb +0 -2
  307. data/spec/unit/forge_spec.rb +1 -2
  308. data/spec/unit/functions/assert_type_spec.rb +1 -1
  309. data/spec/unit/functions/empty_spec.rb +77 -0
  310. data/spec/unit/functions/epp_spec.rb +1 -1
  311. data/spec/unit/functions/flatten_spec.rb +31 -0
  312. data/spec/unit/functions/include_spec.rb +2 -2
  313. data/spec/unit/functions/inline_epp_spec.rb +1 -1
  314. data/spec/unit/functions/join_spec.rb +33 -0
  315. data/spec/unit/functions/keys_spec.rb +31 -0
  316. data/spec/unit/functions/length_spec.rb +50 -0
  317. data/spec/unit/functions/lookup_fixture_spec.rb +1 -1
  318. data/spec/unit/functions/lookup_spec.rb +52 -0
  319. data/spec/unit/functions/shared.rb +1 -1
  320. data/spec/unit/functions/values_spec.rb +30 -0
  321. data/spec/unit/functions/versioncmp_spec.rb +1 -1
  322. data/spec/unit/functions4_spec.rb +30 -32
  323. data/spec/unit/graph/title_hash_prioritizer_spec.rb +2 -1
  324. data/spec/unit/indirector/catalog/compiler_spec.rb +0 -15
  325. data/spec/unit/indirector/facts/rest_spec.rb +45 -0
  326. data/spec/unit/indirector/facts/yaml_spec.rb +6 -0
  327. data/spec/unit/indirector/file_bucket_file/file_spec.rb +2 -2
  328. data/spec/unit/indirector/indirection_spec.rb +1 -1
  329. data/spec/unit/indirector/node/ldap_spec.rb +2 -2
  330. data/spec/unit/indirector/request_spec.rb +0 -2
  331. data/spec/unit/indirector/rest_spec.rb +2 -2
  332. data/spec/unit/indirector_spec.rb +0 -1
  333. data/spec/unit/info_service_spec.rb +1 -1
  334. data/spec/unit/interface/action_manager_spec.rb +1 -1
  335. data/spec/unit/interface/action_spec.rb +1 -1
  336. data/spec/unit/module_spec.rb +0 -5
  337. data/spec/unit/module_tool/applications/builder_spec.rb +1 -1
  338. data/spec/unit/module_tool/applications/unpacker_spec.rb +4 -4
  339. data/spec/unit/network/formats_spec.rb +5 -13
  340. data/spec/unit/network/http/api/indirected_routes_spec.rb +6 -2
  341. data/spec/unit/network/http/connection_spec.rb +1 -1
  342. data/spec/unit/network/http/handler_spec.rb +3 -2
  343. data/spec/unit/node/environment_spec.rb +1 -1
  344. data/spec/unit/node_spec.rb +3 -3
  345. data/spec/unit/parser/compiler_spec.rb +9 -2
  346. data/spec/unit/parser/environment_compiler_spec.rb +8 -8
  347. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  348. data/spec/unit/parser/functions/fail_spec.rb +1 -1
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +24 -0
  350. data/spec/unit/parser/functions/realize_spec.rb +1 -1
  351. data/spec/unit/parser/resource_spec.rb +0 -1
  352. data/spec/unit/parser/scope_spec.rb +3 -3
  353. data/spec/unit/parser/type_loader_spec.rb +1 -1
  354. data/spec/unit/pops/adaptable_spec.rb +0 -1
  355. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +0 -3
  356. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -4
  357. data/spec/unit/pops/factory_rspec_helper.rb +1 -1
  358. data/spec/unit/pops/factory_spec.rb +5 -5
  359. data/spec/unit/pops/issues_spec.rb +23 -8
  360. data/spec/unit/pops/loaders/loaders_spec.rb +24 -2
  361. data/spec/unit/pops/loaders/static_loader_spec.rb +1 -1
  362. data/spec/unit/pops/lookup/interpolation_spec.rb +5 -0
  363. data/spec/unit/pops/lookup/lookup_spec.rb +56 -0
  364. data/spec/unit/pops/model/pn_transformer_spec.rb +53 -0
  365. data/spec/unit/pops/parser/lexer2_spec.rb +14 -5
  366. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +9 -9
  367. data/spec/unit/pops/parser/parse_calls_spec.rb +1 -1
  368. data/spec/unit/pops/parser/parse_functions_spec.rb +1 -1
  369. data/spec/unit/pops/parser/parse_heredoc_spec.rb +3 -3
  370. data/spec/unit/pops/parser/parse_lambda_spec.rb +1 -1
  371. data/spec/unit/pops/parser/parse_resource_spec.rb +35 -35
  372. data/spec/unit/pops/parser/pn_parser_spec.rb +101 -0
  373. data/spec/unit/pops/pn_spec.rb +148 -0
  374. data/spec/unit/pops/types/iterable_spec.rb +1 -1
  375. data/spec/unit/pops/types/p_object_type_spec.rb +5 -5
  376. data/spec/unit/pops/types/p_timespan_type_spec.rb +11 -4
  377. data/spec/unit/pops/types/p_timestamp_type_spec.rb +9 -2
  378. data/spec/unit/pops/types/p_type_set_type_spec.rb +106 -2
  379. data/spec/unit/pops/types/ruby_generator_spec.rb +3 -8
  380. data/spec/unit/pops/types/string_converter_spec.rb +3 -3
  381. data/spec/unit/pops/types/type_calculator_spec.rb +1 -1
  382. data/spec/unit/pops/validator/validator_spec.rb +3 -1
  383. data/spec/unit/property_spec.rb +2 -2
  384. data/spec/unit/provider/aixobject_spec.rb +1 -1
  385. data/spec/unit/provider/cron/crontab_spec.rb +3 -3
  386. data/spec/unit/provider/exec/posix_spec.rb +6 -6
  387. data/spec/unit/provider/group/groupadd_spec.rb +4 -4
  388. data/spec/unit/provider/group/windows_adsi_spec.rb +79 -22
  389. data/spec/unit/provider/ldap_spec.rb +0 -1
  390. data/spec/unit/provider/nameservice_spec.rb +5 -5
  391. data/spec/unit/provider/package/rpm_spec.rb +3 -4
  392. data/spec/unit/provider/package/yum_spec.rb +6 -2
  393. data/spec/unit/provider/parsedfile_spec.rb +1 -1
  394. data/spec/unit/provider/service/base_spec.rb +2 -4
  395. data/spec/unit/provider/service/init_spec.rb +2 -2
  396. data/spec/unit/provider/service/openrc_spec.rb +2 -2
  397. data/spec/unit/provider/service/redhat_spec.rb +2 -2
  398. data/spec/unit/provider/service/smf_spec.rb +2 -0
  399. data/spec/unit/provider/service/systemd_spec.rb +3 -3
  400. data/spec/unit/provider/service/upstart_spec.rb +7 -7
  401. data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +0 -4
  402. data/spec/unit/provider/sshkey/parsed_spec.rb +0 -2
  403. data/spec/unit/provider/user/useradd_spec.rb +15 -9
  404. data/spec/unit/provider/user/windows_adsi_spec.rb +4 -4
  405. data/spec/unit/provider/yumrepo/inifile_spec.rb +76 -0
  406. data/spec/unit/puppet_pal_2pec.rb +4 -5
  407. data/spec/unit/resource/catalog_spec.rb +8 -3
  408. data/spec/unit/resource/status_spec.rb +15 -4
  409. data/spec/unit/resource/type_spec.rb +2 -3
  410. data/spec/unit/settings_spec.rb +9 -4
  411. data/spec/unit/ssl/certificate_authority_spec.rb +1 -9
  412. data/spec/unit/ssl/certificate_request_spec.rb +1 -2
  413. data/spec/unit/transaction/report_spec.rb +41 -0
  414. data/spec/unit/transaction_spec.rb +1 -1
  415. data/spec/unit/type/exec_spec.rb +7 -9
  416. data/spec/unit/type/file/selinux_spec.rb +0 -1
  417. data/spec/unit/type/file_spec.rb +4 -3
  418. data/spec/unit/type/k5login_spec.rb +79 -10
  419. data/spec/unit/type/mount_spec.rb +1 -1
  420. data/spec/unit/type/nagios_spec.rb +6 -6
  421. data/spec/unit/type/user_spec.rb +1 -1
  422. data/spec/unit/type/yumrepo_spec.rb +18 -0
  423. data/spec/unit/type/zfs_spec.rb +1 -1
  424. data/spec/unit/type_spec.rb +14 -15
  425. data/spec/unit/util/docs_spec.rb +1 -1
  426. data/spec/unit/util/execution_spec.rb +0 -1
  427. data/spec/unit/util/inifile_spec.rb +35 -4
  428. data/spec/unit/util/log/destinations_spec.rb +2 -2
  429. data/spec/unit/util/log_spec.rb +6 -5
  430. data/spec/unit/util/network_device/cisco/device_spec.rb +2 -2
  431. data/spec/unit/util/plist_spec.rb +3 -3
  432. data/spec/unit/util/selinux_spec.rb +2 -2
  433. data/spec/unit/util/tagging_spec.rb +1 -7
  434. data/spec/unit/util/windows/adsi_spec.rb +31 -27
  435. data/spec/unit/util/windows/sid_spec.rb +86 -15
  436. data/spec/unit/util_spec.rb +2 -2
  437. data/spec/watchr.rb +0 -1
  438. data/tasks/benchmark.rake +37 -0
  439. data/tasks/manpages.rake +1 -1
  440. metadata +83 -11
  441. checksums.yaml +0 -7
@@ -374,14 +374,13 @@ describe Puppet::SSL::CertificateRequest do
374
374
  end
375
375
 
376
376
  it "should raise an error if neither SHA256/SHA1/SHA512/SHA384/SHA224 are available" do
377
- csr = OpenSSL::X509::Request.new
378
377
  OpenSSL::Digest.expects(:const_defined?).with("SHA256").returns(false)
379
378
  OpenSSL::Digest.expects(:const_defined?).with("SHA1").returns(false)
380
379
  OpenSSL::Digest.expects(:const_defined?).with("SHA512").returns(false)
381
380
  OpenSSL::Digest.expects(:const_defined?).with("SHA384").returns(false)
382
381
  OpenSSL::Digest.expects(:const_defined?).with("SHA224").returns(false)
383
382
  expect {
384
- signer = Puppet::SSL::CertificateSigner.new
383
+ Puppet::SSL::CertificateSigner.new
385
384
  }.to raise_error(Puppet::Error)
386
385
  end
387
386
  end
@@ -357,6 +357,36 @@ describe Puppet::Transaction::Report do
357
357
  expect(metric(:time, "tidy")).to eq(9)
358
358
  end
359
359
 
360
+ it "should provide the total time for all time metrics collected" do
361
+ add_statuses(3, :file) do |status|
362
+ status.evaluation_time = 1
363
+ end
364
+ add_statuses(3, :exec) do |status|
365
+ status.evaluation_time = 2
366
+ end
367
+ add_statuses(3, :tidy) do |status|
368
+ status.evaluation_time = 3
369
+ end
370
+
371
+ @report.finalize_report
372
+
373
+ expect(metric(:time, "total")).to eq(18)
374
+ end
375
+
376
+ it "should accrue times when called for one resource more than once" do
377
+ @report.add_times :foobar, 50
378
+ @report.add_times :foobar, 30
379
+ @report.finalize_report
380
+ expect(metric(:time, "foobar")).to eq(80)
381
+ end
382
+
383
+ it "should not accrue times when called for one resource more than once when set" do
384
+ @report.add_times :foobar, 50, false
385
+ @report.add_times :foobar, 30, false
386
+ @report.finalize_report
387
+ expect(metric(:time, "foobar")).to eq(30)
388
+ end
389
+
360
390
  it "should add any provided times from external sources" do
361
391
  @report.add_times :foobar, 50
362
392
  @report.finalize_report
@@ -450,6 +480,7 @@ describe Puppet::Transaction::Report do
450
480
 
451
481
  describe "when producing a summary" do
452
482
  before do
483
+ Benchmark.stubs(:realtime).returns(5.05683418)
453
484
  resource = Puppet::Type.type(:notify).new(:name => "testing")
454
485
  catalog = Puppet::Resource::Catalog.new
455
486
  catalog.add_resource resource
@@ -498,6 +529,15 @@ describe Puppet::Transaction::Report do
498
529
  expect(@report.summary).to be_include(main)
499
530
  end
500
531
  end
532
+
533
+ it 'should sort total at the very end of the time metrics' do
534
+ expect(@report.summary).to match(/
535
+ Last run: \d+
536
+ Transaction evaluation: \d+.\d{2}
537
+ Total: \d+.\d{2}
538
+ Version:
539
+ /)
540
+ end
501
541
  end
502
542
 
503
543
  describe "when outputting yaml" do
@@ -613,6 +653,7 @@ describe Puppet::Transaction::Report do
613
653
  expect(status.line).to eq(expected.line)
614
654
  expect(status.resource).to eq(expected.resource)
615
655
  expect(status.resource_type).to eq(expected.resource_type)
656
+ expect(status.provider_used).to eq(expected.provider_used)
616
657
  expect(status.containment_path).to eq(expected.containment_path)
617
658
  expect(status.evaluation_time).to eq(expected.evaluation_time)
618
659
  expect(status.tags).to eq(expected.tags)
@@ -91,7 +91,7 @@ describe Puppet::Transaction do
91
91
 
92
92
  report.expects(:add_times).with(:config_retrieval, 5)
93
93
 
94
- transaction = Puppet::Transaction.new(catalog, report, nil)
94
+ Puppet::Transaction.new(catalog, report, nil)
95
95
  end
96
96
  end
97
97
 
@@ -12,7 +12,7 @@ describe Puppet::Type.type(:exec) do
12
12
  output = Puppet::Util::Execution::ProcessOutput.new(output, exitstatus)
13
13
  tries = rest[:tries] || 1
14
14
 
15
- args = {
15
+ type_args = {
16
16
  :name => command,
17
17
  :path => @example_path,
18
18
  :logoutput => false,
@@ -20,15 +20,13 @@ describe Puppet::Type.type(:exec) do
20
20
  :returns => 0
21
21
  }.merge(rest)
22
22
 
23
- exec = Puppet::Type.type(:exec).new(args)
23
+ exec = Puppet::Type.type(:exec).new(type_args)
24
24
 
25
- status = stub "process", :exitstatus => exitstatus
26
- Puppet::Util::Execution.expects(:execute).times(tries).
27
- with() { |*args|
28
- args[0] == command &&
29
- args[1][:override_locale] == false &&
30
- args[1].has_key?(:custom_environment)
31
- }.returns(output)
25
+ Puppet::Util::Execution.expects(:execute).times(tries).with() do |*args|
26
+ args[0] == command &&
27
+ args[1][:override_locale] == false &&
28
+ args[1].has_key?(:custom_environment)
29
+ end.returns(output)
32
30
 
33
31
  return exec
34
32
  end
@@ -75,7 +75,6 @@ require 'spec_helper'
75
75
  end
76
76
 
77
77
  it "should be able to set a new context" do
78
- stat = stub 'stat', :ftype => "foo"
79
78
  @sel.should = %w{newone}
80
79
  @sel.expects(:set_selinux_context).with(@path, ["newone"], param)
81
80
  @sel.sync
@@ -384,8 +384,9 @@ describe Puppet::Type.type(:file) do
384
384
  describe "#mark_children_for_purging" do
385
385
  it "should set each child's ensure to absent" do
386
386
  paths = %w[foo bar baz]
387
- children = paths.inject({}) do |children,child|
388
- children.merge child => described_class.new(:path => File.join(path, child), :ensure => :present)
387
+ children = {}
388
+ paths.each do |child|
389
+ children[child] = described_class.new(:path => File.join(path, child), :ensure => :present)
389
390
  end
390
391
 
391
392
  file.mark_children_for_purging(children)
@@ -1096,7 +1097,7 @@ describe Puppet::Type.type(:file) do
1096
1097
  end
1097
1098
 
1098
1099
  it "should cache the stat instance" do
1099
- expect(file.stat).to equal(file.stat)
1100
+ expect(file.stat.object_id).to eql(file.stat.object_id)
1100
1101
  end
1101
1102
  end
1102
1103
 
@@ -77,16 +77,37 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
77
77
  end
78
78
  end
79
79
 
80
- context "with selinux" do
81
- subject { resource(:content => "daniel@EXAMPLE.COM\n",).retrieve }
82
- it "should return correct values based on SELinux state" do
83
- Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:selinux_support?).returns true
84
- Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:get_selinux_current_context).returns "user_u:role_r:type_t:s0"
85
-
86
- expect(subject[:seluser]).to eq("user_u")
87
- expect(subject[:selrole]).to eq("role_r")
88
- expect(subject[:seltype]).to eq("type_t")
89
- expect(subject[:selrange]).to eq("s0")
80
+ [:seluser, :selrole, :seltype, :selrange].each do |param|
81
+ property = described_class.attrclass(param)
82
+ context param.to_s do
83
+ let(:sel_param) { property.new :resource => resource }
84
+
85
+ context "with selinux" do
86
+ it "should return correct values based on SELinux state" do
87
+ sel_param.stubs(:debug)
88
+ expectedresult = case param
89
+ when :seluser; "user_u"
90
+ when :selrole; "object_r"
91
+ when :seltype; "krb5_home_t"
92
+ when :selrange; "s0"
93
+ end
94
+ expect(sel_param.default).to eq(expectedresult)
95
+ end
96
+ end
97
+
98
+ context 'without selinux' do
99
+ it 'should not try to determine the initial state' do
100
+ Puppet::Type::K5login::ProviderK5login.any_instance.stubs(:selinux_support?).returns false
101
+
102
+ expect(subject[:selrole]).to be_nil
103
+ end
104
+
105
+ it "should do nothing for safe_insync? if no SELinux support" do
106
+ sel_param.should = 'newcontext'
107
+ sel_param.expects(:selinux_support?).returns false
108
+ expect(sel_param.safe_insync?('oldcontext')).to eq(true)
109
+ end
110
+ end
90
111
  end
91
112
  end
92
113
 
@@ -131,6 +152,54 @@ describe Puppet::Type.type(:k5login), :unless => Puppet.features.microsoft_windo
131
152
  end
132
153
  end
133
154
  end
155
+
156
+ context "#stat" do
157
+ let(:file) { described_class.new(:path => path) }
158
+
159
+ it "should return nil if the file does not exist" do
160
+ file[:path] = make_absolute('/foo/bar/baz/non-existent')
161
+
162
+ expect(file.stat).to be_nil
163
+ end
164
+
165
+ it "should return nil if the file cannot be stat'ed" do
166
+ dir = tmpfile('link_test_dir')
167
+ child = File.join(dir, 'some_file')
168
+
169
+ # Note: we aren't creating the file for this test. If the user is
170
+ # running these tests as root, they will be able to access the
171
+ # directory. In that case, this test will still succeed, not because
172
+ # we cannot stat the file, but because the file does not exist.
173
+ Dir.mkdir(dir)
174
+ begin
175
+ File.chmod(0, dir)
176
+
177
+ file[:path] = child
178
+
179
+ expect(file.stat).to be_nil
180
+ ensure
181
+ # chmod it back so we can clean it up
182
+ File.chmod(0777, dir)
183
+ end
184
+ end
185
+
186
+ it "should return nil if parts of path are not directories" do
187
+ regular_file = tmpfile('ENOTDIR_test')
188
+ FileUtils.touch(regular_file)
189
+ impossible_child = File.join(regular_file, 'some_file')
190
+
191
+ file[:path] = impossible_child
192
+ expect(file.stat).to be_nil
193
+ end
194
+
195
+ it "should return the stat instance" do
196
+ expect(file.stat).to be_a(File::Stat)
197
+ end
198
+
199
+ it "should cache the stat instance" do
200
+ expect(file.stat.object_id).to eql(file.stat.object_id)
201
+ end
202
+ end
134
203
  end
135
204
  end
136
205
  end
@@ -518,7 +518,7 @@ describe Puppet::Type.type(:mount), :unless => Puppet.features.microsoft_windows
518
518
  def run_in_catalog(*resources)
519
519
  Puppet::Util::Storage.stubs(:store)
520
520
  catalog = Puppet::Resource::Catalog.new
521
- catalog.add_resource *resources
521
+ catalog.add_resource(*resources)
522
522
  catalog.apply
523
523
  end
524
524
 
@@ -100,7 +100,7 @@ EOL
100
100
  it "should parse without error" do
101
101
  parser = Nagios::Parser.new
102
102
  expect {
103
- results = parser.parse(NONESCAPED_SEMICOLON_COMMENT)
103
+ parser.parse(NONESCAPED_SEMICOLON_COMMENT)
104
104
  }.to_not raise_error
105
105
  end
106
106
 
@@ -117,14 +117,14 @@ EOL
117
117
  it "should raise an error when an incorrect object definition is present" do
118
118
  parser = Nagios::Parser.new
119
119
  expect {
120
- results = parser.parse(UNKNOWN_NAGIOS_OBJECT_DEFINITION)
120
+ parser.parse(UNKNOWN_NAGIOS_OBJECT_DEFINITION)
121
121
  }.to raise_error Nagios::Base::UnknownNagiosType
122
122
  end
123
123
 
124
124
  it "should raise an error when syntax is not correct" do
125
125
  parser = Nagios::Parser.new
126
126
  expect {
127
- results = parser.parse(MISSING_CLOSING_CURLY_BRACKET)
127
+ parser.parse(MISSING_CLOSING_CURLY_BRACKET)
128
128
  }.to raise_error Nagios::Parser::SyntaxError
129
129
  end
130
130
 
@@ -132,7 +132,7 @@ EOL
132
132
  it "should not throw an exception" do
133
133
  parser = Nagios::Parser.new
134
134
  expect {
135
- results = parser.parse(ESCAPED_SEMICOLON)
135
+ parser.parse(ESCAPED_SEMICOLON)
136
136
  }.to_not raise_error
137
137
  end
138
138
 
@@ -154,7 +154,7 @@ EOL
154
154
  it "should not throw an exception" do
155
155
  parser = Nagios::Parser.new
156
156
  expect {
157
- results = parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
157
+ parser.parse(POUND_SIGN_HASH_SYMBOL_NOT_IN_FIRST_COLUMN)
158
158
  }.to_not raise_error
159
159
  end
160
160
 
@@ -177,7 +177,7 @@ EOL
177
177
  it "should not throw an exception" do
178
178
  parser = Nagios::Parser.new
179
179
  expect {
180
- results = parser.parse(ANOTHER_ESCAPED_SEMICOLON)
180
+ parser.parse(ANOTHER_ESCAPED_SEMICOLON)
181
181
  }.to_not raise_error
182
182
  end
183
183
 
@@ -406,7 +406,7 @@ describe Puppet::Type.type(:user) do
406
406
  testuser = described_class.new(:name => "testuser", :roles => ['testrole'] )
407
407
  testrole = described_class.new(:name => "testrole")
408
408
 
409
- config = Puppet::Resource::Catalog.new :testing do |conf|
409
+ Puppet::Resource::Catalog.new :testing do |conf|
410
410
  [testuser, testrole].each { |resource| conf.add_resource resource }
411
411
  end
412
412
  Puppet::Type::User::ProviderDirectoryservice.stubs(:get_macosx_version_major).returns "10.5"
@@ -399,5 +399,23 @@ describe Puppet::Type.type(:yumrepo) do
399
399
  it_behaves_like "a yumrepo parameter that can be absent", :deltarpm_metadata_percentage
400
400
  it_behaves_like "a yumrepo parameter that expects a natural value", :deltarpm_metadata_percentage
401
401
  end
402
+
403
+ describe "username" do
404
+ it_behaves_like "a yumrepo parameter that can be absent", :username
405
+ end
406
+
407
+ describe "password" do
408
+ it_behaves_like "a yumrepo parameter that can be absent", :password
409
+
410
+ it "redacts password information from the logs" do
411
+ resource = described_class.new(:name => 'puppetlabs', :password => 'top secret')
412
+ harness = Puppet::Transaction::ResourceHarness.new(Puppet::Transaction.new(Puppet::Resource::Catalog.new, nil, nil))
413
+ harness.evaluate(resource)
414
+ resource[:password] = 'super classified'
415
+ status = harness.evaluate(resource)
416
+ sync_event = status.events[0]
417
+ expect(sync_event.message).to eq 'changed [redacted] to [redacted]'
418
+ end
419
+ end
402
420
  end
403
421
  end
@@ -35,7 +35,7 @@ describe zfs do
35
35
  foo_bar_baz_zfs = Puppet::Type.type(:zfs).new(:name => "foo/bar/baz")
36
36
  foo_bar_baz_buz_zfs = Puppet::Type.type(:zfs).new(:name => "foo/bar/baz/buz")
37
37
 
38
- config = Puppet::Resource::Catalog.new :testing do |conf|
38
+ Puppet::Resource::Catalog.new :testing do |conf|
39
39
  [foo_pool, foo_bar_zfs, foo_bar_baz_zfs, foo_bar_baz_buz_zfs].each { |resource| conf.add_resource resource }
40
40
  end
41
41
 
@@ -266,7 +266,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
266
266
 
267
267
  it "should have documentation for the 'provider' parameter if there are providers" do
268
268
  @type.provide(:test_provider)
269
- expect(@type.paramdoc(:provider)).to match(/`provider_test_type`[\s\r]+resource/)
269
+ expect(@type.paramdoc(:provider)).to match(/`provider_test_type`[\s]+resource/)
270
270
  end
271
271
 
272
272
  it "should not have documentation for the 'provider' parameter if there are no providers" do
@@ -343,7 +343,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
343
343
  end
344
344
 
345
345
  it "should be registered as a provider of the child type" do
346
- child_provider = @type.provide(:child_provider, :parent => @parent_provider)
346
+ @type.provide(:child_provider, :parent => @parent_provider)
347
347
  expect(@type.providers).to include(:child_provider)
348
348
  expect(@parent_type.providers).not_to include(:child_provider)
349
349
  end
@@ -369,14 +369,14 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
369
369
 
370
370
  context "autorelations" do
371
371
  before :each do
372
- type = Puppet::Type.newtype(:autorelation_one) do
372
+ Puppet::Type.newtype(:autorelation_one) do
373
373
  newparam(:name) { isnamevar }
374
374
  end
375
375
  end
376
376
 
377
377
  describe "when building autorelations" do
378
378
  it "should be able to autorequire resources" do
379
- type = Puppet::Type.newtype(:autorelation_two) do
379
+ Puppet::Type.newtype(:autorelation_two) do
380
380
  newparam(:name) { isnamevar }
381
381
  autorequire(:autorelation_one) { ['foo'] }
382
382
  end
@@ -394,7 +394,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
394
394
  end
395
395
 
396
396
  it 'should not fail autorequire contains undef entries' do
397
- type = Puppet::Type.newtype(:autorelation_two) do
397
+ Puppet::Type.newtype(:autorelation_two) do
398
398
  newparam(:name) { isnamevar }
399
399
  autorequire(:autorelation_one) { [nil, 'foo'] }
400
400
  end
@@ -412,7 +412,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
412
412
  end
413
413
 
414
414
  it "should be able to autosubscribe resources" do
415
- type = Puppet::Type.newtype(:autorelation_two) do
415
+ Puppet::Type.newtype(:autorelation_two) do
416
416
  newparam(:name) { isnamevar }
417
417
  autosubscribe(:autorelation_one) { ['foo'] }
418
418
  end
@@ -430,7 +430,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
430
430
  end
431
431
 
432
432
  it 'should not fail if autosubscribe contains undef entries' do
433
- type = Puppet::Type.newtype(:autorelation_two) do
433
+ Puppet::Type.newtype(:autorelation_two) do
434
434
  newparam(:name) { isnamevar }
435
435
  autosubscribe(:autorelation_one) { [nil, 'foo'] }
436
436
  end
@@ -448,7 +448,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
448
448
  end
449
449
 
450
450
  it "should be able to autobefore resources" do
451
- type = Puppet::Type.newtype(:autorelation_two) do
451
+ Puppet::Type.newtype(:autorelation_two) do
452
452
  newparam(:name) { isnamevar }
453
453
  autobefore(:autorelation_one) { ['foo'] }
454
454
  end
@@ -466,7 +466,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
466
466
  end
467
467
 
468
468
  it "should not fail when autobefore contains undef entries" do
469
- type = Puppet::Type.newtype(:autorelation_two) do
469
+ Puppet::Type.newtype(:autorelation_two) do
470
470
  newparam(:name) { isnamevar }
471
471
  autobefore(:autorelation_one) { [nil, 'foo'] }
472
472
  end
@@ -484,7 +484,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
484
484
  end
485
485
 
486
486
  it "should be able to autonotify resources" do
487
- type = Puppet::Type.newtype(:autorelation_two) do
487
+ Puppet::Type.newtype(:autorelation_two) do
488
488
  newparam(:name) { isnamevar }
489
489
  autonotify(:autorelation_one) { ['foo'] }
490
490
  end
@@ -502,7 +502,7 @@ describe Puppet::Type, :unless => Puppet.features.microsoft_windows? do
502
502
  end
503
503
 
504
504
  it 'should not fail if autonotify contains undef entries' do
505
- type = Puppet::Type.newtype(:autorelation_two) do
505
+ Puppet::Type.newtype(:autorelation_two) do
506
506
  newparam(:name) { isnamevar }
507
507
  autonotify(:autorelation_one) { [nil, 'foo'] }
508
508
  end
@@ -1249,7 +1249,6 @@ describe Puppet::Type.metaparamclass(:audit) do
1249
1249
 
1250
1250
  it "should handle proprieties correctly" do
1251
1251
  # Order of assignment is significant in this test.
1252
- props = {}
1253
1252
  [:one, :two, :three].each {|prop| type.newproperty(prop) {} }
1254
1253
  instance = type.new(:name => "test")
1255
1254
 
@@ -1272,9 +1271,9 @@ describe Puppet::Type.metaparamclass(:audit) do
1272
1271
  type.feature :feature1, "one"
1273
1272
  type.feature :feature2, "two"
1274
1273
 
1275
- none = type.newproperty(:none) {}
1276
- one = type.newproperty(:one, :required_features => :feature1) {}
1277
- two = type.newproperty(:two, :required_features => [:feature1, :feature2]) {}
1274
+ type.newproperty(:none) {}
1275
+ type.newproperty(:one, :required_features => :feature1) {}
1276
+ type.newproperty(:two, :required_features => [:feature1, :feature2]) {}
1278
1277
 
1279
1278
  nope = type.provide(:nope) {}
1280
1279
  maybe = type.provide(:maybe) { has_features :feature1 }