worker_roulette 0.0.3 → 0.0.4

data/lib/worker_roulette/foreman.rb

@@ -22,7 +22,7 @@ module WorkerRoulette
       #is added to the job_queue. This is not a big deal bc it just means that
       #the sender's queue will be processed one slot behind it's rightful place.
       #This does not effect work_order ordering.
-      @redis_pool.with do |redis|
+      @redis_pool.with({}) do |redis|
         @count = redis.incr(COUNTER_KEY)
         redis.multi do
           redis.zadd(WorkerRoulette::JOB_BOARD, @count, sender)

data/lib/worker_roulette/tradesman.rb

@@ -11,7 +11,7 @@ module WorkerRoulette
     end
 
     def wait_for_work_orders(on_subscribe_callback = nil, &block)
-      @pubsub_pool.with do |redis|
+      @pubsub_pool.with({}) do |redis|
         redis.subscribe(WorkerRoulette::JOB_NOTIFICATIONS) do |on|
           on.subscribe {on_subscribe_callback.call if on_subscribe_callback}
           on.message   {block.call(work_orders!) if block}
@@ -20,7 +20,7 @@ module WorkerRoulette
     end
 
     def work_orders!
-      @client_pool.with do |redis|
+      @client_pool.with({}) do |redis|
         get_sender_for_next_job(redis)
         results = redis.multi do
           redis.lrange(sender, 0, -1)
@@ -32,7 +32,7 @@ module WorkerRoulette
     end
 
     def unsubscribe
-      @pubsub_pool.with {|redis| redis.unsubscribe}
+      @pubsub_pool.with({}) {|redis| redis.unsubscribe}
     end
 
   private

data/lib/worker_roulette/version.rb

@@ -1,3 +1,3 @@
 module WorkerRoulette
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/worker_roulette.rb

@@ -1,21 +1,25 @@
 require "worker_roulette/version"
 require 'redis'
 require 'hiredis'
-require 'redis/connection/hiredis'
-require 'connection_pool'
 require 'oj'
+require 'em-synchrony'
 
 Dir[File.join(File.dirname(__FILE__),'worker_roulette','**','*.rb')].sort.each { |file| require file.gsub(".rb", "")}
 
+class EventMachine::Synchrony::ConnectionPool
+  alias_method :with, :execute
+end
+
 module WorkerRoulette
   JOB_BOARD = "job_board"
   JOB_NOTIFICATIONS = "new_job_ready"
 
-  def self.start(pool_size = 10, config = {})
-    config = {host: 'localhost', db: 15, timeout: 5}.merge(config)
-    @foreman_connection_pool    = ConnectionPool.new(config.merge Hash[size: pool_size, timeout: config[:timeout]]) {Redis.new}
-    @tradesman_connection_pool  = ConnectionPool.new(config.merge Hash[size: pool_size, timeout: config[:timeout]]) {Redis.new}
-    @pubsub_connection_pool     = ConnectionPool.new(config.merge Hash[size: pool_size, timeout: config[:timeout]]) {Redis.new}
+  def self.start(config = {})
+    @redis_config               = {host: 'localhost', db: 14, driver: :hiredis, timeout: 5, pool_size: 10}.merge(config)
+    @pool_config                = Hash[size: @redis_config.delete(:pool_size), timeout: @redis_config.delete(:timeout)]
+    @foreman_connection_pool    = connection_pool.new(@pool_config) {Redis.new(@redis_config)}
+    @tradesman_connection_pool  = connection_pool.new(@pool_config) {Redis.new(@redis_config)}
+    @pubsub_connection_pool     = connection_pool.new(@pool_config) {Redis.new(@redis_config)}
   end
 
   def self.foreman(sender)
@@ -35,4 +39,25 @@ module WorkerRoulette
   def self.pubsub_connection_pool
     @pubsub_connection_pool
   end
+
+  def self.pool_size
+    @pool_config[:size]
+  end
+
+  def self.redis_config
+    @redis_config.dup
+  end
+
+private
+  def connection_pool
+    if @redis_config[:driver] == :synchrony
+      require 'redis/connection/synchrony'
+      require 'em-synchrony/connection_pool'
+      EM::Synchrony::ConnectionPool
+    else
+      require 'redis/connection/hiredis'
+      require 'connection_pool'
+      ConnectionPool
+    end
+  end
 end

data/spec/integration/worker_roulette_spec.rb

@@ -9,12 +9,10 @@ describe WorkerRoulette do
   let(:work_orders_with_headers) {default_headers.merge({payload: work_orders})}
   let(:jsonized_work_orders_with_headers) {[Oj.dump(work_orders_with_headers)]}
 
