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

diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb
index 4e618d5ee..e478912b2 100644
--- a/lib/puppet/reports/rrdgraph.rb
+++ b/lib/puppet/reports/rrdgraph.rb
@@ -22,9 +22,7 @@ Puppet::Reports.register_report(:rrdgraph) do
         which defaults to the ``runinterval``."
 
     def hostdir
-        unless defined?(@hostdir)
-            @hostdir = File.join(Puppet[:rrddir], self.host)
-        end
+        @hostdir = File.join(Puppet[:rrddir], self.host) unless defined?(@hostdir)
         @hostdir
     end
 
@@ -118,9 +116,7 @@ Puppet::Reports.register_report(:rrdgraph) do
             metric.graph
         end
 
-        unless FileTest.exists?(File.join(hostdir, "index.html"))
-            mkhtml()
-        end
+        mkhtml() unless FileTest.exists?(File.join(hostdir, "index.html"))
     end
 
     # Unfortunately, RRD does not deal well with changing lists of values,
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index 547b45a33..aa99a7260 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -33,9 +33,7 @@ Puppet::Reports.register_report(:store) do
 
         dir = File.join(Puppet[:reportdir], client)
 
-        unless FileTest.exists?(dir)
-            mkclientdir(client, dir)
-        end
+        mkclientdir(client, dir) unless FileTest.exists?(dir)
 
         # Now store the report.
         now = Time.now.gmtime
@@ -51,9 +49,7 @@ Puppet::Reports.register_report(:store) do
                 f.print to_yaml
             end
         rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
+            puts detail.backtrace if Puppet[:trace]
             Puppet.warning "Could not write report for #{client} at #{file}: #{detail}"
         end
 
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 270cadb91..1e6c52bfc 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -53,9 +53,7 @@ Puppet::Reports.register_report(:tagmail) do
 
             # Now go through and remove any messages that match our negative tags
             messages = messages.reject do |log|
-                if neg.detect do |tag| log.tagged?(tag) end
-                    true
-                end
+                true if neg.detect do |tag| log.tagged?(tag) end
             end
 
             if messages.empty?
@@ -138,9 +136,7 @@ Puppet::Reports.register_report(:tagmail) do
                         end
                     end
                 rescue => detail
-                    if Puppet[:debug]
-                        puts detail.backtrace
-                    end
+                    puts detail.backtrace if Puppet[:debug]
                     raise Puppet::Error,
                         "Could not send report emails through smtp: #{detail}"
                 end
@@ -157,9 +153,7 @@ Puppet::Reports.register_report(:tagmail) do
                         end
                     end
                 rescue => detail
-                    if Puppet[:debug]
-                        puts detail.backtrace
-                    end
+                    puts detail.backtrace if Puppet[:debug]
                     raise Puppet::Error,
                         "Could not send report emails via sendmail: #{detail}"
                 end