ost 0.0.2 → 0.0.3

data/lib/ost.rb

@@ -1,7 +1,7 @@
 require "nest"
 
 module Ost
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   TIMEOUT = ENV["OST_TIMEOUT"] || 2
 
   class Queue
@@ -16,7 +16,11 @@ module Ost
     end
 
     def each(&block)
+      @stopping = false
+
       loop do
+        break if @stopping
+
         _, item = redis.brpop(ns, TIMEOUT)
         next if item.nil? or item.empty?
 
@@ -35,13 +39,15 @@ module Ost
       redis.lrange ns[:errors], 0, -1
     end
 
+    def stop
+      @stopping = true
+    end
+
     alias << push
     alias pop each
 
-  private
-
     def redis
-      Ost.redis
+      @redis ||= Redis.connect(Ost.options)
     end
   end
 
@@ -53,15 +59,17 @@ module Ost
     @queues[queue]
   end
 
-  def self.connect(options = {})
-    @redis = Redis.connect(options)
+  def self.stop
+    @queues.each { |_, queue| queue.stop }
   end
 
-  def self.redis
-    @redis ||= Redis.connect
+  @options = nil
+
+  def self.connect(options = {})
+    @options = options
   end
 
-  def self.redis=(redis)
-    @redis = redis
+  def self.options
+    @options || {}
   end
 end

data/ost.gemspec

@@ -1,12 +1,22 @@
+require "./lib/ost"
+
 Gem::Specification.new do |s|
   s.name              = "ost"
-  s.version           = "0.0.2"
+  s.version           = Ost::VERSION
   s.summary           = "Redis based queues and workers."
   s.description       = "Ost lets you manage queues and workers with Redis."
   s.authors           = ["Michel Martens"]
   s.email             = ["michel@soveran.com"]
   s.homepage          = "http://github.com/soveran/ost"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/ost.rb", "ost.gemspec", "test/ost_test.rb", "test/test_helper.rb"]
+
+  s.files = Dir[
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "lib/**/*.rb",
+    "*.gemspec",
+    "test/*.*"
+  ]
 
   s.add_dependency "nest", "~> 1.0"
   s.add_development_dependency "cutest", "~> 1.0"

data/test/ost_test.rb

@@ -3,7 +3,6 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 scope do
   def ost(&job)
     thread = Thread.new do
-      Ost.redis = Redis.current
       Ost[:events].each(&job)
     end
 
@@ -17,10 +16,11 @@ scope do
   end
 
   prepare do
-    Ost.redis.flushall
+    Redis.current.flushall
   end
 
   setup do
+    Ost[:events].redis.quit
     Redis.new
   end
 
@@ -74,11 +74,37 @@ scope do
       raise "Wrong answer"
     end
 
-    t1.kill
+    t1.join
 
     assert_equal 0, redis.llen("ost:events")
     assert_equal 1, redis.llen("ost:events:errors")
 
     assert results.pop.match(/ost:events:1 => #<RuntimeError: Wrong answer/)
   end
+
+  test "halt processing a queue" do
+    Thread.new do
+      sleep 0.5
+      Ost[:always_empty].stop
+    end
+
+    Ost[:always_empty].each { }
+
+    assert true
+  end
+
+  test "halt processing all queues" do
+    Thread.new do
+      sleep 0.5
+      Ost.stop
+    end
+
+    t1 = Thread.new { Ost[:always_empty].each { } }
+    t2 = Thread.new { Ost[:always_empty_too].each { } }
+
+    t1.join
+    t2.join
+
+    assert true
+  end
 end

data/test/test_helper.rb

@@ -1,3 +1,6 @@
 require "rubygems"
 require "cutest"
+
+$VERBOSE = 1
+
 require File.join(File.dirname(__FILE__), "..", "lib", "ost")

metadata

@@ -2,7 +2,7 @@
 name: ost
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nest
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Redis based queues and workers.