Update puppetlabs/stdlib module

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / validate_ipv4_address.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
index 0660abd..1ac303f 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
@@ -1,6 +1,8 @@
+#
+# validate_ipv4_address.rb
+#

 module Puppet::Parser::Functions
 module Puppet::Parser::Functions

-
-  newfunction(:validate_ipv4_address, :doc => <<-ENDHEREDOC
+  newfunction(:validate_ipv4_address, :doc => <<-DOC

     Validate that all values passed are valid IPv4 addresses.
     Fail compilation if any value fails this check.
 
     Validate that all values passed are valid IPv4 addresses.
     Fail compilation if any value fails this check.
 


@@ -15,20 +17,21 @@ module Puppet::Parser::Functions
     $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
     validate_ipv4_address($some_array)
 
     $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
     validate_ipv4_address($some_array)
 

-    ENDHEREDOC
-  ) do |args|
+    DOC
+             ) do |args|

 
 

-    function_deprecation([:validate_ipv4_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_ipv4_address, 'This method is deprecated, please use the stdlib validate_legacy function,
+                            with Stdlib::Compat::Ipv4. There is further documentation for validate_legacy function in the README.'])

 
 

-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
+    require 'ipaddr'
+    rescuable_exceptions = [ArgumentError]

 
     if defined?(IPAddr::InvalidAddressError)
       rescuable_exceptions << IPAddr::InvalidAddressError
     end
 
 
     if defined?(IPAddr::InvalidAddressError)
       rescuable_exceptions << IPAddr::InvalidAddressError
     end
 

-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)")
+    if args.empty?
+      raise Puppet::ParseError, "validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)"

     end
 
     args.each do |arg|
     end
 
     args.each do |arg|


@@ -44,7 +47,5 @@ module Puppet::Parser::Functions
         raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
       end
     end
         raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
       end
     end

-

   end
   end

-

 end
 end