diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-12 17:41:24 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-12 17:41:24 -0700 |
commit | ced1f7476e562fea8241469471c715778f3b8157 (patch) | |
tree | 7b1692232877f53b7a18b029b31102c13f405fe8 /lib/puppet/parser/functions/validate_re.rb | |
parent | c0ac470e764841b0de88dbabade342dc2c1b193e (diff) | |
parent | 5d1cec8a66fd67ebf4242c08abdf087783706057 (diff) | |
download | puppet-stdlib-ced1f7476e562fea8241469471c715778f3b8157.tar.gz puppet-stdlib-ced1f7476e562fea8241469471c715778f3b8157.tar.bz2 |
Merge branch '2.3.x'
* 2.3.x:
(#12357) Fix broken compatibility with Puppet 2.6
(maint) Comment Ken's fix to String#any?
(#13018) Fix missing method any? message for ruby 1.9.x
(#12357) Add ability to display an error message from validate_re
(#12357) Add validate_absolute_path() function
(maint) Stop printing the directory of spec_helper
(#12357) Make facter_dot_d look in Puppet[:confdir]/facts.d
(#12357) Add puppet_vardir custom fact
(#12357) Fix root_home fact on Windows
Diffstat (limited to 'lib/puppet/parser/functions/validate_re.rb')
-rw-r--r-- | lib/puppet/parser/functions/validate_re.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/puppet/parser/functions/validate_re.rb b/lib/puppet/parser/functions/validate_re.rb index 8033ca3..ca25a70 100644 --- a/lib/puppet/parser/functions/validate_re.rb +++ b/lib/puppet/parser/functions/validate_re.rb @@ -1,5 +1,4 @@ module Puppet::Parser::Functions - newfunction(:validate_re, :doc => <<-'ENDHEREDOC') do |args| Perform simple validation of a string against one or more regular expressions. The first argument of this function should be a string to @@ -8,6 +7,9 @@ module Puppet::Parser::Functions of the regular expressions match the string passed in, compilation will abort with a parse error. + If a third argument is specified, this will be the error message raised and + seen by the user. + The following strings will validate against the regular expressions: validate_re('one', '^one$') @@ -17,17 +19,22 @@ module Puppet::Parser::Functions validate_re('one', [ '^two', '^three' ]) + A helpful error message can be returned like this: + + validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7') + ENDHEREDOC - if args.length != 2 then - raise Puppet::ParseError, ("validate_re(): wrong number of arguments (#{args.length}; must be 2)") + if (args.length < 2) or (args.length > 3) then + raise Puppet::ParseError, ("validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)") end - msg = "validate_re(): #{args[0].inspect} does not match #{args[1].inspect}" + msg = args[2] || "validate_re(): #{args[0].inspect} does not match #{args[1].inspect}" - raise Puppet::ParseError, (msg) unless args[1].any? do |re_str| + # We're using a flattened array here because we can't call String#any? in + # Ruby 1.9 like we can in Ruby 1.8 + raise Puppet::ParseError, (msg) unless [args[1]].flatten.any? do |re_str| args[0] =~ Regexp.compile(re_str) end end - end |