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/feature.rb b/lib/puppet/util/feature.rb
index 40ecfe447..30422ce4c 100644
--- a/lib/puppet/util/feature.rb
+++ b/lib/puppet/util/feature.rb
@@ -13,9 +13,7 @@ class Puppet::Util::Feature
     # successfully.
     def add(name, options = {})
         method = name.to_s + "?"
-        if self.class.respond_to?(method)
-            raise ArgumentError, "Feature #{name} is already defined"
-        end
+        raise ArgumentError, "Feature #{name} is already defined" if self.class.respond_to?(method)
 
         if block_given?
             begin
@@ -28,9 +26,7 @@ class Puppet::Util::Feature
         end
 
         meta_def(method) do
-            unless @results.include?(name)
-                @results[name] = test(name, options)
-            end
+            @results[name] = test(name, options) unless @results.include?(name)
             @results[name]
         end
     end
@@ -77,9 +73,7 @@ class Puppet::Util::Feature
     private
 
     def load_library(lib, name)
-        unless lib.is_a?(String)
-            raise ArgumentError, "Libraries must be passed as strings not #{lib.class}"
-        end
+        raise ArgumentError, "Libraries must be passed as strings not #{lib.class}" unless lib.is_a?(String)
 
         begin
             require lib