ost 0.0.1 → 0.0.2

data/README.markdown

@@ -3,6 +3,8 @@ Ost
 
 Redis based queues and workers.
 
+![Ost Cafe, by Arancia Project](http://farm4.static.flickr.com/3255/3161710005_36566b8a9e.jpg)
+
 Description
 -----------
 
@@ -73,14 +75,14 @@ Differences with Delayed::Job and Resque
 --------------------------------------
 
 Both [Delayed::Job](http://github.com/tobi/delayed_job) and [Resque](http://github.com/defunkt/resque)
-provide queues and workers (the later using Redis). They provide dumb workers that process jobs, which are specialized for each task. The specialization takes place in the application side, and the job is serialized and pushed into a queue.
+provide queues and workers (the latter using Redis). They provide dumb workers that process jobs, which are specialized for each task. The specialization takes place in the application side, and the job is serialized and pushed into a queue.
 
 **Ost**, by contrast, just pushes numbers into specialized queues, and uses workers that are subscribed to specific queues and know what to do with the items they get. The total sum of logic is almost the same.
 
 Installation
 ------------
 
-    $ sudo gem install ost
+    $ gem install ost
 
 License
 -------

data/Rakefile

@@ -1,5 +1,6 @@
 task :test do
-  system "cd test && ruby ost_test.rb"
+  require "cutest"
+  Cutest.run(Dir["test/ost*"])
 end
 
 task :default => :test

data/lib/ost.rb

@@ -1,8 +1,7 @@
-require "redis"
 require "nest"
 
 module Ost
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   TIMEOUT = ENV["OST_TIMEOUT"] || 2
 
   class Queue
@@ -55,11 +54,11 @@ module Ost
   end
 
   def self.connect(options = {})
-    @redis = Redis.new(options)
+    @redis = Redis.connect(options)
   end
 
   def self.redis
-    @redis ||= Redis.new
+    @redis ||= Redis.connect
   end
 
   def self.redis=(redis)

data/ost.gemspec

@@ -1,10 +1,13 @@
 Gem::Specification.new do |s|
   s.name              = "ost"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   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.add_dependency "nest", "~> 1.0"
+  s.add_development_dependency "cutest", "~> 1.0"
 end

data/test/ost_test.rb

@@ -1,63 +1,70 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.expand_path("test_helper", File.dirname(__FILE__))
 
-class TestOst < Test::Unit::TestCase
+scope do
   def ost(&job)
     thread = Thread.new do
+      Ost.redis = Redis.current
       Ost[:events].each(&job)
     end
 
-    sleep 0.2
+    sleep 0.1
 
     thread.kill
   end
 
-  setup do
-    @redis = Redis.new
-    @redis.flushdb
+  def enqueue(id)
+    Ost[:events].push(id)
+  end
 
-    Ost.connect
-    Ost[:events].push(1)
+  prepare do
+    Ost.redis.flushall
   end
 
-  teardown do
-    Ost.redis.flushdb
+  setup do
+    Redis.new
   end
 
-  should "insert items in the queue" do
-    assert_equal ["1"], @redis.lrange("ost:events", 0, -1)
+  test "insert items in the queue" do |redis|
+    enqueue(1)
+    assert_equal ["1"], redis.lrange("ost:events", 0, -1)
   end
 
-  should "process items from the queue" do
-    @results = []
+  test "process items from the queue" do |redis|
+    enqueue(1)
+
+    results = []
 
     ost do |item|
-      @results << item
+      results << item
     end
 
-    assert_equal [], @redis.lrange("ost:events", 0, -1)
-    assert_equal ["1"], @results
+    assert_equal [], redis.lrange("ost:events", 0, -1)
+    assert_equal ["1"], results
   end
 
-  should "add failures to a special list" do
+  test "add failures to special lists" do |redis|
+    enqueue(1)
+
     ost do |item|
       raise "Wrong answer"
     end
 
-    assert_equal 0, @redis.llen("ost:events")
-    assert_equal 1, @redis.llen("ost:events:errors")
+    assert_equal 0, redis.llen("ost:events")
+    assert_equal 1, redis.llen("ost:events:errors")
 
-    assert_match /ost:events:1 => #<RuntimeError: Wrong answer/, @redis.rpop("ost:events:errors")
+    assert redis.rpop("ost:events:errors").match(/ost:events:1 => #<RuntimeError: Wrong answer/)
   end
 
-  should "publish the error to a specific channel" do
-    @results = []
+  test "publish the error to a specific channel" do |redis|
+    enqueue(1)
+    results = []
 
     t1 = Thread.new do
-      @redis.subscribe("ost:events:errors") do |on|
+      redis.subscribe("ost:events:errors") do |on|
         on.message do |channel, message|
           if message[/ost:events:1 => #<RuntimeError: Wrong answer/]
-            @results << message
-            @redis.unsubscribe
+            results << message
+            redis.unsubscribe
           end
         end
       end
@@ -69,9 +76,9 @@ class TestOst < Test::Unit::TestCase
 
     t1.kill
 
-    assert_equal 0, @redis.llen("ost:events")
-    assert_equal 1, @redis.llen("ost:events:errors")
+    assert_equal 0, redis.llen("ost:events")
+    assert_equal 1, redis.llen("ost:events:errors")
 
-    assert_match /ost:events:1 => #<RuntimeError: Wrong answer/, @redis.rpop("ost:events:errors")
+    assert results.pop.match(/ost:events:1 => #<RuntimeError: Wrong answer/)
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,3 @@
 require "rubygems"
-require "contest"
+require "cutest"
 require File.join(File.dirname(__FILE__), "..", "lib", "ost")

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ost
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michel Martens
@@ -14,10 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -03:00
-default_executable: 
-dependencies: []
-
+date: 2011-04-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nest
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cutest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :development
+  version_requirements: *id002
 description: Ost lets you manage queues and workers with Redis.
 email: 
 - michel@soveran.com
@@ -35,7 +51,6 @@ files:
 - ost.gemspec
 - test/ost_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/soveran/ost
 licenses: []
 
@@ -45,23 +60,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Redis based queues and workers.