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]

3 files changed, 4 insertions, 12 deletions

diff --git a/lib/puppet/network/client/ca.rb b/lib/puppet/network/client/ca.rb
index 2b96cd681..1460e4d6e 100644
--- a/lib/puppet/network/client/ca.rb
+++ b/lib/puppet/network/client/ca.rb
@@ -25,9 +25,7 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
         begin
             cert, cacert = @driver.getcert(csr.to_pem)
         rescue => detail
-            if Puppet[:trace]
-                puts detail.backtrace
-            end
+            puts detail.backtrace if Puppet[:trace]
             raise Puppet::Error.new("Certificate retrieval failed: #{detail}")
         end
 
diff --git a/lib/puppet/network/client/report.rb b/lib/puppet/network/client/report.rb
index 9bd61de2e..f4a9cdaa7 100644
--- a/lib/puppet/network/client/report.rb
+++ b/lib/puppet/network/client/report.rb
@@ -2,9 +2,7 @@ class Puppet::Network::Client::Report < Puppet::Network::Client
     @handler = Puppet::Network::Handler.handler(:report)
 
     def initialize(hash = {})
-        if hash.include?(:Report)
-            hash[:Report] = self.class.handler.new
-        end
+        hash[:Report] = self.class.handler.new if hash.include?(:Report)
 
         super(hash)
     end
@@ -14,9 +12,7 @@ class Puppet::Network::Client::Report < Puppet::Network::Client
     def report(transreport)
         report = YAML.dump(transreport)
 
-        unless self.local
-            report = CGI.escape(report)
-        end
+        report = CGI.escape(report) unless self.local
 
         # Now send the report
         file = nil
diff --git a/lib/puppet/network/client/runner.rb b/lib/puppet/network/client/runner.rb
index 5806dd343..c6ba328b4 100644
--- a/lib/puppet/network/client/runner.rb
+++ b/lib/puppet/network/client/runner.rb
@@ -2,9 +2,7 @@ class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient
     self.mkmethods
 
     def initialize(hash = {})
-        if hash.include?(:Runner)
-            hash[:Runner] = self.class.handler.new()
-        end
+        hash[:Runner] = self.class.handler.new() if hash.include?(:Runner)
 
         super(hash)
     end