resqued 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4fb0bcb7e96b0df5bfa4dfa32340b99a5eea002
-  data.tar.gz: 76710f5182ec2f97a5136619a0ac573c40c6d96a
+  metadata.gz: 303c225999215b8daf81924a374a7a1f2fe2b47a
+  data.tar.gz: 8d841be51e42d4c1a21ce6d35082d7273e3274c7
 SHA512:
-  metadata.gz: 9fddc96d14a8c6905d4b8220debe910d88a2a7bc8c6566b9b933117bb7b0f9752a0a339d0c59e6fb06f15894b6779894b776393679ef835f9e2f5afddfdf4649
-  data.tar.gz: dbea0b63b9e6c85593540cb76a2f74e427def5a34e492dcd8a4f9ab7f4d5d32b84078c92ad7c3b85b87e9e451cf5f721b2c6cb39cfe702a7194ccd709329eff2
+  metadata.gz: cccb7db2c2b54dfd86512fb9089062c5a39bfd9fce0d8c742af3ddbed7d520cde62c6b359eba03fd0a233d8cbbe49ba911fc6a4ac586421f5a183b8fdb5ccaea
+  data.tar.gz: 6a0666ac544803c3e2b13047525c01de41967501b156f67a0c60fdabd823d37e8fb1ef53c6551c3fb1db9a5fea1fbfe1241a84617c67fc4cfd48ba3836d0eb05

data/README.md

@@ -2,6 +2,8 @@
 
 Resqued is a multi-process daemon that controls and monitors a pool of resque workers. It works well with slow jobs and continuous delivery.
 
+[![travis status](https://travis-ci.org/spraints/resqued.png)](https://travis-ci.org/spraints/resqued)
+
 ## Installation
 
 Install by adding resqued to your Gemfile
@@ -128,6 +130,19 @@ If your app has several work machines, each with the same application code but d
     $ resqued config/shared.rb config/pool-a.rb
     $ resqued config/shared.rb config/pool-b.rb
 
+## Testing
+
+To test your resqued configuration, add a test case like this:
+
+```
+class MyResquedTest < Test::Unit::TestCase
+  include Resqued::TestCase
+  def test_resqued_config
+    assert_resqued 'config/resqued.rb'
+  end
+end
+```
+
 ## See also
 
 For information about how resqued works, see the [documentation](docs/).

data/lib/resqued/test_case.rb

@@ -1,84 +1,27 @@
-# This file includes example assertions for your resqued configuration.
-#
-#     assert_resqued 'config/resqued/environment.rb', 'config/resqued/pool-a.rb'
+require 'resqued/config'
+
 module Resqued
   module TestCase
-    module ForkToStart
-      # Public: Fork a process that spins up a Resqued::Master process directly.
-      def assert_resqued(*configs)
-        options = configs.last.is_a?(Hash) ? configs.pop : {}
-        check_workers  = options.fetch(:expect_workers, false)
-        worker_timeout = options.fetch(:worker_timeout, 5)
-        resqued_bin    = options.fetch(:resqued_bin) { `which resqued || bundle exec which resqued`.chomp }
-        status = IO.pipe
-        if pid = fork
-          message = read_status_from_resqued(:pipe => status[0], :pid => pid)
-          if message !~ /^listener,\d+,start$/
-            fail "Expected listener to start, but received #{message.inspect}"
-          end
-          message = read_status_from_resqued(:pipe => status[0], :pid => pid)
-          if message !~ /^listener,\d+,ready$/
-            fail "Expected listener to be ready, but received #{message.inspect}"
-          end
-          if check_workers
-            start = Time.now
-            workers_started = 0
-            loop do
-              elapsed = Time.now - start
-              time_remaining = worker_timeout - elapsed
-              break unless time_remaining > 0
-              if message = read_status_from_resqued(:pipe => status[0], :pid => pid, :timeout => time_remaining)
-                if message =~ /worker,\d+,start/
-                  workers_started = workers_started + 1
-                else
-                  fail "Expected to see workers starting, instead saw #{message.inspect}"
-                end
-              end
-            end
-            if workers_started == 0
-              fail "Expected at least one worker to start, but none did"
-            end
-          end
-        else
-          $0 = "resqued master for #{$0}"
-          unless ENV['NOISY_RESQUED_TESTS']
-            devnull = File.open('/dev/null', 'w')
-            $stdout.reopen(devnull)
-            $stderr.reopen(devnull)
-          end
-          begin
-            # This should match how `exe/resqued` starts the master process.
-            require 'resqued'
-            Resqued::START_CTX['$0'] = resqued_bin
-            Resqued::Master.new(:config_paths => configs, :status_pipe => status[1]).run
-          rescue Object => e
-            # oops
-          end
-          exit! # Do not make this look like a failing test.
-        end
-      ensure
-        begin
-          Process.kill :QUIT, pid
-          Process.waitpid2(pid) if pid
-        rescue Errno::ESRCH, Errno::ECHILD
-          # already dead.
-        end
-      end
-
-      def read_status_from_resqued(options)
-        status  = options.fetch(:pipe)
-        pid     = options.fetch(:pid)
-        timeout = options[:timeout]
-        loop do
-          if IO.select([status], nil, nil, timeout || 2)
-            return status.readline.chomp
-          elsif dead = Process.waitpid2(pid, Process::WNOHANG)
-            fail "Resqued stopped too soon."
-          elsif timeout
-            return nil
-          end
-        end
+    module LoadConfig
+      # Test your resqued config.
+      #
+      # If you do this to start resqued:
+      #
+      #     $ resqued config/resqued-environment.rb config/resqued-workers.rb
+      #
+      # Then you'll want to do this in a test:
+      #
+      #     assert_resqued 'config/resqued-environment.rb', 'config/resqued-workers.rb'
+      def assert_resqued(*paths)
+        config = Resqued::Config.new(paths)
+        config.before_fork
+        config.build_workers
+        config.after_fork(Resque::Worker.new('*'))
       end
     end
+
+    Default = LoadConfig
+
+    include Default
   end
 end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
 end

data/spec/resqued/test_case_spec.rb

@@ -3,37 +3,12 @@ require 'resqued/test_case'
 
 describe Resqued::TestCase do
   let(:test_case) { Object.new.extend(the_module) }
-  before { mock_redis.start ; ENV['RESQUED_TEST_REDIS_PORT'] = mock_redis.port.to_s }
-  after  { mock_redis.stop  }
-  let(:mock_redis) { MockRedisServer.new }
 
-  context 'ForkToStart' do
-    let(:the_module) { described_class::ForkToStart }
+  context 'LoadConfig' do
+    let(:the_module) { described_class::LoadConfig }
     it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_clean.rb'              }.not_to raise_error }
     it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_before_fork_raises.rb' }.to     raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb'  }.not_to raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb'  }.to     raise_error }
     it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_no_workers.rb'         }.not_to raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_clean.rb',             :expect_workers => true }.not_to raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb', :expect_workers => true }.to raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_no_workers.rb',        :expect_workers => true }.to raise_error }
