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
@@ -1,4 +1,4 @@
1
- require 'json'
1
+ require 'puppet/util/json'
2
2
 
3
3
  module Puppet::Pops
4
4
  module Serialization
@@ -146,12 +146,12 @@ module JSON
146
146
  end
147
147
 
148
148
  def to_a
149
- ::JSON.parse(io_string)
149
+ ::Puppet::Util::Json.load(io_string)
150
150
  end
151
151
 
152
152
  def to_json
153
153
  if @indent > 0
154
- ::JSON.pretty_unparse(to_a, { :indent => ' ' * @indent })
154
+ ::Puppet::Util::Json.dump(to_a, { :pretty => true, :indent => ' ' * @indent })
155
155
  else
156
156
  io_string
157
157
  end
@@ -159,7 +159,7 @@ module JSON
159
159
 
160
160
  # Write a payload object. Not subject to extensions
161
161
  def write_pl(obj)
162
- @io << obj.to_json << ','
162
+ @io << Puppet::Util::Json.dump(obj) << ','
163
163
  end
164
164
 
165
165
  def io_string
@@ -198,7 +198,7 @@ module JSON
198
198
  if ext.nil?
199
199
  case obj
200
200
  when Numeric, String, true, false, nil
201
- @io << obj.to_json
201
+ @io << Puppet::Util::Json.dump(obj)
202
202
  write_delim
203
203
  else
204
204
  raise SerializationError, _("Unable to serialize a %{obj}") % { obj: obj.class.name }
@@ -284,9 +284,9 @@ module JSON
284
284
  def parse_io(io)
285
285
  case io
286
286
  when IO, StringIO
287
- ::JSON.parse(io.read)
287
+ ::Puppet::Util::Json.load(io.read)
288
288
  when String
289
- ::JSON.parse(io)
289
+ ::Puppet::Util::Json.load(io)
290
290
  else
291
291
  io
292
292
  end
@@ -32,8 +32,6 @@ class ClassLoader
32
32
  end
33
33
  end
34
34
 
35
- private
36
-
37
35
  def self.provide_from_type(type)
38
36
  case type
39
37
  when PRuntimeType
@@ -66,12 +64,13 @@ class ClassLoader
66
64
  when PPatternType ; String
67
65
  when PEnumType ; String
68
66
  when PFloatType ; Float
69
- when PUndefType ; NilClass
67
+ when PUndefType ; NilClass
70
68
  when PCallableType ; Proc
71
69
  else
72
70
  nil
73
71
  end
74
72
  end
73
+ private_class_method :provide_from_type
75
74
 
76
75
  def self.provide_from_string(name)
77
76
  name_path = name.split(TypeFormatter::NAME_SEGMENT_SEPARATOR)
@@ -97,6 +96,7 @@ class ClassLoader
97
96
  return nil unless result.is_a?(Module)
98
97
  result
99
98
  end
99
+ private_class_method :provide_from_string
100
100
 
101
101
  def self.find_class(name_path)
102
102
  name_path.reduce(Object) do |ns, name|
@@ -107,6 +107,7 @@ class ClassLoader
107
107
  end
108
108
  end
109
109
  end
110
+ private_class_method :find_class
110
111
 
111
112
  def self.paths_for_name(fq_named_parts)
112
113
  # search two entries, one where all parts are decamelized, and one with names just downcased
@@ -115,6 +116,7 @@ class ClassLoader
115
116
  #
116
117
  [fq_named_parts.map {|part| de_camel(part)}.join('/'), fq_named_parts.join('/').downcase ]
117
118
  end
119
+ private_class_method :paths_for_name
118
120
 
119
121
  def self.de_camel(fq_name)
120
122
  fq_name.to_s.gsub(/::/, '/').
@@ -123,6 +125,7 @@ class ClassLoader
123
125
  tr("-", "_").
124
126
  downcase
125
127
  end
128
+ private_class_method :de_camel
126
129
 
127
130
  end
128
131
  end
@@ -8,20 +8,15 @@ module Types
8
8
  class ImplementationRegistry
9
9
  TYPE_REGEXP_SUBST = TypeFactory.tuple([PRegexpType::DEFAULT, PStringType::NON_EMPTY])
10
10
 
11
- def self.singleton
12
- @singleton ||= new(Loaders.static_loader)
13
- end
14
-
15
11
  # Create a new instance. This method is normally only called once
16
12
  #
17
- # The initializer will create mappings for well known types that can be loaded using the static loader
18
- #
19
- def initialize(static_loader)
13
+ # @param parent [ImplementationRegistry, nil] the parent of this registry
14
+ def initialize(parent = nil)
15
+ @parent = parent
20
16
  @type_names_per_implementation = {}
