diff options
Diffstat (limited to 'lib/puppet/external/event-loop')
| -rw-r--r-- | lib/puppet/external/event-loop/better-definers.rb | 16 | ||||
| -rw-r--r-- | lib/puppet/external/event-loop/event-loop.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/external/event-loop/signal-system.rb | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/puppet/external/event-loop/better-definers.rb b/lib/puppet/external/event-loop/better-definers.rb index 5d6175fe9..c600fc208 100644 --- a/lib/puppet/external/event-loop/better-definers.rb +++ b/lib/puppet/external/event-loop/better-definers.rb @@ -69,7 +69,7 @@ class Module new_aliases.kind_of? Array or new_aliases = [new_aliases] for new_alias in new_aliases do class_eval %{def #{new_alias}(*args, &block) - #{existing_name}(*args, &block) end} + #{existing_name}(*args, &block) end} end end end @@ -94,7 +94,7 @@ class Module end def writer_defined? (name) - method_defined? name.to_sym.writer + method_defined?(name.to_sym.writer) end # If you pass a predicate symbol :foo? to this method, it'll first @@ -110,7 +110,7 @@ class Module end if name.predicate? class_eval %{def #{name.imperative} - self.#{name.writer} true end} + self.#{name.writer} true end} end end end @@ -130,7 +130,7 @@ class Module def define_opposite_readers (name_pairs) name_pairs.collect! { |k, v| [k.to_sym, v.to_sym] } for opposite_name, name in name_pairs do - define_reader(name) unless method_defined? name + define_reader(name) unless method_defined?(name) class_eval %{def #{opposite_name} ; not #{name} end} end end @@ -138,11 +138,11 @@ class Module def define_opposite_writers (name_pairs) name_pairs.collect! { |k, v| [k.to_sym, v.to_sym] } for opposite_name, name in name_pairs do - define_writer(name) unless writer_defined? name + define_writer(name) unless writer_defined?(name) class_eval %{def #{opposite_name.writer} x - self.#{name.writer} !x end} + self.#{name.writer} !x end} class_eval %{def #{opposite_name.imperative} - self.#{name.writer} false end} + self.#{name.writer} false end} end end @@ -167,7 +167,7 @@ class Module define_opposite_writer(opposite_name => name) end - public :define_method + public :define_method def define_methods (*names, &body) names.each { |name| define_method(name, &body) } diff --git a/lib/puppet/external/event-loop/event-loop.rb b/lib/puppet/external/event-loop/event-loop.rb index 75febab80..06fa34607 100644 --- a/lib/puppet/external/event-loop/event-loop.rb +++ b/lib/puppet/external/event-loop/event-loop.rb @@ -118,7 +118,7 @@ class EventLoop end end - private + private def select (timeout) @wakeup_time = timeout ? Time.now + timeout : nil @@ -130,7 +130,7 @@ class EventLoop @timers.each { |x| x.sound_alarm if x.ready? } end - public + public def quit ; stopped! ; wake_up ; self end diff --git a/lib/puppet/external/event-loop/signal-system.rb b/lib/puppet/external/event-loop/signal-system.rb index 07feb9bf0..8d97c4359 100644 --- a/lib/puppet/external/event-loop/signal-system.rb +++ b/lib/puppet/external/event-loop/signal-system.rb @@ -35,7 +35,7 @@ module SignalEmitterModule def define_signal (name, slot=:before, &body) # Can't use `define_method' and take a block pre-1.9. class_eval %{ def on_#{name} &block - add_signal_handler(:#{name}, &block) end } + add_signal_handler(:#{name}, &block) end } define_signal_handler(name, :before, &lambda {|*a|}) define_signal_handler(name, :after, &lambda {|*a|}) define_signal_handler(name, slot, &body) if block_given? @@ -160,7 +160,7 @@ module SignalObserver names.each { |x| __ignore_signal_1(subject, x) } end - private + private def __ignore_signal_1(subject, name) @observed_signals[subject][name].each do |handler| |
