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

diff --git a/lib/puppet/util/settings/setting.rb b/lib/puppet/util/settings/setting.rb
index 6f8e39209..c3a037102 100644
--- a/lib/puppet/util/settings/setting.rb
+++ b/lib/puppet/util/settings/setting.rb
@@ -37,16 +37,12 @@ class Puppet::Util::Settings::Setting
 
         args.each do |param, value|
             method = param.to_s + "="
-            unless self.respond_to? method
-                raise ArgumentError, "#{self.class} does not accept #{param}"
-            end
+            raise ArgumentError, "#{self.class} does not accept #{param}" unless self.respond_to? method
 
             self.send(method, value)
         end
 
-        unless self.desc
-            raise ArgumentError, "You must provide a description for the #{self.name} config option"
-        end
+        raise ArgumentError, "You must provide a description for the #{self.name} config option" unless self.desc
     end
 
     def iscreated
@@ -71,9 +67,7 @@ class Puppet::Util::Settings::Setting
 
     # short name for the celement
     def short=(value)
-        if value.to_s.length != 1
-            raise ArgumentError, "Short names can only be one character."
-        end
+        raise ArgumentError, "Short names can only be one character." if value.to_s.length != 1
         @short = value.to_s
     end
 
@@ -82,9 +76,7 @@ class Puppet::Util::Settings::Setting
         str = @desc.gsub(/^/, "# ") + "\n"
 
         # Add in a statement about the default.
-        if defined?(@default) and @default
-            str += "# The default value is '#{@default}'.\n"
-        end
+        str += "# The default value is '#{@default}'.\n" if defined?(@default) and @default
 
         # If the value has not been overridden, then print it out commented
         # and unconverted, so it's clear that that's the default and how it