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, 8 deletions

diff --git a/lib/puppet/provider/selmodule/semodule.rb b/lib/puppet/provider/selmodule/semodule.rb
index 2f2416b4b..2f88d3dfe 100644
--- a/lib/puppet/provider/selmodule/semodule.rb
+++ b/lib/puppet/provider/selmodule/semodule.rb
@@ -39,7 +39,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
 
         if(loadver) then
             filever = selmodversion_file
-            if (filever == loadver) then
+            if (filever == loadver)
                 return :true
             end
         end
@@ -89,13 +89,9 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
 
         (hdr, ver, numsec) = mod.read(12).unpack('LLL')
 
-        if hdr != magic
-            raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}"
-        end
+        raise Puppet::Error, "Found #{hdr} instead of magic #{magic} in #{filename}" if hdr != magic
 
-        if ver != 1
-            raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}"
-        end
+        raise Puppet::Error, "Unknown policy file version #{ver} in #{filename}" if ver != 1
 
         # Read through (and throw away) the file section offsets, and also
         # the magic header for the first section.
@@ -129,7 +125,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
                 lines.each do |line|
                     line.chomp!
                     bits = line.split
-                    if bits[0] == @resource[:name] then
+                    if bits[0] == @resource[:name]
                         self.debug "load version #{bits[1]}"
                         return bits[1]
                     end