pigeon 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d96b87babc1f6813e8ff15527562f5ac0e2dd5
-  data.tar.gz: 9caccf40e73318db4c32bd07e860463343707c28
+  metadata.gz: d553925f3fd1fb650f15aa7c7c060f3a7c43151b
+  data.tar.gz: 89d6307360636edbd6af8e5a06b6b3358af63bd7
 SHA512:
-  metadata.gz: 2c7a14327b778fe864519f99dc8147e3a06cd3a5b9a4bee703b6d8e247770eb91ebb65418008032dd96d9900b7366dd3518a9dcdc23b2ce7325c8510d7d108d8
-  data.tar.gz: ba1e0b601da14733fac4d5bb14cfc45701752f172c82eb5fe43c9a01728760c109df4a4574a1258d53c4caefe4f08c3d401b1ac1ad9d085a043638d03a53abbe
+  metadata.gz: 82cd662072522d65a24aa4ed0df2709f708d86f2ef2315b3119a45d01f9ac2c2a6135ac2812e9e0b0e39ee495121dcec9cabbbe54a9e0f85c759fe12875418a8
+  data.tar.gz: 1267fc9c55dff84fb2ad1dd1bb4da2dcdf400f52e483288403c4f46515209c9affd97d34fc399dcb96dbc0f4bd3e967a9c944ac8ad28ac6b45766f33e84045d5

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 before_install:
 - gem install bundler
 rvm:
-- 1.9.3-p551
 - 2.0.0-p598
 - 2.1.5
 - 2.2.0
+- 2.3.3
+- 2.4.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Scott Tadman, The Working Group Inc.
+Copyright (c) 2009-2017 Scott Tadman, PostageApp, The Working Group Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,8 +9,8 @@ begin
     gem.summary = %Q{Simple daemonized EventMachine engine framework with plug-in support}
     gem.description = %Q{Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job.}
     gem.email = "github@tadman.ca"
-    gem.homepage = "http://github.com/twg/pigeon"
-    gem.authors = %w[ tadman ]
+    gem.homepage = "http://github.com/postageapp/pigeon"
+    gem.authors = [ 'Scott Tadman' ]
     gem.executables  = [ ]
   end
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/pigeon/engine.rb

@@ -18,8 +18,8 @@ class Pigeon::Engine
   # == Properties ===========================================================
   
   option_accessor :logger
-  option_accessor :name
-  option_accessor :pid_file_name
+  option_writer :name
+  option_writer :pid_file_name
   option_accessor :foreground,
     boolean: true
   option_accessor :debug,
@@ -27,10 +27,13 @@ class Pigeon::Engine
   option_accessor :log_rotation
   option_accessor :engine_log_name,
     default: 'engine.log'
-  option_accessor :engine_logger
+  option_writer :engine_logger,
+    on: :class
+  option_accessor :engine_logger,
+    on: :instance
   option_accessor :query_log_name,
     default: 'query.log'
-  option_accessor :query_logger
+  option_writer :query_logger
   option_accessor :try_pid_dirs,
     default: %w[
       /var/run
@@ -69,12 +72,12 @@ class Pigeon::Engine
   # Returns the human-readable name of this engine. Defaults to the name
   # of the engine class, but can be replaced to customize a subclass.
   def self.name
-    @name or self.to_s.gsub(/::/, ' ')
+    @name ||= self.to_s.gsub(/::/, ' ')
   end
   
   # Returns the custom process name for this engine or nil if not assigned.
   def self.process_name
-    @process_name
+    @process_name ||= nil
   end
   
   # Assigns the process name. This will be applied only when the engine is
@@ -87,7 +90,7 @@ class Pigeon::Engine
   # user is required. This will be applied after the engine has been started
   # and the after_start call has been triggered.
   def self.user
-    @user
+    @user ||= nil
   end
   
   # Assigns the user this process should run as, given a username.
@@ -98,7 +101,7 @@ class Pigeon::Engine
   # Returns the name of the PID file to use. The full path to the file
   # is specified elsewhere.
   def self.pid_file_name
-    @pid_file_name or self.name.downcase.gsub(/ /, '-') + '.pid'
+    @pid_file_name ||= self.name.downcase.gsub(/ /, '-') + '.pid'
   end
   
   # Returns the full path to the PID file that should be used to track
@@ -144,6 +147,14 @@ class Pigeon::Engine
   end
 
   def self.start(options = nil)
+    if (self.pid_file.running?)
+      if (block_given?)
+        yield(self.pid_file.pid, false)
+      end
+
+      return self.pid_file.pid
+    end
+
     logger = self.engine_logger
     
     pid = Pigeon::Support.daemonize(logger) do
@@ -154,7 +165,7 @@ class Pigeon::Engine
 
     pid_file.create!(pid)
 
-    yield(pid) if (block_given?)
+    yield(pid, true) if (block_given?)
     
     pid
   end
@@ -238,7 +249,9 @@ class Pigeon::Engine
   # Returns a handle to the engine currently running, or nil if no engine is
   # currently active.
   def self.default_engine
-    @engines and @engines[0]
+    @engines ||= [ ]
+
+    @engines[0]
   end
 
   # Registers the engine as running. The first engine running will show up
@@ -250,6 +263,8 @@ class Pigeon::Engine
   
   # Removes the engine from the list of running engines.
   def self.unregister_engine(engine)
+    return unless (defined?(@engines))
+
     @engines.delete(engine)
   end
 
@@ -430,10 +445,9 @@ class Pigeon::Engine
     CHAINS.each do |chain_name|
       define_method(chain_name) do |&block|
         chain_iv = :"@_#{chain_name}_chain"
-        instance_variable_set(chain_iv, [ ]) unless (instance_variable_get(chain_iv))
-      
-        chain = instance_variable_get(chain_iv)
-      
+
+        chain = instance_variable_defined?(chain_iv) && instance_variable_get(chain_iv)
+
         unless (chain)
           chain = [ ]
           instance_variable_set(chain_iv, chain)
@@ -444,18 +458,10 @@ class Pigeon::Engine
     end
 
     def chain_procs(chain_name)
-      instance_variable_get(:"@_#{chain_name}_chain")
-    end
-  end
+      chain_iv = :"@_#{chain_name}_chain"
 
-  # Returns true if the debug option was set, false otherwise.
-  def debug?
-    !!self.debug
-  end
-  
-  # Returns true if running in the foreground, false otherwise.
-  def foreground?
-    !!self.foreground
+      instance_variable_defined?(chain_iv) and instance_variable_get(chain_iv)
+    end
   end
   
   # Registers a task with the engine. The given task will then be included

data/lib/pigeon/launcher.rb

@@ -3,16 +3,17 @@ require 'optparse'
 class Pigeon::Launcher
   # == Class Methods ========================================================
   
-  def self.launch(engine = Pigeon::Engine, *arguments)
+  def self.launch(engine = Pigeon::Engine, *arguments, logging: true)
     arguments = %w[ start ] if (arguments.empty?)
     
-    new(engine).handle_args(*arguments)
+    new(engine, logging: logging).handle_args(*arguments)
   end
     
   # == Instance Methods =====================================================
     
-  def initialize(with_engine = Pigeon::Engine)
+  def initialize(with_engine = Pigeon::Engine, logging: true)
     @engine = with_engine
+    @logging = !!logging
     
     yield(self) if (block_given?)
   end
@@ -39,9 +40,9 @@ class Pigeon::Launcher
     begin
       case (command)
       when 'start'
-        @engine.start do |pid|
-          yield(pid) if (block_given?)
-          self.start(pid)
+        @engine.start do |pid, launched|
+          yield(pid, launched) if (block_given?)
+          self.start(pid, launched)
         end
       when 'stop'
         @engine.stop do |pid|
@@ -79,8 +80,12 @@ class Pigeon::Launcher
     log "Use ^C to terminate."
   end
   
-  def start(pid)
-    log "#{@engine.name} now running. [%d]" % pid
+  def start(pid, launched)
+    if (launched)
+      log "#{@engine.name} now running. [%d]" % pid
+    else
+      log "#{@engine.name} already running. [%d]" % pid
+    end
   end
   
   def stop(pid)
@@ -116,6 +121,8 @@ class Pigeon::Launcher
   end
   
   def log(message)
-    puts message
+    if (@logging)
+      puts(message)
+    end
   end
 end

data/lib/pigeon/option_accessor.rb

@@ -5,9 +5,9 @@ module Pigeon::OptionAccessor
   # but these defaults can be over-ridden in subclasses and instances
   # without interference. Optional hash at end of list can be used to set:
   #  * :default => Assigns a default value which is otherwise nil
-  def option_accessor(*args)
-    option_reader(*args)
-    option_writer(*args)
+  def option_accessor(*args, boolean: false, default: nil, on: [ :class, :instance ])
+    option_reader(*args, boolean: boolean, default: default, on: on)
+    option_writer(*args, boolean: boolean, on: on)
   end
 
   # Given a list of names, this declares an option reader which works like
@@ -18,44 +18,48 @@ module Pigeon::OptionAccessor
   #  * :default => Assigns a default value which is otherwise nil
   #  * :boolean => If true, creates an additional name? method and will
   #                convert all assigned values to a boolean true/false.
-  def option_reader(*names)
+  def option_reader(*names, boolean: false, default: nil, on: [ :class, :instance ])
     names = [ names ].flatten.compact
-    options = names.last.is_a?(Hash) ? names.pop : { }
+    on = [ on ].flatten
     
     names.each do |name|
       iv = :"@#{name}"
 
-      (class << self; self; end).class_eval do
-        if (options[:boolean])
-          define_method(:"#{name}?") do
-            iv_value = instance_variable_get(iv)
+      if (on.include?(:class))
+        (class << self; self; end).class_eval do
+          if (boolean)
+            define_method(:"#{name}?") do
+              iv_value = instance_variable_defined?(iv) ? instance_variable_get(iv) : nil
 
-            !!(iv_value.nil? ? (self.superclass.respond_to?(name) ? self.superclass.send(name) : nil) : iv_value)
+              !!(iv_value.nil? ? (self.superclass.respond_to?(name) ? self.superclass.send(name) : nil) : iv_value)
+            end
           end
-        end
 
-        define_method(name) do
-          iv_value = instance_variable_get(iv)
-          
-          iv_value.nil? ? (self.superclass.respond_to?(name) ? self.superclass.send(name) : nil) : iv_value
+          define_method(name) do
+            iv_value = instance_variable_defined?(iv) ? instance_variable_get(iv) : nil
+            
+            iv_value.nil? ? (self.superclass.respond_to?(name) ? self.superclass.send(name) : nil) : iv_value
+          end
         end
       end
     
-      define_method(name) do
-        iv_value = instance_variable_get(iv)
+      if (on.include?(:instance))
+        define_method(name) do
+          iv_value = instance_variable_defined?(iv) ? instance_variable_get(iv) : nil
 
-        iv_value.nil? ? self.class.send(name) : iv_value
-      end
+          iv_value.nil? ? self.class.send(name) : iv_value
+        end
 
-      if (options[:boolean])
-        define_method(:"#{name}?") do
-          iv_value = instance_variable_get(iv)
+        if (boolean)
+          define_method(:"#{name}?") do
+            iv_value = instance_variable_defined?(iv) ? instance_variable_get(iv) : nil
 
-          !!(iv_value.nil? ? self.class.send(name) : iv_value)
+            !!(iv_value.nil? ? self.class.send(name) : iv_value)
+          end
         end
       end
       
-      instance_variable_set(iv, options[:default])
+      instance_variable_set(iv, default)
     end
   end
 
@@ -64,15 +68,29 @@ module Pigeon::OptionAccessor
   # defined for a class will propagate down to the instances and subclasses,
   # but these defaults can be over-ridden in subclasses and instances
   # without interference.
-  def option_writer(*names)
+  def option_writer(*names, boolean: false, on: [ :class, :instance ])
     names = [ names ].flatten.compact
-    options = names.last.is_a?(Hash) ? names.pop : { }
+    on = [ on ].flatten
     
     names.each do |name|
       iv = :"@#{name}"
 
-      (class << self; self; end).class_eval do
-        if (options[:boolean])
+      if (on.include?(:class))
+        (class << self; self; end).class_eval do
+          if (boolean)
+            define_method(:"#{name}=") do |value|
+              instance_variable_set(iv, value.nil? ? nil : !!value)
+            end
+          else
+            define_method(:"#{name}=") do |value|
+              instance_variable_set(iv, value)
+            end
+          end
+        end
+      end
+    
+      if (on.include?(:instance))
+        if (boolean)
           define_method(:"#{name}=") do |value|
             instance_variable_set(iv, value.nil? ? nil : !!value)
           end
@@ -82,16 +100,6 @@ module Pigeon::OptionAccessor
           end
         end
       end
-    
-      if (options[:boolean])
-        define_method(:"#{name}=") do |value|
-          instance_variable_set(iv, value.nil? ? nil : !!value)
-        end
-      else
-        define_method(:"#{name}=") do |value|
-          instance_variable_set(iv, value)
-        end
-      end
     end
   end
 end

data/lib/pigeon/pidfile.rb

@@ -20,15 +20,18 @@ class Pigeon::Pidfile
   end
   
   def running
-    pid = self.saved_pid
+    _pid = self.pid
 
-    (pid and Process.kill(0, pid)) ? pid : nil
+    (_pid and Process.kill(0, _pid)) ? _pid : nil
   rescue Errno::ESRCH
     nil
   end
   
-  def saved_pid
-    File.read(@path).to_i
+  def pid
+    contents = File.read(@path)
+
+    contents and contents.to_i
+    
   rescue Errno::ENOENT
     nil
   end

data/lib/pigeon/processor.rb

@@ -21,6 +21,7 @@ class Pigeon::Processor
     @id = Pigeon::Support.unique_id
     @filter = filter
     @context = context
+    @task = nil
     
     if (queue)
       self.queue = queue
@@ -32,7 +33,7 @@ class Pigeon::Processor
   # Assigns this processor to a particular queue. If one is already assigned
   # then the observer callback for that queue will be removed.
   def queue=(queue)
-    if (@queue)
+    if (defined?(@queue))
       @queue.remove_processor(self, &@claim)
     end
     

data/lib/pigeon/queue.rb

@@ -88,7 +88,7 @@ class Pigeon::Queue
       set << block
     end
 
-    task = assign_next_task(filter_name)
+    assign_next_task(filter_name)
   end
   
   # Removes references to the callback function specified. Note that the same
@@ -198,6 +198,8 @@ class Pigeon::Queue
   
   # Iterates over each of the tasks in the queue.
   def each
+    tasks = nil
+
     @filters.synchronize do
       tasks = @tasks.dup
     end
@@ -243,9 +245,9 @@ class Pigeon::Queue
 
       @tasks -= tasks
       
-      @next_task.each do |filter_name, next_task|
-        if (tasks.include?(@next_task[filter_name]))
-          @next_task[filter_name] = nil
+      @next_task.keys.each do |_filter_name|
+        if (tasks.include?(@next_task[_filter_name]))
+          @next_task[_filter_name] = nil
         end
       end
       
@@ -276,9 +278,9 @@ class Pigeon::Queue
       if (task)
         @tasks.delete(task)
 
-        @next_task.each do |filter_name, next_task|
+        @next_task.each do |_filter_name, next_task|
           if (task == next_task)
-            @next_task[filter_name] = nil
+            @next_task[_filter_name] = nil
           end
         end
       end

data/lib/pigeon/scheduler.rb

@@ -91,7 +91,7 @@ class Pigeon::Scheduler
   
   # Returns the number of tasks that have been queued up.
   def queue_length
-    @queues.inject(0) do |length, (name, queue)|
+    @queues.inject(0) do |length, (_, queue)|
       length + queue.length
     end
   end

data/lib/pigeon/support.rb

@@ -49,7 +49,7 @@ module Pigeon::Support
               relaunch = false
             end
 
-            pid, status = Process.wait2(daemon_pid)
+            _, status = Process.wait2(daemon_pid)
 
             if (interrupted)
               logger.info("Supervisor #{Process.pid} received termination signal, shut down child #{daemon_pid}.")
@@ -57,7 +57,7 @@ module Pigeon::Support
 
             # A non-zero exit status indicates some sort of error, so the
             # process will be relaunched after a short delay.
-            relaunch = ($? != 0)
+            relaunch = (status != 0)
 
           ensure
             # Reset Signal handler before forking again
@@ -86,7 +86,7 @@ module Pigeon::Support
       wfd.close
     end
 
-    pid, status = Process.wait2(forked_pid)
+    Process.wait2(forked_pid)
 
     daemon_pid = rfd.readline
     rfd.close

data/lib/pigeon/task.rb

@@ -40,6 +40,7 @@ class Pigeon::Task
     @context = context
     @engine = engine || Pigeon::Engine.default_engine
     @created_at = Time.now
+    @state = nil
 
     unless (@engine)
       raise EngineRequired, "Task creation requires an active Pigeon::Engine"

data/pigeon.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pigeon 1.0.2 ruby lib
+# stub: pigeon 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "pigeon"
-  s.version = "1.0.2"
+  s.name = "pigeon".freeze
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["tadman"]
-  s.date = "2015-04-15"
-  s.description = "Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job."
-  s.email = "github@tadman.ca"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Scott Tadman".freeze]
+  s.date = "2017-09-22"
+  s.description = "Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job.".freeze
+  s.email = "github@tadman.ca".freeze
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -54,29 +54,29 @@ Gem::Specification.new do |s|
     "test/unit/pigeon_task_test.rb",
     "test/unit/pigeon_test.rb"
   ]
-  s.homepage = "http://github.com/twg/pigeon"
-  s.rubygems_version = "2.2.2"
-  s.summary = "Simple daemonized EventMachine engine framework with plug-in support"
+  s.homepage = "http://github.com/postageapp/pigeon".freeze
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Simple daemonized EventMachine engine framework with plug-in support".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-      s.add_development_dependency(%q<minitest-reporters>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>.freeze, [">= 0"])
+      s.add_development_dependency(%q<minitest-reporters>.freeze, [">= 0"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<eventmachine>, [">= 0"])
-      s.add_dependency(%q<minitest-reporters>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<eventmachine>.freeze, [">= 0"])
+      s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
+      s.add_dependency(%q<minitest>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<eventmachine>, [">= 0"])
-    s.add_dependency(%q<minitest-reporters>, [">= 0"])
-    s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<eventmachine>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest-reporters>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -8,8 +8,12 @@ module Minitest
   # status code based on test results is okay for the parent process, but
   # causes friction when using fork within tests. Here it's disabled unless
   # the process terminating is the parent.
+  class << self
+    undef_method(:autorun)
+  end
+
   def self.autorun
-    return if (@at_exit_hook_installed)
+    return if (defined?(@at_exit_hook_installed))
 
     @at_exit_hook_installed = Process.pid
 
@@ -51,10 +55,10 @@ class Minitest::Test
     flunk(message || 'assert_timeout timed out')
   end
   
-  def assert_eventually(time = nil, message = nil, &block)
+  def assert_eventually(time = nil, message = nil)
     start_time = Time.now.to_f
 
-    while (!block.call)
+    while (!yield)
       select(nil, nil, nil, 0.1)
       
       if (time and (Time.now.to_f - start_time > time))
@@ -64,6 +68,7 @@ class Minitest::Test
   end
 
   def engine
+    @engine = nil
     exception = nil
     test_thread = nil
     
@@ -79,7 +84,13 @@ class Minitest::Test
             @engine = launched
           end
 
-        rescue Object => exception
+        rescue Object => e
+          # $stderr.puts('[%s] %s' % [ e.class, e ])
+          # $stderr.puts(e.backtrace.join("\n"))
+
+          exception = e
+
+          Thread.current.kill
         end
       end
 
@@ -90,10 +101,14 @@ class Minitest::Test
         begin
           while (!@engine or Pigeon::Engine.default_engine != @engine)
             # Wait impatiently.
+            if (exception)
+              Thread.current.kill
+            end
           end
 
           yield(@engine)
-        rescue Object => exception
+        rescue Object => e
+          exception = e
         ensure
           begin
             if (EventMachine.reactor_running?)

data/test/unit/pigeon_backlog_test.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class PigeonQueueTest < Minitest::Test
+class PigeonBacklogTest < Minitest::Test
   def test_empty_queue
     queue = Pigeon::Queue.new
     
     assert queue.empty?
     assert_equal 0, queue.length
     
-    assert_equal nil, queue.pop
+    assert_nil queue.pop
   end
   
   def test_queue_cycling

data/test/unit/pigeon_dispatcher_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonDispatcherTest < Minitest::Test
   def test_routine_dispatching

data/test/unit/pigeon_engine_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 module TestModule
   def self.included(engine)
@@ -76,7 +76,7 @@ class TestPigeonEngine < Minitest::Test
     assert TestEngine.engine_logger
     assert TestEngine.engine_logger.is_a?(Logger)
 
-    assert_equal nil, TestEngine.default_engine
+    assert_nil TestEngine.default_engine
   end
   
   def test_example_subclass
@@ -104,7 +104,7 @@ class TestPigeonEngine < Minitest::Test
     end
 
     TestEngine.status do |pid|
-      assert_equal nil, pid
+      assert_nil pid
     end
   end
 
@@ -129,7 +129,7 @@ class TestPigeonEngine < Minitest::Test
     
     assert_equal engine_pid, TestEngine.stop
 
-    assert_equal nil, TestEngine.status
+    assert_nil TestEngine.status
   end
   
   def test_callbacks
@@ -158,7 +158,7 @@ class TestPigeonEngine < Minitest::Test
     end
 
     CallbackTestEngine.status do |pid|
-      assert_equal nil, pid
+      assert_nil pid
     end
     
     expected_callbacks = [

data/test/unit/pigeon_launcher_test.rb

@@ -1,14 +1,8 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
-
-class Pigeon::Launcher
-  def log(*args)
-    # Disabled for testing.
-  end
-end
+require_relative '../helper'
 
 class PigeonLauncherTest < Minitest::Test
   def test_default_launcher
-    pid = Pigeon::Launcher.launch
+    pid = Pigeon::Launcher.launch(logging: false)
     
     assert pid, "PID should be returned from launcher call"
     assert Pigeon::Engine.running?
@@ -19,7 +13,7 @@ class PigeonLauncherTest < Minitest::Test
   end
 
   def test_triggers
-    launcher = Pigeon::Launcher.new(Pigeon::Engine)
+    launcher = Pigeon::Launcher.new(Pigeon::Engine, logging: false)
 
     triggered = Hash.new { |h,k| h[k] = [ ] }
     

data/test/unit/pigeon_option_accessor_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class OptionClass
   extend Pigeon::OptionAccessor
@@ -57,15 +57,15 @@ class PigeonOptionAccessorTest < Minitest::Test
   end
 
   def test_boolean_option
-    assert_equal nil, OptionClass.multi1
+    assert_nil OptionClass.multi1
     
     instance = OptionClass.new
     
     instance.multi1 = false
     
     assert_equal false, instance.multi1
-    assert_equal nil, OptionClass.multi1
+    assert_nil OptionClass.multi1
     
-    assert_equal nil, instance.multi2
+    assert_nil instance.multi2
   end
 end

data/test/unit/pigeon_processor_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonProcessorTest < Minitest::Test
   class TaggedTask < Pigeon::Task
@@ -87,6 +87,8 @@ class PigeonProcessorTest < Minitest::Test
       assert_eventually(5) do
         queue.empty?
       end
+
+      assert !processor.task?
     end
   end
   
@@ -137,7 +139,7 @@ class PigeonProcessorTest < Minitest::Test
     
       processor.queue = nil
     
-      assert_equal nil, processor.queue
+      assert_nil processor.queue
       assert_equal [ ], queue.processors
     end
   end

data/test/unit/pigeon_queue_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonQueueTest < Minitest::Test
   class TaggedTask < Pigeon::Task
@@ -20,7 +20,7 @@ class PigeonQueueTest < Minitest::Test
     assert_equal 0, queue.length
     assert_equal true, queue.empty?
     
-    assert_equal nil, queue.pop
+    assert_nil queue.pop
     
     assert_equal [ ], queue.processors
   end
@@ -80,6 +80,8 @@ class PigeonQueueTest < Minitest::Test
       assert_equal 2, queue.length(:over_7)
     
       pulled_task = queue.pop(:over_7)
+
+      assert pulled_task
     
       assert_equal 9, queue.length
 
@@ -88,7 +90,7 @@ class PigeonQueueTest < Minitest::Test
     
       queue.pop(:over_7)
 
-      assert_equal nil, queue.peek(:over_7)
+      assert_nil queue.peek(:over_7)
       assert_equal 0, queue.length(:over_7)
       assert_equal true, queue.empty?(:over_7)
     
@@ -104,7 +106,7 @@ class PigeonQueueTest < Minitest::Test
     
       queue.claim(new_task)
     
-      assert_equal nil, queue.peek(:over_7)
+      assert_nil queue.peek(:over_7)
       assert_equal 0, queue.length(:over_7)
       assert_equal true, queue.empty?(:over_7)
     end
@@ -146,7 +148,7 @@ class PigeonQueueTest < Minitest::Test
         queue.include?(new_task)
       end
     
-      assert_equal nil, added_odd
+      assert_nil added_odd
 
       odd_1 = queue << TaggedTask.new(11)
       
@@ -167,7 +169,7 @@ class PigeonQueueTest < Minitest::Test
       # Observer callbacks are not triggered on existing data, only on new
       # insertions.
       assert_equal false, has_run
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal 7, queue.length
       assert_equal 1, queue.length(:odd)
 
@@ -177,7 +179,7 @@ class PigeonQueueTest < Minitest::Test
         queue.include?(new_task)
       end
     
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal 8, queue.length
       assert_equal 1, queue.length(:odd)
 
@@ -203,7 +205,7 @@ class PigeonQueueTest < Minitest::Test
         queue.include?(new_task)
       end
 
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal false, has_run
 
       odd_2 = queue << TaggedTask.new(15)
@@ -232,7 +234,7 @@ class PigeonQueueTest < Minitest::Test
         end
       end
     
-      new_task = queue << TaggedTask.new(0)
+      queue << TaggedTask.new(0)
       
       assert_eventually(2) do
         queue.peek

data/test/unit/pigeon_scheduler_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonSchedulerTest < Minitest::Test
   class TaggedTask < Pigeon::Task

data/test/unit/pigeon_sorted_array_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonSortedArrayTest < Minitest::Test
   def test_empty_state

data/test/unit/pigeon_task_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class TerminateTask < Pigeon::Task
   def state_initialized!
@@ -67,7 +67,7 @@ class PigeonTaskTest < Minitest::Test
       assert_equal 1, reported
       assert_equal :finished, task.state
 
-      assert_equal nil, task.exception
+      assert_nil task.exception
     
       assert_equal @engine.object_id, task.engine.object_id
     end
@@ -99,7 +99,7 @@ class PigeonTaskTest < Minitest::Test
         task.finished?
       end
     
-      assert_equal nil, task.exception
+      assert_nil task.exception
     
       assert_equal :finished, task.state
 

data/test/unit/pigeon_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class TestPigeon < Minitest::Test
   def test_load_module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigeon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
-- tadman
+- Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -109,7 +109,7 @@ files:
 - test/unit/pigeon_sorted_array_test.rb
 - test/unit/pigeon_task_test.rb
 - test/unit/pigeon_test.rb
-homepage: http://github.com/twg/pigeon
+homepage: http://github.com/postageapp/pigeon
 licenses: []
 metadata: {}
 post_install_message: 
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple daemonized EventMachine engine framework with plug-in support