-  let(:redis) {Redis.new}
-  let(:pool_size) {10}
+  let(:redis) {Redis.new(WorkerRoulette.redis_config)}
 
   before do
-    WorkerRoulette.start(pool_size)
-    Redis.new.flushdb
+    WorkerRoulette.start
   end
 
   it "should exist" do
@@ -161,13 +159,13 @@ describe WorkerRoulette do
           Thread.new {WorkerRoulette.tradesman_connection_pool.with {|pooled_redis| pooled_redis.get("foo")}}
         end.each(&:join)
         WorkerRoulette.tradesman_connection_pool.with do |pooled_redis|
-          pooled_redis.info["connected_clients"].to_i.should > (pool_size)
+          pooled_redis.info["connected_clients"].to_i.should > (WorkerRoulette.pool_size)
         end
       end
 
       #This may be fixed soon (10 Feb 2014 - https://github.com/redis/redis-rb/pull/389 and https://github.com/redis/redis-rb/issues/364)
       it "should not be fork() proof -- forking reconnects need to be handled in the calling code (until redis gem is udpated, then we should be fork-proof)" do
-        WorkerRoulette.start(1)
+        WorkerRoulette.start
         WorkerRoulette.tradesman_connection_pool.with {|pooled_redis| pooled_redis.get("foo")}
         fork do
           expect {WorkerRoulette.tradesman_connection_pool.with {|pooled_redis| pooled_redis.get("foo")}}.to raise_error(Redis::InheritedError)
@@ -175,7 +173,12 @@ describe WorkerRoulette do
       end
 
       it "should use optionally non-blocking I/O" do
-        expect {WorkerRoulette.start(1, :driver => :synchrony)}.not_to raise_error
+         EM.synchrony do
+          WorkerRoulette.start(:driver => :synchrony)
+          WorkerRoulette.foreman("muddle_man").enqueue_work_order("foo")
+          WorkerRoulette.tradesman.work_orders!.should == [work_orders_with_headers]
+          EM.stop
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,22 +1,48 @@
 require 'worker_roulette'
-# require 'simplecov'
-# require 'simplecov-rcov'
-# class SimpleCov::Formatter::MergedFormatter
-#   def format(result)
-#      SimpleCov::Formatter::HTMLFormatter.new.format(result)
-#      SimpleCov::Formatter::RcovFormatter.new.format(result)
-#   end
-# end
-# SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
-# SimpleCov.start
+require 'em-synchrony'
+require 'simplecov'
+require 'simplecov-rcov'
+class SimpleCov::Formatter::MergedFormatter
+  def format(result)
+     SimpleCov::Formatter::HTMLFormatter.new.format(result)
+     SimpleCov::Formatter::RcovFormatter.new.format(result)
+  end
+end
+SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+SimpleCov.start
 
 require File.expand_path(File.join("..", "..", "lib", "worker_roulette.rb"), __FILE__)
 include WorkerRoulette
 
 Dir[File.join(File.dirname(__FILE__), 'helpers', '**/*.rb')].sort.each { |file| require file.gsub(".rb", "")}
 
-# RSpec.configure do |c|
-#   after(:each) do
-#     Redis.new.flushall
-#   end
-# end
+module RSpec
+  module Core
+    class ExampleGroup
+
+      class << self
+        alias_method :run_alias, :run
+
+        def run(reporter)
+          if EM.reactor_running?
+            run_alias reporter
+          else
+            out = nil
+            EM.synchrony do
+              out = run_alias reporter
+              EM.stop
+            end
+            out
+          end
+        end
+      end
+
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.after(:each) do
+    Redis.new(WorkerRoulette.redis_config).flushdb
+  end
+end

data/worker_roulette.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redis'
   spec.add_dependency 'oj'
+  spec.add_dependency 'redis', '~> 3.0.7'
   spec.add_dependency 'hiredis', '~> 0.4.5'
   spec.add_dependency 'em-synchrony'
   spec.add_dependency 'connection_pool'
@@ -27,10 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry-debugger'
-  # spec.add_development_dependency 'guard'
-  # spec.add_development_dependency 'guard-rspec'
-  # spec.add_development_dependency 'simplecov'
-  # spec.add_development_dependency 'simplecov-rcov'
-  # spec.add_development_dependency 'rspec_junit_formatter'
-  # spec.add_development_dependency 'sidekiq'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-rcov'
+  spec.add_development_dependency 'rspec_junit_formatter'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worker_roulette
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ cert_chain: []
 date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Write a gem description
 email:
 - classicist@gmail.com