-  end
-end
-
-class MockRedisServer
-  def start
-    return if @server
-    require 'socket'
-    @server = TCPServer.new(0)
-  end
-
-  def stop
-    return unless @server
-    @server.close
-  ensure
-    @server = nil
-  end
-
-  def port
-    @server && @server.addr[1]
   end
 end

data/spec/resqued/test_case_spec.rb.orig

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'resqued/test_case'
+
+describe Resqued::TestCase do
+  let(:test_case) { Object.new.extend(the_module) }
+
+  context 'LoadConfig' do
+    let(:the_module) { described_class::LoadConfig }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_clean.rb'              }.not_to raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_before_fork_raises.rb' }.to     raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb'  }.to     raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_no_workers.rb'         }.not_to raise_error }
+<<<<<<< HEAD
+=======
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_clean.rb',             :expect_workers => true }.not_to raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb', :expect_workers => true }.to raise_error }
+    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_no_workers.rb',        :expect_workers => true }.to raise_error }
+  end
+end if false
+
+class MockRedisServer
+  def start
+    return if @server
+    require 'socket'
+    @server = TCPServer.new(0)
+  end
+
+  def stop
+    return unless @server
+    @server.close
+  ensure
+    @server = nil
+  end
+
+  def port
+    @server && @server.addr[1]
+>>>>>>> origin/master
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,48 +80,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Daemon of resque workers
 email: spraints@gmail.com
 executables:
@@ -177,11 +121,12 @@ files:
 - spec/resqued/config/worker_spec.rb
 - spec/resqued/sleepy_spec.rb
 - spec/resqued/test_case_spec.rb
+- spec/resqued/test_case_spec.rb.orig
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
 - exe/resqued
 - exe/resqued-listener
-homepage: https://github.com
+homepage: https://github.com/spraints/resqued
 licenses: []
 metadata: {}
 post_install_message: 
@@ -215,5 +160,6 @@ test_files:
 - spec/resqued/config/worker_spec.rb
 - spec/resqued/sleepy_spec.rb
 - spec/resqued/test_case_spec.rb
+- spec/resqued/test_case_spec.rb.orig
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb