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/external/event-loop/event-loop.rb    | 16 ++++------------
 lib/puppet/external/event-loop/signal-system.rb |  4 +---
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'lib/puppet/external/event-loop')

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
-- 
cgit