qs 0.2.0 → 0.3.0

data/bench/report.txt

@@ -5,7 +5,7 @@ Adding jobs
 Running jobs
 ....................................................................................................
 
-Adding 10000 Jobs Time:   1.6155s
-Running 10000 Jobs Time: 12.4848s
+Adding 10000 Jobs Time:   1.6133s
+Running 10000 Jobs Time: 12.4769s
 
 Done running benchmark report

data/lib/qs/client.rb

@@ -55,6 +55,10 @@ module Qs
         self.redis.with{ |c| c.del(redis_key) }
       end
 
+      def ping
+        self.redis.with{ |c| c.ping }
+      end
+
     end
 
   end

data/lib/qs/daemon.rb

@@ -71,7 +71,11 @@ module Qs
         !!(@work_loop_thread && @work_loop_thread.alive?)
       end
 
+      # * Ping redis to check that it can communicate with redis before running,
+      #   this is friendlier than starting and continously erroring because it
+      #   can't dequeue.
       def start
+        @client.ping
         @signal.set :start
         @work_loop_thread ||= Thread.new{ work_loop }
       end
@@ -160,7 +164,8 @@ module Qs
 
       def wait_for_available_worker
         if !@worker_pool.worker_available? && @signal.start?
-          @worker_available_io.wait.read
+          @worker_available_io.wait
+          @worker_available_io.read
         end
       end
 

data/lib/qs/io_pipe.rb

@@ -31,9 +31,8 @@ module Qs
       @writer.write_nonblock(value[0, NUMBER_OF_BYTES])
     end
 
-    def wait
-      ::IO.select([@reader])
-      self
+    def wait(timeout = nil)
+      !!::IO.select([@reader], nil, nil, timeout)
     end
 
   end

data/lib/qs/process.rb

@@ -9,6 +9,8 @@ module Qs
     STOP    = 'S'.freeze
     RESTART = 'R'.freeze
 
+    WAIT_FOR_SIGNALS_TIMEOUT = 15
+
     attr_reader :daemon, :name
     attr_reader :pid_file, :signal_io, :restart_cmd
 
@@ -77,9 +79,14 @@ module Qs
     end
 
     def wait_for_signals(signal_io, daemon)
-      while signal_io.wait do
-        os_signal = signal_io.read
-        handle_signal(os_signal, daemon)
+      loop do
+        ready = signal_io.wait(WAIT_FOR_SIGNALS_TIMEOUT)
+        handle_signal(signal_io.read, daemon) if ready
+
+        if !daemon.running?
+          log "Daemon crashed, restarting"
+          start_daemon(daemon)
+        end
       end
     end
 

data/lib/qs/version.rb

@@ -1,3 +1,3 @@
 module Qs
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/unit/client_tests.rb

@@ -127,6 +127,13 @@ module Qs::Client
       assert_equal [@queue_redis_key], call.args
     end
 
+    should "ping redis using `ping`" do
+      subject.ping
+
+      call = @connection_spy.redis_calls.last
+      assert_equal :ping, call.command
+    end
+
   end
 
   class QsClientTests < UnitTests

data/test/unit/daemon_tests.rb

@@ -218,6 +218,11 @@ module Qs::Daemon
       @thread.join 0.1
     end
 
+    should "ping redis" do
+      call = @client_spy.calls.first
+      assert_equal :ping, call.command
+    end
+
     should "return the thread that is running the daemon" do
       assert_instance_of Thread, @thread
       assert_true @thread.alive?
@@ -228,8 +233,8 @@ module Qs::Daemon
     end
 
     should "clear the signals list in redis" do
-      call = @client_spy.calls.first
-      assert_equal :clear, call.command
+      call = @client_spy.calls.find{ |c| c.command == :clear }
+      assert_not_nil call
       assert_equal [subject.signals_redis_key], call.args
     end
 
@@ -710,6 +715,10 @@ module Qs::Daemon
       @calls << Call.new(:clear, args)
     end
 
+    def ping
+      @calls << Call.new(:ping)
+    end
+
     Call = Struct.new(:command, :args)
   end
 

data/test/unit/error_handler_tests.rb

@@ -11,8 +11,7 @@ class Qs::ErrorHandler
     setup do
       @exception       = Factory.exception
       @daemon_data     = Qs::DaemonData.new
