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]

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index c5bfe4722..314f9c136 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -147,9 +147,7 @@ class Puppet::Util::Reference
         options[:level] ||= 5
         #str = "#{name} : "
         str = h(name, options[:level])
-        if options[:namevar]
-            str += "- **namevar**\n\n"
-        end
+        str += "- **namevar**\n\n" if options[:namevar]
         str += text
         #str += text.gsub(/\n/, "\n    ")
 
@@ -170,17 +168,13 @@ class Puppet::Util::Reference
         # First the header
         text = h(@title, 1)
         text += "\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on #{Time.now.to_s})*\n\n"
-        if withcontents
-            text +=  ".. contents:: :depth: #{@depth}\n\n"
-        end
+        text +=  ".. contents:: :depth: #{@depth}\n\n" if withcontents
 
         text += @header
 
         text += generate()
 
-        if withcontents
-            text += self.class.footer
-        end
+        text += self.class.footer if withcontents
 
         return text
     end