em-resque 1.0.0.beta6 → 1.0.0.beta7

data/lib/em-resque/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Resque
-    Version = VERSION = '1.0.0.beta6'
+    Version = VERSION = '1.0.0.beta7'
   end
 end

data/lib/em-resque/worker_machine.rb

@@ -33,7 +33,7 @@ module EventMachine
         @verbose = opts[:logging] || opts[:verbose] || false
         @very_verbose = opts[:vverbose] || false
         @pidfile = opts[:pidfile]
-        @redis = opts[:redis]
+        @redis_uri = opts[:redis] || "redis://127.0.0.1:6379"
 
         raise(ArgumentError, "Should have at least one fiber") if @fibers_count.to_i < 1
 
@@ -43,11 +43,11 @@ module EventMachine
       # Start the machine and start polling queues.
       def start
         EM.synchrony do
-          EM::Resque.redis = redis_instance(@redis)
+          EM::Resque.redis = @redis_uri
           build_workers
           build_fibers
-          prune_dead_workers
           trap_signals
+          prune_dead_workers
           @fibers.each(&:resume)
           system_monitor.resume
         end
@@ -116,28 +116,6 @@ module EventMachine
       def create_pidfile
         File.open(@pidfile, 'w') { |f| f << Process.pid } if @pidfile
       end
-
-      def redis_instance(server)
-        case server
-        when String
-          if server =~ /redis\:\/\//
-            host, port = server.split('/', 3).last.split(':')
-            redis = EM::Protocols::Redis.connect(:host => host, :port => port, :thread_safe => true)
-          else
-            server, namespace = server.split('/', 2)
-            host, port, db = server.split(':')
-            redis = EM::Protocols::Redis.new(:host => host, :port => port,
-                                             :thread_safe => true, :db => db)
-          end
-          namespace ||= :resque
-
-          Redis::Namespace.new(namespace, :redis => redis)
-        when Redis::Namespace
-          server
-        else
-          Redis::Namespace.new(:resque, :redis => server)
-        end
-      end
     end
   end
 end

data/lib/em-resque.rb

@@ -1,6 +1,32 @@
 require 'resque'
+require 'em-synchrony'
 require 'em-synchrony/em-redis'
+require 'uri'
 
 module EM::Resque
   extend Resque
+
+  def self.redis=(server)
+    case server
+    when String
+      opts = if server =~ /redis\:\/\//
+               uri = URI.parse(server)
+               {:host => uri.host, :port => uri.port}
+             else
+               server, namespace = server.split('/', 2)
+               host, port, db = server.split(':')
+               {:host => host, :port => port, :thread_safe => true, :db => db}
+             end
+
+      namespace ||= :resque
+
+      redis = EM::Protocols::Redis.connect(opts)
+
+      Resque.redis = Redis::Namespace.new(namespace, :redis => redis)
+    when Redis::Namespace
+      Resque.redis = server
+    else
+      Resque.redis = Redis::Namespace.new(namespace, :redis => server)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-resque
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
+  version: 1.0.0.beta7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &9351180 !ruby/object:Gem::Requirement
+  requirement: &16410000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *9351180
+  version_requirements: *16410000
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &9350600 !ruby/object:Gem::Requirement
+  requirement: &16408840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,18 +32,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9350600
+  version_requirements: *16408840
 - !ruby/object:Gem::Dependency
   name: em-redis
-  requirement: &9349920 !ruby/object:Gem::Requirement
+  requirement: &16404320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9349920
+  version_requirements: *16404320
 description: ! "    Em-resque is a version of Resque, which offers non-blocking and
   non-forking\n    workers. The idea is to have fast as possible workers for tasks
   with lots of\n    IO like pinging third party servers or hitting the database.\n\n