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]

3 files changed, 3 insertions, 9 deletions

diff --git a/lib/puppet/transaction/event_manager.rb b/lib/puppet/transaction/event_manager.rb
index 9c5c166c4..34a434248 100644
--- a/lib/puppet/transaction/event_manager.rb
+++ b/lib/puppet/transaction/event_manager.rb
@@ -54,9 +54,7 @@ class Puppet::Transaction::EventManager
                 queue_events_for_resource(resource, edge.target, method, list)
             end
 
-            if resource.self_refresh? and ! resource.deleting?
-                queue_events_for_resource(resource, resource, :refresh, [event])
-            end
+            queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and ! resource.deleting?
         end
     end
 
diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 24e69ea7a..f9dfab3a3 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -79,9 +79,7 @@ class Puppet::Transaction::Report
                 end
             }.each do |name, label, value|
                 next if value == 0
-                if value.is_a?(Float)
-                    value = "%0.2f" % value
-                end
+                value = "%0.2f" % value if value.is_a?(Float)
                 ret += "   %15s %s\n" % [label + ":", value]
             end
         end
diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb
index d6076681a..36bb6029d 100644
--- a/lib/puppet/transaction/resource_harness.rb
+++ b/lib/puppet/transaction/resource_harness.rb
@@ -20,9 +20,7 @@ class Puppet::Transaction::ResourceHarness
         changes.each do |change|
             status << change.apply
 
-            if change.auditing?
-                cache(change.property.resource, change.property.name, change.is)
-            end
+            cache(change.property.resource, change.property.name, change.is) if change.auditing?
         end
         status.changed = true
     end