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, 5 insertions, 15 deletions

diff --git a/test/lib/puppettest/filetesting.rb b/test/lib/puppettest/filetesting.rb
index 3c869f5cf..2ecfce58f 100644
--- a/test/lib/puppettest/filetesting.rb
+++ b/test/lib/puppettest/filetesting.rb
@@ -22,9 +22,7 @@ module PuppetTest::FileTesting
         ret = []
         num.times { |index|
             item = list[rand(list.length)]
-            if set.include?(item)
-                redo
-            end
+            redo if set.include?(item)
 
             ret.push item
         }
@@ -32,17 +30,11 @@ module PuppetTest::FileTesting
     end
 
     def mkranddirsandfiles(dirs = nil,files = nil,depth = 3)
-        if depth < 0
-            return
-        end
+        return if depth < 0
 
-        unless dirs
-            dirs = %w{This Is A Set Of Directories}
-        end
+        dirs = %w{This Is A Set Of Directories} unless dirs
 
-        unless files
-            files = %w{and this is a set of files}
-        end
+        files = %w{and this is a set of files} unless files
 
         tfiles = randlist(files)
         tdirs = randlist(dirs)
@@ -128,9 +120,7 @@ module PuppetTest::FileTesting
             path = File.join(dir,file)
             stat = File.stat(dir)
             if checked < 10 and (i % 3) == 2
-                unless yield path
-                    next
-                end
+                next unless yield path
                 checked += 1
             end
         }