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, 4 insertions, 4 deletions

diff --git a/autotest/rspec.rb b/autotest/rspec.rb
index 89978d866..42f4c004b 100644
--- a/autotest/rspec.rb
+++ b/autotest/rspec.rb
@@ -29,7 +29,7 @@ class Autotest::Rspec < Autotest
     def consolidate_failures(failed)
         filters = Hash.new { |h,k| h[k] = [] }
         failed.each do |spec, failed_trace|
-            if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) } then
+            if f = test_files_for(failed).find { |f| failed_trace =~ Regexp.new(f) }
                 filters[f] << spec
                 break
             end
@@ -50,7 +50,7 @@ class Autotest::Rspec < Autotest
     # ~/.autotest to provide a different spec command then the default
     # paths provided.
     def spec_command(separator=File::ALT_SEPARATOR)
-        unless defined?(@spec_command) then
+        unless defined?(@spec_command)
             @spec_command = spec_commands.find { |cmd| File.exists? cmd }
 
             raise RspecCommandError, "No spec command could be found!" unless @spec_command
diff --git a/autotest/watcher.rb b/autotest/watcher.rb
index 0beaca7c6..99a7d1bb7 100644
--- a/autotest/watcher.rb
+++ b/autotest/watcher.rb
@@ -13,7 +13,7 @@ def run_comp(cmd)
                 c = f.getc
                 putc c
                 line << c
-                if c == ?\n then
+                if c == ?\n
                     results << if RUBY_VERSION >= "1.9" then
                         line.join
                             else
@@ -125,7 +125,7 @@ end
 
 # Ctrl-C
 Signal.trap 'INT' do
-    if @interrupted then
+    if @interrupted
         @wants_to_quit = true
         abort("\n")
     else