From 81e283b28cdd91d259e3b60687aee7ea66e9d05d Mon Sep 17 00:00:00 2001
From: Markus Roberts <Markus@reality.com>
Date: Fri, 9 Jul 2010 18:06:06 -0700
Subject: 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]
---
 lib/puppet/reference/providers.rb | 4 +---
 lib/puppet/reference/type.rb      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib/puppet/reference')

diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb
index cc47876d6..b19549350 100644
--- a/lib/puppet/reference/providers.rb
+++ b/lib/puppet/reference/providers.rb
@@ -9,9 +9,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
     types.sort! { |a,b| a.name.to_s <=> b.name.to_s }
 
     command_line = Puppet::Util::CommandLine.new
-    unless command_line.args.empty?
-        types.reject! { |type| ! command_line.args.include?(type.name.to_s) }
-    end
+    types.reject! { |type| ! command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
 
     ret = "Details about this host:\n\n"
 
diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb
index 6bd8be835..c52e764d6 100644
--- a/lib/puppet/reference/type.rb
+++ b/lib/puppet/reference/type.rb
@@ -78,9 +78,7 @@ type = Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource
         }.each { |sname|
             property = type.propertybyname(sname)
 
-            unless property
-                raise "Could not retrieve property #{sname} on type #{type.name}"
-            end
+            raise "Could not retrieve property #{sname} on type #{type.name}" unless property
 
             doc = nil
             unless doc = property.doc
-- 
cgit