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/type/file/mode.rb b/lib/puppet/type/file/mode.rb
index da54b9fdd..6a73822f0 100755
--- a/lib/puppet/type/file/mode.rb
+++ b/lib/puppet/type/file/mode.rb
@@ -76,15 +76,9 @@ module Puppet
         # that are readable.  This should probably be selectable, but eh.
         def dirmask(value)
             if FileTest.directory?(@resource[:path])
-                if value & 0400 != 0
-                    value |= 0100
-                end
-                if value & 040 != 0
-                    value |= 010
-                end
-                if value & 04 != 0
-                    value |= 01
-                end
+                value |= 0100 if value & 0400 != 0
+                value |= 010 if value & 040 != 0
+                value |= 01 if value & 04 != 0
             end
 
             return value
@@ -105,9 +99,7 @@ module Puppet
 
             if stat = @resource.stat(false)
                 unless defined?(@fixed)
-                    if defined?(@should) and @should
-                        @should = @should.collect { |s| self.dirmask(s) }
-                    end
+                    @should = @should.collect { |s| self.dirmask(s) } if defined?(@should) and @should
                 end
                 return stat.mode & 007777
             else