Code smell: Line modifiers are preferred to one-line blocks.

* Replaced 6 occurances of (while .*?) *do$ with

  The do is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          while line = f.gets do
      becomes:
          while line = f.gets
      The code:
          while line = shadow.gets do
      becomes:
          while line = shadow.gets
      The code:
          while wrapper = zeros.pop do
      becomes:
          while wrapper = zeros.pop

* Replaced 19 occurances of ((if|unless) .*?) *then$ with

  The then is unneeded in the block header form and causes problems
  with the block-to-one-line transformation.

  3 Examples:

      The code:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
      becomes:
          if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
      The code:
          unless defined?(@spec_command) then
      becomes:
          unless defined?(@spec_command)
      The code:
          if c == ?\n then
      becomes:
          if c == ?\n

* Replaced 758 occurances of

      ((?:if|unless|while|until) .*)
          (.*)
      end

  with

  The one-line form is preferable provided:

      * The condition is not used to assign a variable
      * The body line is not already modified
      * The resulting line is not too long

  3 Examples:

      The code:
          if Puppet.features.libshadow?
              has_feature :manages_passwords
          end
      becomes:
          has_feature :manages_passwords if Puppet.features.libshadow?
      The code:
          unless (defined?(@current_pool) and @current_pool)
              @current_pool = process_zpool_data(get_pool_data)
          end
      becomes:
          @current_pool = process_zpool_data(get_pool_data) unless (defined?(@current_pool) and @current_pool)
      The code:
          if Puppet[:trace]
              puts detail.backtrace
          end
      becomes:
          puts detail.backtrace if Puppet[:trace]

1 files changed, 4 insertions, 12 deletions

diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb
index 696b5bb82..a372618cc 100644
--- a/lib/puppet/provider/macauthorization/macauthorization.rb
+++ b/lib/puppet/provider/macauthorization/macauthorization.rb
@@ -63,9 +63,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
         def populate_rules_rights
             auth_plist = Plist::parse_xml(AuthDB)
-            if not auth_plist
-                raise Puppet::Error.new("Cannot parse: #{AuthDB}")
-            end
+            raise Puppet::Error.new("Cannot parse: #{AuthDB}") if not auth_plist
             self.rights = auth_plist["rights"].dup
             self.rules = auth_plist["rules"].dup
             self.parsed_auth_db = self.rights.dup
@@ -163,9 +161,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         cmds << :security << "authorizationdb" << "read" << resource[:name]
         output = execute(cmds, :combine => false)
         current_values = Plist::parse_xml(output)
-        if current_values.nil?
-            current_values = {}
-        end
+        current_values = {} if current_values.nil?
         specified_values = convert_plist_to_native_attributes(@property_hash)
 
         # take the current values, merge the specified values to obtain a
@@ -178,9 +174,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
         authdb = Plist::parse_xml(AuthDB)
         authdb_rules = authdb["rules"].dup
         current_values = {}
-        if authdb_rules[resource[:name]]
-            current_values = authdb_rules[resource[:name]]
-        end
+        current_values = authdb_rules[resource[:name]] if authdb_rules[resource[:name]]
         specified_values = convert_plist_to_native_attributes(@property_hash)
         new_values = current_values.merge(specified_values)
         set_rule(resource[:name], new_values)
@@ -254,9 +248,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
     def retrieve_value(resource_name, attribute)
         # We set boolean values to symbols when retrieving values
-        if not self.class.parsed_auth_db.has_key?(resource_name)
-            raise Puppet::Error.new("Cannot find #{resource_name} in auth db")
-        end
+        raise Puppet::Error.new("Cannot find #{resource_name} in auth db") if not self.class.parsed_auth_db.has_key?(resource_name)
 
         if PuppetToNativeAttributeMap.has_key?(attribute)
             native_attribute = PuppetToNativeAttributeMap[attribute]