21
17
  @implementations_per_type_name = {}
22
18
  @type_name_substitutions = []
23
19
  @impl_name_substitutions = []
24
- TypeParser.type_map.values.each { |type| register_implementation(type.simple_name, type.class.name, static_loader) }
25
20
  end
26
21
 
27
22
  # Register a bidirectional type mapping.
@@ -29,20 +24,18 @@ module Types
29
24
  # @overload register_type_mapping(runtime_type, puppet_type)
30
25
  # @param runtime_type [PRuntimeType] type that represents the runtime module or class to map to a puppet type
31
26
  # @param puppet_type [PAnyType] type that will be mapped to the runtime module or class
32
- # @param loader [Loader::Loader] the loader to use when resolving names
33
27
  # @overload register_type_mapping(runtime_type, pattern_replacement)
34
28
  # @param runtime_type [PRuntimeType] type containing the pattern and replacement to map the runtime type to a puppet type
35
29
  # @param puppet_type [Array(Regexp,String)] the pattern and replacement to map a puppet type to a runtime type
36
- # @param loader [Loader::Loader] the loader to use when resolving names
37
- def register_type_mapping(runtime_type, puppet_type_or_pattern, loader)
30
+ def register_type_mapping(runtime_type, puppet_type_or_pattern, _ = nil)
38
31
  TypeAsserter.assert_assignable('First argument of type mapping', PRuntimeType::RUBY, runtime_type)
39
32
  expr = runtime_type.name_or_pattern
40
33
  if expr.is_a?(Array)
41
34
  TypeAsserter.assert_instance_of('Second argument of type mapping', TYPE_REGEXP_SUBST, puppet_type_or_pattern)
42
- register_implementation_regexp(puppet_type_or_pattern, expr, loader)
35
+ register_implementation_regexp(puppet_type_or_pattern, expr)
43
36
  else
44
37
  TypeAsserter.assert_instance_of('Second argument of type mapping', PTypeType::DEFAULT, puppet_type_or_pattern)
45
- register_implementation(puppet_type_or_pattern, expr, loader)
38
+ register_implementation(puppet_type_or_pattern, expr)
46
39
  end
47
40
  end
48
41
 
@@ -50,23 +43,20 @@ module Types
50
43
  #
51
44
  # @param type_namespace [String] the namespace for the puppet types
52
45
  # @param impl_namespace [String] the namespace for the implementations
53
- # @param loader [Loader::Loader] the loader to use when resolving names
54
- def register_implementation_namespace(type_namespace, impl_namespace, loader)
46
+ def register_implementation_namespace(type_namespace, impl_namespace, _ = nil)
55
47
  ns = TypeFormatter::NAME_SEGMENT_SEPARATOR
