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, 2 insertions, 6 deletions

diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index cd8015db7..c42d67397 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -178,9 +178,7 @@ class TestSnippets < Test::Unit::TestCase
         %w{a b c d}.each { |letter|
             path = "/tmp/create#{letter}test"
             assert_file(path)
-            if %w{a b}.include?(letter)
-                assert_mode_equal(0755, path)
-            end
+            assert_mode_equal(0755, path) if %w{a b}.include?(letter)
         }
     end
 
diff --git a/test/language/transportable.rb b/test/language/transportable.rb
index 4607c3947..37c67d6f8 100755
--- a/test/language/transportable.rb
+++ b/test/language/transportable.rb
@@ -50,9 +50,7 @@ class TestTransportable < Test::Unit::TestCase
     # Make sure our 'delve' command is working
     def test_delve
         top = mk_transtree do |object, depth, width|
-            if width % 2 == 1
-                object.file = :funtest
-            end
+            object.file = :funtest if width % 2 == 1
         end
 
         objects = []