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]

2 files changed, 3 insertions, 9 deletions

diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 4acee3ee5..1f81bb781 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -58,9 +58,7 @@ class TestPuppetModule < Test::Unit::TestCase
         oldlibs = $LOAD_PATH.dup
         cleanup do
             $LOAD_PATH.each do |dir|
-                unless oldlibs.include?(dir)
-                    $LOAD_PATH.delete(dir)
-                end
+                $LOAD_PATH.delete(dir) unless oldlibs.include?(dir)
             end
         end
         one = tempfile()
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index e49e96a7f..fa4fa4f61 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -46,9 +46,7 @@ class TestTransactions < Test::Unit::TestCase
                 $finished << self.name
             end
         end
-        if block
-            type.class_eval(&block)
-        end
+        type.class_eval(&block) if block
         cleanup do
             Puppet::Type.rmtype(:generator)
         end
@@ -70,9 +68,7 @@ class TestTransactions < Test::Unit::TestCase
             end
         end
 
-        if block
-            type.class_eval(&block)
-        end
+        type.class_eval(&block) if block
 
         return type
     end