-      @queue_name      = Factory.string
-      @queue_redis_key = Qs::Queue::RedisKey.new(@queue_name)
+      @queue_redis_key = Qs::Queue::RedisKey.new(Factory.string)
       @context_hash    = {
         :daemon_data        => @daemon_data,
         :queue_redis_key    => @queue_redis_key,
@@ -27,20 +26,20 @@ class Qs::ErrorHandler
 
   end
 
-  class InitTests < UnitTests
+  class InitSetupTests < UnitTests
     desc "when init"
     setup do
-      @call_count = 0
-      @first_called_at = nil
-      @second_called_at = nil
-      @args_passed_to_error_proc = nil
-      first_error_proc = proc do |*args|
-        @args_passed_to_error_proc = args
-        @first_called_at = (@call_count += 1)
-      end
-      second_error_proc = proc{ @second_called_at = (@call_count += 1) }
-      Assert.stub(@daemon_data, :error_procs){ [first_error_proc, second_error_proc] }
+      # always make sure there are multiple error procs or tests can be false
+      # positives
+      @error_proc_spies = (1..(Factory.integer(3) + 1)).map{ ErrorProcSpy.new }
+      Assert.stub(@daemon_data, :error_procs){ @error_proc_spies }
+    end
+
+  end
 
+  class InitTests < InitSetupTests
+    desc "when init"
+    setup do
       @handler = @handler_class.new(@exception, @context_hash)
     end
     subject{ @handler }
@@ -55,7 +54,7 @@ class Qs::ErrorHandler
     end
 
     should "know its error procs" do
-      assert_equal @daemon_data.error_procs.reverse, subject.error_procs
+      assert_equal @error_proc_spies.reverse, subject.error_procs
     end
 
   end
@@ -66,66 +65,36 @@ class Qs::ErrorHandler
       @handler.run
     end
 
-    should "pass its exception and context to the error procs" do
-      assert_not_nil @args_passed_to_error_proc
-      assert_includes subject.exception, @args_passed_to_error_proc
-      assert_includes subject.context,   @args_passed_to_error_proc
-    end
-
-    should "call each of its error procs" do
-      assert_equal 1, @second_called_at
-      assert_equal 2, @first_called_at
+    should "call each of its procs" do
+      subject.error_procs.each_with_index do |spy, index|
+        assert_true spy.called
+        assert_equal subject.exception, spy.exception
+        assert_equal subject.context,   spy.context
+      end
     end
 
   end
 
-  class RunAndErrorProcThrowsExceptionTests < UnitTests
-    desc "run with an error proc that throws an exception"
+  class RunWithErrorProcExceptionsTests < InitSetupTests
+    desc "and run with error procs that throw exceptions"
     setup do
-      @proc_exception = Factory.exception
-      error_proc = proc{ raise @proc_exception }
-      Assert.stub(@daemon_data, :error_procs){ [error_proc] }
+      @proc_exceptions = @error_proc_spies.reverse.map do |spy|
+        exception = Factory.exception(RuntimeError, @error_proc_spies.index(spy).to_s)
+        spy.raise_exception = exception
+        exception
+      end
 
       @handler = @handler_class.new(@exception, @context_hash).tap(&:run)
     end
     subject{ @handler }
 
-    should "set its exception to the exception thrown by the error proc" do
-      assert_equal @proc_exception, subject.exception
+    should "pass the previously raised exception to the next proc" do
+      exp = [@exception] + @proc_exceptions[0..-2]
+      assert_equal exp, subject.error_procs.map(&:exception)
     end
 
-  end
-
-  class RunWithMultipleErrorProcsThatThrowExceptionsTests < UnitTests
-    desc "run with multiple error procs that throw an exception"
-    setup do
-      @first_caught_exception  = nil
-      @second_caught_exception = nil
-      @third_caught_exception  = nil
-
-      @third_proc_exception = Factory.exception
-      third_proc = proc do |exception, context|
-        @third_caught_exception = exception
-        raise @third_proc_exception
-      end
-
-      @second_proc_exception = Factory.exception
-      second_proc = proc do |exception, context|
-        @second_caught_exception = exception
-        raise @second_proc_exception
-      end
-
-      first_proc = proc{ |exception, context| @first_caught_exception = exception }
-
-      Assert.stub(@daemon_data, :error_procs){ [first_proc, second_proc, third_proc] }
-      @handler = @handler_class.new(@exception, @context_hash).tap(&:run)
-    end
-    subject{ @handler }
-
-    should "call each proc, passing the previously raised exception to the next" do
-      assert_equal @exception,             @third_caught_exception
-      assert_equal @third_proc_exception,  @second_caught_exception
-      assert_equal @second_proc_exception, @first_caught_exception
+    should "set its exception to the last exception thrown by the procs" do
+      assert_equal @proc_exceptions.last, subject.exception
     end
 
   end
@@ -160,4 +129,21 @@ class Qs::ErrorHandler
 
   end
 
+  class ErrorProcSpy
+    attr_reader :called, :exception, :context
+    attr_accessor :raise_exception
+
+    def initialize
+      @called = false
+    end
+
+    def call(exception, context)
+      @called    = true
+      @exception = exception
+      @context   = context
+
+      raise self.raise_exception if self.raise_exception
+    end
+  end
+
 end

data/test/unit/io_pipe_tests.rb

@@ -8,6 +8,14 @@ class Qs::IOPipe
   class UnitTests < Assert::Context
     desc "Qs::IOPipe"
     setup do
+      # mimic how IO.select responds
+      @io_select_response    = Factory.boolean ? [[NULL], [], []] : nil
+      @io_select_called_with = nil
+      Assert.stub(IO, :select) do |*args|
+        @io_select_called_with = args
+        @io_select_response
+      end
+
       @io_pipe = Qs::IOPipe.new
     end
     subject{ @io_pipe }
@@ -60,15 +68,15 @@ class Qs::IOPipe
     should "be able to wait until there is something to read" do
       subject.setup
 
-      result = nil
-      thread = Thread.new{ result = subject.wait }
-      thread.join(0.1)
-      assert_equal 'sleep', thread.status
+      result = subject.wait
+      exp = [[subject.reader], nil, nil, nil]
+      assert_equal exp, @io_select_called_with
+      assert_equal !!@io_select_response, result
 
-      subject.write(Factory.string)
-      thread.join
-      assert_false thread.status
-      assert_equal subject, result
+      timeout = Factory.integer
+      subject.wait(timeout)
+      exp = [[subject.reader], nil, nil, timeout]
+      assert_equal exp, @io_select_called_with
     end
 
   end

data/test/unit/process_tests.rb

@@ -13,6 +13,10 @@ class Qs::Process
     end
     subject{ @process_class }
 
+    should "know its wait for signals timeout" do
+      assert_equal 15, WAIT_FOR_SIGNALS_TIMEOUT
+    end
+
   end
 
   class InitTests < UnitTests
@@ -117,9 +121,20 @@ class Qs::Process
   class RunTests < RunSetupTests
     desc "and run"
     setup do
+      @wait_timeout = nil
+      Assert.stub(@process.signal_io, :wait) do |timeout|
+        @wait_timeout = timeout
+        sleep 0.1
+        false
+      end
+
       @thread = Thread.new{ @process.run }
       @thread.join(0.1)
     end
+    teardown do
+      # manually unstub or the process thread will hang forever
+      Assert.unstub(@process.signal_io, :wait)
+    end
 
     should "not daemonize the process" do
       assert_false @daemonize_called
@@ -143,6 +158,7 @@ class Qs::Process
     end
 
     should "sleep its thread waiting for signals" do
+      assert_equal WAIT_FOR_SIGNALS_TIMEOUT, @wait_timeout
       assert_equal 'sleep', @thread.status
     end
 
@@ -262,6 +278,30 @@ class Qs::Process
 
   end
 
+  class RunWithDaemonCrashTests < RunSetupTests
+    desc "and run with the daemon crashing"
+    setup do
+      # lower the time it sleeps so it loops and restarts the daemon quicker
+      Assert.stub(@process.signal_io, :wait) do |timeout|
+        sleep 0.1
+        false
+      end
+
+      @thread = Thread.new{ @process.run }
+      @daemon_spy.start_called = false
+      @thread.join(0.1)
+    end
+    teardown do
+      # manually unstub or the process thread will hang forever
+      Assert.unstub(@process.signal_io, :wait)
+    end
+
+    should "re-start its daemon" do
+      assert_true @daemon_spy.start_called
+    end
+
+  end
+
   class RunWithInvalidSignalTests < RunSetupTests
     desc "and run with unsupported signals"
     setup do
@@ -402,6 +442,10 @@ class Qs::Process
       @halt_args   = args
       @halt_called = true
     end
+
+    def running?
+      !!@start_called
+    end
   end
 
   class RestartCmdSpy

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qs
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-05-01 00:00:00 Z
+date: 2015-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement