Update puppetlabs/stdlib module

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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb
index 5d80cfb..af835ad 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/validate_ip_address.rb
@@ -1,6 +1,8 @@
+#
+# validate_ip_address.rb
+#
 module Puppet::Parser::Functions
-
-  newfunction(:validate_ip_address, :doc => <<-ENDHEREDOC
+  newfunction(:validate_ip_address, :doc => <<-DOC
     Validate that all values passed are valid IP addresses,
     regardless they are IPv4 or IPv6
     Fail compilation if any value fails this check.
@@ -17,20 +19,21 @@ module Puppet::Parser::Functions
     The following values will fail, causing compilation to abort:
     $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
     validate_ip_address($some_array)
-    ENDHEREDOC
-  ) do |args|
+    DOC
+             ) do |args|
 
-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
+    require 'ipaddr'
+    rescuable_exceptions = [ArgumentError]
 
-    function_deprecation([:validate_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function, with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
+    function_deprecation([:validate_ip_address, 'This method is deprecated, please use the stdlib validate_legacy function,
+                            with Stdlib::Compat::Ip_address. There is further documentation for validate_legacy function in the README.'])
 
     if defined?(IPAddr::InvalidAddressError)
       rescuable_exceptions << IPAddr::InvalidAddressError
     end
 
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ip_address(): wrong number of arguments (#{args.length}; must be > 0)")
+    if args.empty?
+      raise Puppet::ParseError, "validate_ip_address(): wrong number of arguments (#{args.length}; must be > 0)"
     end
 
     args.each do |arg|
@@ -39,14 +42,12 @@ module Puppet::Parser::Functions
       end
 
       begin
-        unless IPAddr.new(arg).ipv4? or IPAddr.new(arg).ipv6?
+        unless IPAddr.new(arg).ipv4? || IPAddr.new(arg).ipv6?
           raise Puppet::ParseError, "#{arg.inspect} is not a valid IP address."
         end
       rescue *rescuable_exceptions
         raise Puppet::ParseError, "#{arg.inspect} is not a valid IP address."
       end
     end
-
   end
-
 end