kienan
/
puppet-strings
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #77 from HAIL9000/issue/master/PDOC-75-strings_fails_with_puppet_4.4.0 

(PDOC-75) Work with both versions of 'interpret_any'
This commit is contained in:
Henrik Lindberg 2016-03-25 00:32:16 +01:00
parent 678ba735e8 91b46be4ea
commit a3227b8b1f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet_x/puppetlabs/strings/yard/handlers/host_class_handler.rb
View File

@ -16,7 +16,13 @@ class PuppetX::PuppetLabs::Strings::YARD::Handlers::HostClassHandler < PuppetX::
param_type_info[pop_param.name] = Puppet::Pops::Types::TypeFactory.any() param_type_info[pop_param.name] = Puppet::Pops::Types::TypeFactory.any()
else else
begin begin
param_type_info[pop_param.name] = tp.interpret_any(pop_param.type_expr) # This is a bit of a hack because we were using a method that was previously
# API private. See PDOC-75 for more details
if Puppet::Pops::Types::TypeParser.instance_method(:interpret_any).arity == 2
param_type_info[pop_param.name] = tp.interpret_any(pop_param.type_expr, nil)
else
param_type_info[pop_param.name] = tp.interpret_any(pop_param.type_exp)
end
rescue Puppet::ParseError => e rescue Puppet::ParseError => e
# If the type could not be interpreted insert a prominent warning # If the type could not be interpreted insert a prominent warning
param_type_info[pop_param.name] = "Type Error: #{e.message}" param_type_info[pop_param.name] = "Type Error: #{e.message}"

2
spec/lib/strings_spec/parsing.rb
View File

@ -20,7 +20,7 @@ module StringsSpec
@mismatches.empty? @mismatches.empty?
end end
failure_message_for_should do failure_message do |actual|
@mismatches.collect do |key, value| @mismatches.collect do |key, value|
"Expected #{key} to be <#{value[1]}>, but got <#{value[0]}>." "Expected #{key} to be <#{value[1]}>, but got <#{value[0]}>."
end.join("\n") end.join("\n")