coordinator 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53824a57bc5054c529d8a0566a4c26024fb9eaf
-  data.tar.gz: 7db6d332ac9d662721a5c45cb2e0ca52493cf1cf
+  metadata.gz: d30f4f717a647bb842456b00f951a25f613492ab
+  data.tar.gz: 96401cd4398ef8040044a89a711bbb77d3831f80
 SHA512:
-  metadata.gz: ac992d700929b4d5ae35ddabfff494280e77daacc25198e1d2a07fb9be322d7eaea7a9849ec933dfb40eb7532d98530ae47c2200d036caedc9249c241ae11a89
-  data.tar.gz: 672e70f26491333ebbabbd33a2692125dfc9af2875aca218b4b7f3b8e491bd4edf8433ef8d5826ca92a6a841986d31e97f7aa750bbb0c2a7a62e4f7da439f6f9
+  metadata.gz: 351d5200dc09beff1d9f3060fbb89fbbeec754aa83289ccc9ed23951e3e50571e78215989b79ae713dbc4ac189a15dba9d0eff333e208be311b8a9f8a7e72fa5
+  data.tar.gz: 4c1d21850138d1ca67c5f820dc977243ce8f4f28473a8efa8b57da88c04306285da85e26ae59ece072993f9eafb0ac27202d2e9a36cea2051fcb7b30060196c0

data/lib/coordinator/base.rb

@@ -5,13 +5,15 @@ module Coordinator
     end
 
     def add_task(skill, task)
-      queue = queue_for_skill(skill)
-      queue.add_task(task)
+      queue_for_skill(skill).add_task(task)
     end
 
     def add_priority_task(skill, task)
-      queue = queue_for_skill(skill)
-      queue.add_priority_task(task)
+      queue_for_skill(skill).add_priority_task(task)
+    end
+
+    def remove_task(skill, task)
+      queue_for_skill(skill).remove_task(task)
     end
 
     def next_task(skills)
@@ -23,15 +25,24 @@ module Coordinator
     end
 
     def set_capacity(skill, capacity)
+      queue_for_skill(skill).set_capacity(capacity)
+    end
+
+    def info(skill)
       queue = queue_for_skill(skill)
-      queue.set_capacity(capacity)
+      {
+        :skill => queue.skill,
+        :capacity => queue.capacity,
+        :count => queue.length,
+        :items => queue.items
+      }
     end
 
     private
 
     def queue_for_skill(skill)
       queue = @queues.find {|q| q.skill == skill}
-      raise Coordinator::Error.new("No matching queue for #{skill}") unless queue
+      raise Coordinator::Error, "No matching queue for #{skill}" unless queue
       queue
     end
   end

data/lib/coordinator/queue.rb

@@ -17,8 +17,15 @@ module Coordinator
       @store.left_push(task)
     end
 
+    def remove_task(task)
+      @store.remove(task)
+    end
+
     def next_task(skills)
-      eligible?(@store.peek, skills) ? @store.pop : nil
+      task = @store.peek
+      return nil unless task && eligible?(task, skills)
+      return task if @store.remove(task)
+      next_task(skills)
     end
 
     def eligible?(task, skills)
@@ -29,5 +36,17 @@ module Coordinator
     def set_capacity(capacity)
       @store.capacity = capacity
     end
+
+    def items
+      @store.items
+    end
+
+    def capacity
+      @store.capacity
+    end
+
+    def length
+      @store.length
+    end
   end
 end

data/lib/coordinator/redis_queue.rb

@@ -5,12 +5,12 @@ module Coordinator
     def initialize(name)
       @queue_name = "#{name}-queue"
       @capacity_name = "#{name}-capacity"
-      raise Coordinator::Error.new("'Redis.current' not set") unless Redis.current
+      raise Coordinator::Error, "'Redis.current' not set" unless Redis.current
       @redis = Redis.current
     end
 
     def push(item)
-      raise Coordinator::Error.new("Queue is at capacity") if full?
+      raise Coordinator::Error, "Queue is at capacity" if full?
       data = serialize(item)
       @redis.rpush(@queue_name, data) unless items.include?(data)
     end
@@ -27,7 +27,7 @@ module Coordinator
 
     def remove(item)
       data = serialize(item)
-      @redis.lrem(@queue_name, 1, data)
+      @redis.lrem(@queue_name, 1, data) == 1
     end
 
     def peek
@@ -48,15 +48,14 @@ module Coordinator
       @redis.set(@capacity_name, capacity)
     end
 
+    def items
+      @redis.lrange(@queue_name, 0, length)
+    end
+
     private
 
     def full?