56
48
  register_implementation_regexp(
57
49
  [/\A#{type_namespace}#{ns}(\w+)\z/, "#{impl_namespace}#{ns}\\1"],
58
- [/\A#{impl_namespace}#{ns}(\w+)\z/, "#{type_namespace}#{ns}\\1"],
59
- loader)
50
+ [/\A#{impl_namespace}#{ns}(\w+)\z/, "#{type_namespace}#{ns}\\1"])
60
51
  end
61
52
 
62
53
  # Register a bidirectional regexp mapping
63
54
  #
64
55
  # @param type_name_subst [Array(Regexp,String)] regexp and replacement mapping type names to runtime names
65
56
  # @param impl_name_subst [Array(Regexp,String)] regexp and replacement mapping runtime names to type names
66
- # @param loader [Loader::Loader] the loader to use when resolving names
67
- def register_implementation_regexp(type_name_subst, impl_name_subst, loader)
68
- @type_name_substitutions << [type_name_subst, loader]
69
- @impl_name_substitutions << [impl_name_subst, loader]
57
+ def register_implementation_regexp(type_name_subst, impl_name_subst, _ = nil)
58
+ @type_name_substitutions << type_name_subst
59
+ @impl_name_substitutions << impl_name_subst
70
60
  nil
71
61
  end
72
62
 
@@ -74,12 +64,11 @@ module Types
74
64
  #
75
65
  # @param type [PAnyType,String] the type or type name
76
66
  # @param impl_module[Module,String] the module or module name
77
- # @param loader [Loader::Loader] the loader to use when resolving names
78
- def register_implementation(type, impl_module, loader)
67
+ def register_implementation(type, impl_module, _ = nil)
79
68
  type = type.name if type.is_a?(PAnyType)
80
69
  impl_module = impl_module.name if impl_module.is_a?(Module)
81
- @type_names_per_implementation[impl_module] = [type, loader]
82
- @implementations_per_type_name[type] = [impl_module, loader]
70
+ @type_names_per_implementation[impl_module] = type
71
+ @implementations_per_type_name[type] = impl_module
83
72
  nil
84
73
  end
85
74
 
@@ -89,7 +78,8 @@ module Types
89
78
  # @return [String,nil] the name of the implementation module, or `nil` if no mapping was found
90
79
  def module_name_for_type(type)
91
80
  type = type.name if type.is_a?(PAnyType)
92
- find_mapping(type, @implementations_per_type_name, @type_name_substitutions)
81
+ name = @parent.module_name_for_type(type) unless @parent.nil?
82
+ name.nil? ? find_mapping(type, @implementations_per_type_name, @type_name_substitutions) : name
93
83
  end
94
84
 
95
85
  # Find the module that corresponds to the given type or type name
@@ -97,18 +87,19 @@ module Types
97
87
  # @param type [PAnyType,String] the name of the type
98
88
  # @return [Module,nil] the name of the implementation module, or `nil` if no mapping was found
99
89
  def module_for_type(type)
100
- name_and_loader = module_name_for_type(type)
90
+ name = module_name_for_type(type)
101
91
  # TODO Shouldn't ClassLoader be module specific?
102
- name_and_loader.nil? ? nil : ClassLoader.provide(name_and_loader[0])
92
+ name.nil? ? nil : ClassLoader.provide(name)
103
93
  end
104
94
 
105
95
  # Find the type name and loader that corresponds to the given runtime module or module name
106
96
  #
107
97
  # @param impl_module [Module,String] the implementation class or class name
108
- # @return [Array(String,Loader::Loader),nil] the name and loader of the type, or `nil` if no mapping was found
98
+ # @return [String,nil] the name of the type, or `nil` if no mapping was found
109
99
  def type_name_for_module(impl_module)
110
100
  impl_module = impl_module.name if impl_module.is_a?(Module)
111
- find_mapping(impl_module, @type_names_per_implementation, @impl_name_substitutions)
101
+ name = @parent.type_name_for_module(impl_module) unless @parent.nil?
102
+ name.nil? ? find_mapping(impl_module, @type_names_per_implementation, @impl_name_substitutions) : name
112
103
  end
113
104
 
114
105
  # Find the name for, and then load, the type that corresponds to the given runtime module or module name
@@ -118,20 +109,22 @@ module Types
118
109
  # @param impl_module [Module,String] the implementation class or class name
119
110
  # @return [PAnyType,nil] the type, or `nil` if no mapping was found
120
111
  def type_for_module(impl_module)
121
- name_and_loader = type_name_for_module(impl_module)
122
- if name_and_loader.nil?
112
+ name = type_name_for_module(impl_module)
113
+ if name.nil?
123
114
  nil
124
115
  else
125
- TypeParser.singleton.parse(*name_and_loader)
116
+ TypeParser.singleton.parse(name)
126
117
  end
127
118
  end
128
119
 
120
+ private
121
+
129
122
  def find_mapping(name, names, substitutions)
130
123
  found = names[name]
131
124
  if found.nil?
132
125
  substitutions.each do |subst|
133
- substituted = name.sub(*subst[0])
134
- return [substituted, subst[1]] unless substituted == name
126
+ substituted = name.sub(*subst)
127
+ return substituted unless substituted == name
135
128
  end
136
129
  end
137
130
  found
@@ -484,6 +484,7 @@ class PObjectType < PMetaType
484
484
  # @api private
485
485
  def create_new_function
486
486
  impl_class = implementation_class
487
+ return impl_class.create_new_function(self) if impl_class.respond_to?(:create_new_function)
487
488
 
488
489
  (param_names, param_types, required_param_count) = parameter_info(impl_class)
489
490
 
@@ -532,14 +533,13 @@ class PObjectType < PMetaType
532
533
  def implementation_class(create = true)
533
534
  if @implementation_class.nil? && create
534
535
  ir = Loaders.implementation_registry
535
- impl_name = ir.nil? ? nil : ir.module_name_for_type(self)
536
- if impl_name.nil?
536
+ class_name = ir.nil? ? nil : ir.module_name_for_type(self)
537
+ if class_name.nil?
537
538
  # Use generator to create a default implementation
538
539
  @implementation_class = RubyGenerator.new.create_class(self)
539
540
  @implementation_class.class_eval(&@implementation_override) if instance_variable_defined?(:@implementation_override)
540
541
  else
541
542
  # Can the mapping be loaded?
542
- class_name = impl_name[0]
543
543
  @implementation_class = ClassLoader.provide(class_name)
544
544
 
545
545
  raise Puppet::Error, "Unable to load class #{class_name}" if @implementation_class.nil?
@@ -3,7 +3,7 @@ module Types
3
3
  class PAbstractTimeDataType < PScalarType
4
4
  # @param from [AbstractTime] lower bound for this type. Nil or :default means unbounded
5
5
  # @param to [AbstractTime] upper bound for this type. Nil or :default means unbounded
6
- def initialize(from, to)
6
+ def initialize(from, to = nil)
7
7
  @from = convert_arg(from, true)
8
8
  @to = convert_arg(to, false)
9
9
  raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{@from}, #{@to}" unless @from <= @to
@@ -161,7 +161,7 @@ module Types
161
161
  end
162
162
 
163
163
  def from_fields(days, hours, minutes, seconds, milliseconds = 0, microseconds = 0, nanoseconds = 0)
164
- Time::Timespan.from_fields(days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds)
164
+ Time::Timespan.from_fields(false, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds)
165
165
  end
166
166
 
167
167
  def from_string_hash(args_hash)
@@ -23,6 +23,10 @@ class PTypeSetType < PMetaType
23
23
  @type_set.name_authority
24
24
  end
25
25
 
26
+ def model_loader
27
+ @type_set.loader
28
+ end
29
+
26
30
  def find(typed_name)
27
31
  if typed_name.type == :type && typed_name.name_authority == @type_set.name_authority
28
32
  type = @type_set[typed_name.name]
@@ -48,7 +52,7 @@ class PTypeSetType < PMetaType
48
52
  TypeFactory.optional(KEY_NAME_AUTHORITY) => Pcore::TYPE_URI,
49
53
  TypeFactory.optional(KEY_NAME) => Pcore::TYPE_QUALIFIED_REFERENCE,
50
54
  TypeFactory.optional(KEY_VERSION) => TYPE_STRING_OR_VERSION,
51
- TypeFactory.optional(KEY_TYPES) => TypeFactory.hash_kv(Pcore::TYPE_SIMPLE_TYPE_NAME, PTypeType::DEFAULT, PCollectionType::NOT_EMPTY_SIZE),
55
+ TypeFactory.optional(KEY_TYPES) => TypeFactory.hash_kv(Pcore::TYPE_SIMPLE_TYPE_NAME, PVariantType.new([PTypeType::DEFAULT, PObjectType::TYPE_OBJECT_I12N]), PCollectionType::NOT_EMPTY_SIZE),
52
56
  TypeFactory.optional(KEY_REFERENCES) => TypeFactory.hash_kv(Pcore::TYPE_SIMPLE_TYPE_NAME, TYPE_TYPE_REFERENCE_I12N, PCollectionType::NOT_EMPTY_SIZE),
53
57
  TypeFactory.optional(KEY_ANNOTATIONS) => TYPE_ANNOTATIONS,
54
58
  })
@@ -288,6 +292,25 @@ class PTypeSetType < PMetaType
288
292
  types.each do |type_name, value|
289
293
  full_name = "#{@name}::#{type_name}".freeze
290
294
  typed_name = Loader::TypedName.new(:type, full_name, name_auth)
295
+ if value.is_a?(Model::ResourceDefaultsExpression)
296
+ # This is actually a <Parent> { <key-value entries> } notation. Convert to a literal hash that contains the parent
297
+ n = value.type_ref
298
+ name = n.cased_value
299
+ entries = []
300
+ unless name == 'Object' or name == 'TypeSet'
301
+ if value.operations.any? { |op| op.attribute_name == KEY_PARENT }
302
+ case Puppet[:strict]
303
+ when :warning
304
+ IssueReporter.warning(value, Issues::DUPLICATE_KEY, :key => KEY_PARENT)
305
+ when :error
306
+ IssueReporter.error(Puppet::ParseErrorWithIssue, value, Issues::DUPLICATE_KEY, :key => KEY_PARENT)
307
+ end
308
+ end
309
+ entries << Model::KeyedEntry.new(n.locator, n.offset, n.length, KEY_PARENT, n)
310
+ end
311
+ value.operations.each { |op| entries << Model::KeyedEntry.new(op.locator, op.offset, op.length, op.attribute_name, op.value_expr) }
312
+ value = Model::LiteralHash.new(value.locator, value.offset, value.length, entries)
313
+ end
291
314
  type = Loader::TypeDefinitionInstantiator.create_type(full_name, value, name_auth)
292
315
  loader.set_entry(typed_name, type, value.locator.to_uri(value))
293
316
  types[type_name] = type
@@ -158,7 +158,7 @@ class RubyGenerator < TypeFormatter
158
158
  ir = Loaders.implementation_registry
159
159
  impl_name = ir.module_name_for_type(type)
160
160
  raise Puppet::Error, "Unable to create an instance of #{type.name}. No mapping exists to runtime object" if impl_name.nil?
161
- impl_name[0]
161
+ impl_name
162
162
  end
163
163
  end
164
164
 
@@ -179,9 +179,8 @@ class RubyGenerator < TypeFormatter
179
179
  unless obj.parent.nil?
180
180
  if impl_subst.empty?
181
181
  ir = Loaders.implementation_registry
182
- parent_impl = ir.module_name_for_type(obj.parent)
183
- raise Puppet::Error, "Unable to create an instance of #{obj.parent.name}. No mapping exists to runtime object" if parent_impl.nil?
184
- parent_name = parent_impl[0]
182
+ parent_name = ir.module_name_for_type(obj.parent)
183
+ raise Puppet::Error, "Unable to create an instance of #{obj.parent.name}. No mapping exists to runtime object" if parent_name.nil?
185
184
  else
186
185
  parent_name = obj.parent.name.gsub(*impl_subst)
187
186
  end
@@ -159,7 +159,7 @@ class TypeCalculator
159
159
  t = type(t)
160
160
  end
161
161
  t.is_a?(PAnyType) ? t.assignable?(t2) : false
162
- end
162
+ end
163
163
 
164
164
  # Returns an iterable if the t represents something that can be iterated
165
165
  def enumerable(t)
@@ -210,8 +210,6 @@ module TypeFactory
210
210
  case args.size
211
211
  when 0
212
212
  PTimestampType::DEFAULT
213
- when 1
214
- PTimestampType.new(args[0], args[0])
215
213
  else
216
214
  PTimestampType.new(*args)
217
215
  end
@@ -221,8 +219,6 @@ module TypeFactory
221
219
  case args.size
222
220
  when 0
223
221
  PTimespanType::DEFAULT
224
- when 1
225
- PTimespanType.new(args[0], args[0])
226
222
  else
227
223
  PTimespanType.new(*args)
228
224
  end
@@ -19,7 +19,7 @@ module Types
19
19
  def eql?(o)
20
20
  self == o
21
21
  end
22
- end
22
+ end
23
23
 
24
24
  # @api private
25
25
  class SubjectPathElement < TypePathElement
@@ -290,7 +290,14 @@ class TypeParser
290
290
 
291
291
  # @api private
292
292
  def loader_from_context(ast, context)
293
- Adapters::LoaderAdapter.loader_for_model_object(ast, nil, context)
293
+ model_loader = Adapters::LoaderAdapter.loader_for_model_object(ast, nil, context)
294
+ if context.is_a?(PTypeSetType::TypeSetLoader)
295
+ # Only swap a given TypeSetLoader for another loader when the other loader is different
296
+ # from the one associated with the TypeSet expression
297
+ context.model_loader.equal?(model_loader.parent) ? context : model_loader
298
+ else
299
+ model_loader
300
+ end
294
301
  end
295
302
 
296
303
  # @api private
@@ -489,9 +496,9 @@ class TypeParser
489
496
  end
490
497
  elsif parameters.size != 2
491
498
  raise_invalid_parameters_error('Integer', '1 or 2', parameters.size)
492
- else
493
- TypeFactory.range(parameters[0] == :default ? nil : parameters[0], parameters[1] == :default ? nil : parameters[1])
494
- end
499
+ else
500
+ TypeFactory.range(parameters[0] == :default ? nil : parameters[0], parameters[1] == :default ? nil : parameters[1])
501
+ end
495
502
 
496
503
  when 'object'
497
504
  raise_invalid_parameters_error('Object', 1, parameters.size) unless parameters.size == 1
@@ -529,9 +536,9 @@ class TypeParser
529
536
  end
530
537
  elsif parameters.size != 2
531
538
  raise_invalid_parameters_error('Float', '1 or 2', parameters.size)
532
- else
533
- TypeFactory.float_range(parameters[0] == :default ? nil : parameters[0], parameters[1] == :default ? nil : parameters[1])
534
- end
539
+ else
540
+ TypeFactory.float_range(parameters[0] == :default ? nil : parameters[0], parameters[1] == :default ? nil : parameters[1])
541
+ end
535
542
 
536
543
  when 'string'
537
544
  size_type =
@@ -576,7 +576,7 @@ class PNotUndefType < PTypeWithContainedType
576
576
  n.type
577
577
  else
578
578
  n
579
- end
579
+ end
580
580
  end
581
581
  end
582
582