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]

5 files changed, 20 insertions, 60 deletions

diff --git a/lib/puppet/external/event-loop/event-loop.rb b/lib/puppet/external/event-loop/event-loop.rb
index 06fa34607..bd278556c 100644
--- a/lib/puppet/external/event-loop/event-loop.rb
+++ b/lib/puppet/external/event-loop/event-loop.rb
@@ -141,16 +141,12 @@ class EventLoop
 
     def monitor_io (io, *events)
         for event in events do
-            unless monitoring_io?(io, event)
-                @ios[event] << io ; wake_up
-            end
+            @ios[event] << io ; wake_up unless monitoring_io?(io, event)
         end
     end
 
     def monitor_timer (timer)
-        unless monitoring_timer? timer
-            @timers << timer
-        end
+        @timers << timer unless monitoring_timer? timer
     end
 
     def check_timer (timer)
@@ -264,9 +260,7 @@ class EventLoop::Timer
         @running = false
         @start_time = nil
 
-        if options.kind_of? Numeric
-            options = { :interval => options }
-        end
+        options = { :interval => options } if options.kind_of? Numeric
 
         if options[:interval]
             @interval = options[:interval].to_f
@@ -301,9 +295,7 @@ class EventLoop::Timer
     def interval= (new_interval)
         old_interval = @interval
         @interval = new_interval
-        if new_interval < old_interval
-            @event_loop.check_timer(self)
-        end
+        @event_loop.check_timer(self) if new_interval < old_interval
     end
 
     def end_time
diff --git a/lib/puppet/external/event-loop/signal-system.rb b/lib/puppet/external/event-loop/signal-system.rb
index 8d97c4359..0ea3552f2 100644
--- a/lib/puppet/external/event-loop/signal-system.rb
+++ b/lib/puppet/external/event-loop/signal-system.rb
@@ -63,9 +63,7 @@ SignalEmitterClass = SignalEmitterModule
 
 module SignalEmitter
     def self.included (includer)
-        if not includer.kind_of? SignalEmitterClass
-            includer.extend SignalEmitterClass
-        end
+        includer.extend SignalEmitterClass if not includer.kind_of? SignalEmitterClass
     end
 
     def __maybe_initialize_signal_emitter
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index d3766e6f5..9ffac4391 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -245,9 +245,7 @@ class Nagios::Base
             map = {
                 self.namevar => "cn"
             }
-            if self.class.map
-                map.update(self.class.map)
-            end
+            map.update(self.class.map) if self.class.map
         end
         if map.include?(param)
             return map[param]
@@ -290,9 +288,7 @@ class Nagios::Base
             str += "objectclass: #{oc}\n"
         }
         @parameters.each { |name,value|
-            if self.class.suppress.include?(name)
-                next
-            end
+            next if self.class.suppress.include?(name)
             ldapname = self.parammap(name)
             str += ldapname + ": #{value}\n"
         }
diff --git a/lib/puppet/external/nagios/parser.rb b/lib/puppet/external/nagios/parser.rb
index 80b912bc0..7e83f0346 100644
--- a/lib/puppet/external/nagios/parser.rb
+++ b/lib/puppet/external/nagios/parser.rb
@@ -24,22 +24,16 @@ self.class.module_eval <<'..end racc/parser.rb modeval..id5256434e8a', 'racc/par
 # without restriction.
 #
 
-unless defined?(NotImplementedError)
-    NotImplementedError = NotImplementError
-end
+NotImplementedError = NotImplementError unless defined?(NotImplementedError)
 
 module Racc
     class ParseError < StandardError; end
 end
-unless defined?(::ParseError)
-    ParseError = Racc::ParseError
-end
+ParseError = Racc::ParseError unless defined?(::ParseError)
 
 module Racc
 
-    unless defined?(Racc_No_Extentions)
-        Racc_No_Extentions = false
-    end
+    Racc_No_Extentions = false unless defined?(Racc_No_Extentions)
 
     class Parser
 
@@ -52,12 +46,8 @@ module Racc
             require 'racc/cparse'
         # Racc_Runtime_Core_Version_C  = (defined in extention)
             Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
-            unless new.respond_to?(:_racc_do_parse_c, true)
-                raise LoadError, 'old cparse.so'
-            end
-            if Racc_No_Extentions
-                raise LoadError, 'selecting ruby version of racc runtime core'
-            end
+            raise LoadError, 'old cparse.so' unless new.respond_to?(:_racc_do_parse_c, true)
+            raise LoadError, 'selecting ruby version of racc runtime core' if Racc_No_Extentions
 
             Racc_Main_Parsing_Routine    = :_racc_do_parse_c
             Racc_YY_Parse_Method         = :_racc_yyparse_c
@@ -487,22 +477,16 @@ def token
         return [ :RETURN, "\n" ]
         end
 
-        if @done
-            return nil
-        end
+        return nil if @done
         yytext = String.new
 
 
         # remove comments from this line
         @src.sub!(/\A[ \t]*;.*\n/,"\n")
-        if $MATCH
-            return [:INLINECOMMENT, ""]
-        end
+        return [:INLINECOMMENT, ""] if $MATCH
 
         @src.sub!(/\A#.*\n/,"\n")
-        if $MATCH
-            return [:COMMENT, ""]
-        end
+        return [:COMMENT, ""] if $MATCH
 
         @src.sub!(/#.*/,'')
 
@@ -582,9 +566,7 @@ def on_error(token, value, vstack )
         else
             msg = "line #{@line}: syntax error at '#{token}'"
         end
-        unless @src.size > 0
-            msg = "line #{@line}: Unexpected end of file"
-        end
+        msg = "line #{@line}: Unexpected end of file" unless @src.size > 0
         if token == '$end'.intern
             puts "okay, this is silly"
         else
diff --git a/lib/puppet/external/pson/pure/parser.rb b/lib/puppet/external/pson/pure/parser.rb
index ef05637e4..2d0a03066 100644
--- a/lib/puppet/external/pson/pure/parser.rb
+++ b/lib/puppet/external/pson/pure/parser.rb
@@ -144,9 +144,7 @@ module PSON
                             PSON::UTF16toUTF8.iconv(bytes)
                         end
                     end
-                    if string.respond_to?(:force_encoding)
-                        string.force_encoding(Encoding::UTF_8)
-                    end
+                    string.force_encoding(Encoding::UTF_8) if string.respond_to?(:force_encoding)
                     string
                 else
                     UNPARSED
@@ -209,9 +207,7 @@ module PSON
                             raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
                         end
                     when scan(ARRAY_CLOSE)
-                        if delim
-                            raise ParserError, "expected next element in array at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected next element in array at '#{peek(20)}'!" if delim
                         break
                     when skip(IGNORE)
                         ;
@@ -231,9 +227,7 @@ module PSON
                     case
                     when (string = parse_string) != UNPARSED
                         skip(IGNORE)
-                        unless scan(PAIR_DELIMITER)
-                            raise ParserError, "expected ':' in object at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected ':' in object at '#{peek(20)}'!" unless scan(PAIR_DELIMITER)
                         skip(IGNORE)
                         unless (value = parse_value).equal? UNPARSED
                             result[string] = value
@@ -250,9 +244,7 @@ module PSON
                             raise ParserError, "expected value in object at '#{peek(20)}'!"
                         end
                     when scan(OBJECT_CLOSE)
-                        if delim
-                            raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
-                        end
+                        raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!" if delim
                         if @create_id and klassname = result[@create_id]
                             klass = PSON.deep_const_get klassname
                             break unless klass and klass.pson_creatable?