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/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb
index a5345e457..e35db6f56 100644
--- a/lib/puppet/provider/zone/solaris.rb
+++ b/lib/puppet/provider/zone/solaris.rb
@@ -17,9 +17,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
         }
 
         # Configured but not installed zones do not have IDs
-        if properties[:id] == "-"
-            properties.delete(:id)
-        end
+        properties.delete(:id) if properties[:id] == "-"
 
         properties[:ensure] = symbolize(properties[:ensure])
 
@@ -42,9 +40,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
         # Then perform all of our configuration steps.  It's annoying
         # that we need this much internal info on the resource.
         @resource.send(:properties).each do |property|
-            if property.is_a? ZoneConfigProperty and ! property.insync?(properties[property.name])
-                str += property.configtext + "\n"
-            end
+            str += property.configtext + "\n" if property.is_a? ZoneConfigProperty and ! property.insync?(properties[property.name])
         end
 
         str += "commit\n"
@@ -121,9 +117,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
                 hash[$1.intern] = $2
             when /^\s+(\S+):\s*(.+)$/
                 if name
-                    unless hash.include? name
-                        hash[name] = []
-                    end
+                    hash[name] = [] unless hash.include? name
 
                     unless current
                         current = {}
@@ -171,9 +165,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
                         f.puts cfg
                     end
                 rescue => detail
-                    if Puppet[:debug]
-                        puts detail.stacktrace
-                    end
+                    puts detail.stacktrace if Puppet[:debug]
                     raise Puppet::Error, "Could not create sysidcfg: #{detail}"
                 end
             end