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/node.rb b/lib/puppet/node.rb
index 2418b3e44..47be43168 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -32,9 +32,7 @@ class Puppet::Node
     end
 
     def initialize(name, options = {})
-        unless name
-            raise ArgumentError, "Node names cannot be nil"
-        end
+        raise ArgumentError, "Node names cannot be nil" unless name
         @name = name
 
         if classes = options[:classes]
@@ -81,15 +79,11 @@ class Puppet::Node
     # Calculate the list of names we might use for looking
     # up our node.  This is only used for AST nodes.
     def names
-        if Puppet.settings[:strict_hostname_checking]
-            return [name]
-        end
+        return [name] if Puppet.settings[:strict_hostname_checking]
 
         names = []
 
-        if name.include?(".")
-            names += split_name(name)
-        end
+        names += split_name(name) if name.include?(".")
 
         # First, get the fqdn
         unless fqdn = parameters["fqdn"]
@@ -102,9 +96,7 @@ class Puppet::Node
 
         # Now that we (might) have the fqdn, add each piece to the name
         # list to search, in order of longest to shortest.
-        if fqdn
-            names += split_name(fqdn)
-        end
+        names += split_name(fqdn) if fqdn
 
         # And make sure the node name is first, since that's the most
         # likely usage.