rubocop fixes, split a really long line

Author: rski

lib/puppet/provider/network_config/interfaces.rb

@@ -36,7 +36,7 @@ def initialize(msg = nil)
 
   def self.raise_malformed
     @failed = true
-    fail MalformedInterfacesError
+    raise MalformedInterfacesError
   end
 
   class Instance
@@ -193,7 +193,7 @@ def self.parse_file(_filename, contents)
       when /^mapping/
         # XXX dox
         status = :mapping
-        fail Puppet::DevError, 'Debian interfaces mapping parsing not implemented.'
+        raise Puppet::DevError, 'Debian interfaces mapping parsing not implemented.'
 
       else
         # We're currently examining a line that is within a mapping or iface
@@ -221,7 +221,7 @@ def self.parse_file(_filename, contents)
             end
           end
         when :mapping
-          fail Puppet::DevError, 'Debian interfaces mapping parsing not implemented.'
+          raise Puppet::DevError, 'Debian interfaces mapping parsing not implemented.'
         when :none
           raise_malformed
         end
@@ -254,8 +254,8 @@ def self.format_file(_filename, providers)
     # Build iface stanzas
     providers.sort_by(&:name).each do |provider|
       # TODO: add validation method
-      fail Puppet::Error, "#{provider.name} does not have a method." if provider.method.nil?
-      fail Puppet::Error, "#{provider.name} does not have a family." if provider.family.nil?
+      raise Puppet::Error, "#{provider.name} does not have a method." if provider.method.nil?
+      raise Puppet::Error, "#{provider.name} does not have a family." if provider.family.nil?
 
       stanza = []
       stanza << %(iface #{provider.name} #{provider.family} #{provider.method})
@@ -287,7 +287,7 @@ def self.format_file(_filename, providers)
           elsif val.is_a? Array
             val.each { |entry| stanza << "    #{key} #{entry}" }
           else
-            fail Puppet::Error, "#{self} options key #{key} expects a String or Array, got #{val.class}"
+            raise Puppet::Error, "#{self} options key #{key} expects a String or Array, got #{val.class}"
           end
         end
       end

lib/puppet/provider/network_config/redhat.rb

@@ -95,7 +95,7 @@ def self.parse_file(filename, contents)
 
     # Convert the data into key/value pairs
     pairs = lines.each_with_object({}) do |line, hash|
-      fail Puppet::Error, %(#{filename} is malformed; "#{line}" did not match "#{pair_regex}") unless line.match(pair_regex) do |m|
+      raise Puppet::Error, %(#{filename} is malformed; "#{line}" did not match "#{pair_regex}") unless line.match(pair_regex) do |m|
         key = m[1].strip
         val = m[2].strip
         hash[key] = val
@@ -171,11 +171,10 @@ def self.munge(pairs)
   end
 
   def self.format_file(filename, providers)
-    if providers.length == 0
-      return ''
-    elsif providers.length > 1
-      fail Puppet::DevError, "Unable to support multiple interfaces [#{providers.map(&:name).join(',')}] in a single file #{filename}"
-    end
+    return '' if providers.empty?
+    raise Puppet::DevError,
+          "Unable to support multiple interfaces [#{providers.map(&:name).join(',')}] in a single file #{filename}"\
+          if providers.length > 1
 
     provider = providers[0]
     props    = {}

lib/puppet/provider/network_route/redhat.rb

@@ -41,20 +41,21 @@ def self.parse_file(_filename, contents)
 
       route = line.split(' ', 6)
       if route.length < 4
-        fail Puppet::Error, 'Malformed redhat route file, cannot instantiate network_route resources'
+        raise Puppet::Error, 'Malformed redhat route file, cannot instantiate network_route resources'
       end
 
       new_route = {}
 
+      new_route[:gateway] = route[2]
+      new_route[:interface] = route[4]
+      new_route[:options] = route[5] if route[5]
+
       if route[0] == 'default'
         cidr_target = 'default'
 
         new_route[:name]    = cidr_target
         new_route[:network] = 'default'
         new_route[:netmask] = '0.0.0.0'
-        new_route[:gateway] = route[2]
-        new_route[:interface] = route[4]
-        new_route[:options] = route[5] if route[5]
       else
         # use the CIDR version of the target as :name
         network, netmask = route[0].split('/')
@@ -63,9 +64,6 @@ def self.parse_file(_filename, contents)
         new_route[:name]    = cidr_target
         new_route[:network] = network
         new_route[:netmask] = netmask
-        new_route[:gateway] = route[2]
-        new_route[:interface] = route[4]
-        new_route[:options] = route[5] if route[5]
       end
 
       routes << new_route
@@ -81,7 +79,7 @@ def self.format_file(_filename, providers)
     # Build routes
     providers.sort_by(&:name).each do |provider|
       [:network, :netmask, :gateway, :interface].each do |prop|
-        fail Puppet::Error, "#{provider.name} does not have a #{prop}." if provider.send(prop).nil?
+        raise Puppet::Error, "#{provider.name} does not have a #{prop}." if provider.send(prop).nil?
       end
       contents << if provider.network == 'default'
                     "#{provider.network} via #{provider.gateway} dev #{provider.interface} #{provider.options}\n"

lib/puppet/provider/network_route/routes.rb

@@ -41,7 +41,7 @@ def initialize(msg = nil)
 
   def self.raise_malformed
     @failed = true
-    fail MalformedRoutesError
+    raise MalformedRoutesError
   end
 
   def self.parse_file(_filename, contents)
@@ -86,10 +86,10 @@ def self.format_file(_filename, providers)
 
     # Build routes
     providers.sort_by(&:name).each do |provider|
-      fail Puppet::Error, "#{provider.name} is missing the required parameter 'network'." if provider.network.nil?
-      fail Puppet::Error, "#{provider.name} is missing the required parameter 'netmask'." if provider.netmask.nil?
-      fail Puppet::Error, "#{provider.name} is missing the required parameter 'gateway'." if provider.gateway.nil?
-      fail Puppet::Error, "#{provider.name} is missing the required parameter 'interface'." if provider.interface.nil?
+      raise Puppet::Error, "#{provider.name} is missing the required parameter 'network'." if provider.network.nil?
+      raise Puppet::Error, "#{provider.name} is missing the required parameter 'netmask'." if provider.netmask.nil?
+      raise Puppet::Error, "#{provider.name} is missing the required parameter 'gateway'." if provider.gateway.nil?
+      raise Puppet::Error, "#{provider.name} is missing the required parameter 'interface'." if provider.interface.nil?
 
       contents << "#{provider.network} #{provider.netmask} #{provider.gateway} #{provider.interface} #{provider.options}\n"
     end

lib/puppet/type/network_config.rb

@@ -27,15 +27,15 @@
   newproperty(:ipaddress) do
     desc 'The IP address of the network interfaces'
     validate do |value|
-      fail ArgumentError, "#{self.class} requires a valid ipaddress for the ipaddress property" unless IPAddress.valid? value
+      raise ArgumentError, "#{self.class} requires a valid ipaddress for the ipaddress property" unless IPAddress.valid? value
       # provider.validate
     end
   end
 
   newproperty(:netmask) do
     desc 'The subnet mask to apply to the interface'
     validate do |value|
-      fail ArgumentError, "#{self.class} requires a valid netmask for the netmask property" unless IPAddress.valid_ipv4_netmask? value
+      raise ArgumentError, "#{self.class} requires a valid netmask for the netmask property" unless IPAddress.valid_ipv4_netmask? value
       # provider.validate
     end
   end
@@ -79,7 +79,7 @@
       # reject floating point and negative integers
       # XXX this lets 1500.0 pass
       unless value =~ /^\d+$/
-        fail ArgumentError, "#{value} is not a valid mtu (must be a positive integer)"
+        raise ArgumentError, "#{value} is not a valid mtu (must be a positive integer)"
       end
 
       # Intel 82598 & 82599 chips support MTUs up to 16110; is there any
@@ -92,7 +92,7 @@
       min_mtu = 42
       max_mtu = 65_536
       unless (min_mtu..max_mtu).cover?(value.to_i)
-        fail ArgumentError, "#{value} is not in the valid mtu range (#{min_mtu} .. #{max_mtu})"
+        raise ArgumentError, "#{value} is not in the valid mtu range (#{min_mtu} .. #{max_mtu})"
       end
     end
   end
@@ -122,7 +122,7 @@ def should_to_s(hash = @should)
     defaultto {}
 
     validate do |value|
-      fail ArgumentError, "#{self.class} requires a hash for the options property" unless value.is_a? Hash
+      raise ArgumentError, "#{self.class} requires a hash for the options property" unless value.is_a? Hash
       # provider.validate
     end
   end

lib/puppet/type/network_route.rb

@@ -30,7 +30,7 @@
 
     validate do |value|
       unless value.length <= 2 || value =~ IPV4_ADDRESS_REGEX
-        fail("Invalid value for argument netmask: #{value}")
+        raise("Invalid value for argument netmask: #{value}")
       end
     end
 
@@ -69,7 +69,7 @@
     desc 'Provider specific options to be passed to the provider'
 
     validate do |value|
-      fail ArgumentError, "#{self.class} requires a string for the options property" unless value.is_a?(String)
+      raise ArgumentError, "#{self.class} requires a string for the options property" unless value.is_a?(String)
     end
   end
 end