-      return false unless capacity
-      length >= capacity
-    end
-
-    def items
-      @redis.lrange(@queue_name, 0, length)
+      capacity && capacity <= length
     end
 
     def serialize(item)

data/lib/coordinator/version.rb

@@ -1,3 +1,3 @@
 module Coordinator
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/unit/base_test.rb

@@ -27,4 +27,13 @@ describe 'Coordinator::Base' do
       err.message.must_match /No matching queue for forgotten/
     end
   end
+
+  describe 'removing work' do
+    it 'remove task from appropriate queue' do
+      @coordinator.add_task("medium", 2)
+      @coordinator.add_priority_task("medium", 3)
+      @coordinator.remove_task("medium", 3)
+      assert_equal 2, @coordinator.next_task(["medium"])
+    end
+  end
 end

data/test/unit/parallelism_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+require 'time'
+
+describe 'ParallelismTest' do
+  before do
+    @coordinator = Coordinator::Base.new([
+      Coordinator::Queue.new("tasks"),
+      Coordinator::Queue.new("completed_tasks")
+    ])
+    @tasks = ('a'..'z').to_a
+    @tasks.each { |t| @coordinator.add_task("tasks", t) }
+  end
+
+  it 'works syncronously' do
+    125.times { perform_work }
+    assert_equal [], @coordinator.info("tasks")[:items]
+    array_equal(@tasks, @coordinator.info("completed_tasks")[:items])
+  end
+
+  it 'works in parallel' do
+    workers = []
+
+    start = Time.now + 1
+
+    200.times do |i|
+      workers << Thread.new(i) do
+        sleep(start - Time.now)
+        perform_work(i)
+      end
+    end
+    workers.each { |w| w.join }
+
+    assert_equal [], @coordinator.info("tasks")[:items]
+    array_equal(@tasks, @coordinator.info("completed_tasks")[:items])
+  end
+
+  def perform_work(i=nil)
+    task = @coordinator.next_task(["tasks"])
+    @coordinator.add_task("completed_tasks", task) if task
+  end
+
+  def array_equal(left, right)
+     assert_equal left.uniq.sort, right.uniq.sort
+  end
+end

data/test/unit/queue_test.rb

@@ -6,6 +6,22 @@ describe "Coordinator::Queue" do
     Redis.current.flushall
   end
 
+  describe "next_task" do
+    it "gets task for skills" do
+      @queue.add_task(5)
+      assert_equal 5, @queue.next_task(["high"])
+    end
+
+    it "returns nil when no eligable work" do
+      @queue.add_task(5)
+      assert_equal nil, @queue.next_task(["medium"])
+    end
+
+    it "returns nil when no work" do
+      assert_equal nil, @queue.next_task(["medium"])
+    end
+  end
+
   describe "add_task" do
     it "returns true when skill present" do
       @queue.add_task(5)

data/test/unit/redis_queue_test.rb

@@ -53,20 +53,20 @@ describe 'Coordinator::RedisQueue' do
   end
 
   describe '.remove' do
-    it 'returns 1 when element found and removes' do
+    it 'returns true when element found and removes' do
       @queue.push(1)
-      assert_equal 1, @queue.remove(1)
+      assert_equal true, @queue.remove(1)
       assert_equal 0, @queue.length
     end
 
-    it 'returns 0 when element not found' do
+    it 'returns false when element not found' do
       @queue.push(1)
-      assert_equal 0, @queue.remove(4)
+      assert_equal false, @queue.remove(4)
       assert_equal 1, @queue.length
     end
 
-    it 'returns nil when queue empty' do
-      assert_equal nil, @queue.remove(4)
+    it 'returns false when queue empty' do
+      assert_equal false, @queue.remove(4)
     end
   end
 
@@ -77,6 +77,10 @@ describe 'Coordinator::RedisQueue' do
       assert_equal 1, @queue.peek
       assert_equal 2, @queue.length
     end
+
+    it 'return nil if no items' do
+      assert_equal nil, @queue.peek
+    end
   end
 
   describe '.capacity' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coordinator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tyler Mercier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -103,6 +103,7 @@ files:
 - lib/coordinator/version.rb
 - test/test_helper.rb
 - test/unit/base_test.rb
+- test/unit/parallelism_test.rb
 - test/unit/queue_test.rb
 - test/unit/redis_queue_test.rb
 homepage: ''
@@ -132,5 +133,6 @@ summary: Ruby gem for coordinating multiple redis queues
 test_files:
 - test/test_helper.rb
 - test/unit/base_test.rb
+- test/unit/parallelism_test.rb
 - test/unit/queue_test.rb
 - test/unit/redis_queue_test.rb