job_reactor 0.5.0 → 0.5.1.beta1

data/README.markdown

@@ -1,11 +1,9 @@
-JobReactor
+JobReactor <img src='https://secure.travis-ci.org/antonmi/job_reactor.png'>
 ==========
-Now we are in beta (need to complete documentation and fix some bugs)
----------------------------------------------------
 
 JobReactor is a library for creating, scheduling and processing background jobs.
 It is asynchronous client-server distributed system based on [EventMachine][0].
-Inspired by [Resque][1], [Beanstalkd][2]([Stalker][3]), [DelayedJob][4], and etc.
+Inspired by [Resque][1], [Beanstalkd][2] ([Stalker][3]), [DelayedJob][4], and etc.
 
 JobReactor has not 'rails' integration for the time being.
 But it is very close. We need to test the system with different servers (clusters) and automate the initialization and re-start processes.
@@ -26,10 +24,10 @@ __JobReactor is the right solution if you have thousands, millions, and, we hope
 
 Quick start
 ===========
-Use `gem install job_reactor --pre` to try it.
+```gem install job_reactor```
 
-You need to install [Redis][5] if you want to persist your jobs.
-``$ sudo apt-get install redis-server ``
+__You should install [Redis][5] if you want to persist your jobs.__
+```$ sudo apt-get install redis-server```
 
 In your main application:
 `application.rb`
@@ -46,7 +44,7 @@ loop do
   JR.enqueue 'my_job', {arg1: 'Hello'}
 end
 ```
-Define the 'my_job' in separate directory (files with job's definitions must be in separate directory):
+Define the 'my_job' in separate directory (files with job's definitions **must** be in separate directory):
 `reactor_jobs/my_jobs.rb`
 ``` ruby
 include JobReactor

data/lib/job_reactor/distributor.rb

@@ -5,14 +5,6 @@ module JobReactor
   module Distributor
     extend self
 
-    def host
-      @@host
-    end
-
-    def port
-      @@port
-    end
-
     # Gets nodes
     # You can monitor available nodes connections in you application.
     # For example
@@ -28,9 +20,14 @@ module JobReactor
       @@connections ||= []
     end
 
+    def server
+      @@connect_to || "#{@@host}:#{@@port}"
+    end
+
     #Starts distributor on given hast and port
     #
-    def start(host, port)
+    def start(host, port, opts = {})
+      @@connect_to = opts[:connect_to] && opts[:connect_to].join(':')
       @@host = host
       @@port = port
       JR::Logger.log "Distributor listens #{host}:#{port}"
@@ -47,6 +44,7 @@ module JobReactor
         data = Marshal.dump(hash)
         connection.send_data(data)
         connection.lock
+        JR::Logger.log "Distributor sent job '#{hash['name']}' to '#{connection.name}'"
       else
         EM.next_tick do
           send_data_to_node(hash)

data/lib/job_reactor/job_reactor.rb

@@ -105,7 +105,7 @@ module JobReactor
       hash.merge!('node' => opts[:node]) if opts[:node]
       hash.merge!('not_node' => opts[:not_node]) if opts[:not_node]
 
-      hash.merge!('distributor' => "#{JR::Distributor.host}:#{JR::Distributor.port}")
+      hash.merge!('distributor' => JR::Distributor.server)
 
       add_succ_feedbacks!(hash, success_proc) if success_proc.is_a? Proc
       add_err_feedbacks!(hash, error_proc) if error_proc.is_a? Proc
@@ -184,7 +184,7 @@ module JobReactor
     # Adds success callback which will launch when node reports success
     #
     def add_succ_feedbacks!(hash, callback)
-      distributor = "#{JR::Distributor.host}:#{JR::Distributor.port}"
+      distributor = JR::Distributor.server
       feedback_id = "#{distributor}_#{Time.now.utc.to_f}"
       succ_feedbacks.merge!(feedback_id => callback)
       hash.merge!('on_success' => feedback_id)
@@ -193,7 +193,7 @@ module JobReactor
     # Adds error callback which will launch when node reports error
     #
     def add_err_feedbacks!(hash, errback)
-      distributor = "#{JR::Distributor.host}:#{JR::Distributor.port}"
+      distributor = JR::Distributor.server
       feedback_id = "#{distributor}_#{Time.now.utc.to_f}"
       err_feedbacks.merge!(feedback_id => errback)
       hash.merge!('on_error' => feedback_id)

data/lib/job_reactor/logger.rb

@@ -23,7 +23,7 @@ module JobReactor
     # Builds string for job event and log it
     #
     def self.log_event(event, job)
-      log("#{event} #{job['name']}")
+      log("#{event} '#{job['name']}'")
     end
 
   end

data/lib/job_reactor/node.rb

@@ -4,7 +4,7 @@ module JobReactor
   class Node
 
     def initialize(opts)
-      @config = { storage: opts[:storage], name: opts[:name], server: opts[:server], distributors: opts[:distributors]}
+      @config = { storage: opts[:storage], name: opts[:name], server: opts[:server], connect_to: opts[:connect_to], distributors: opts[:distributors]}
     end
 
     def config
@@ -25,6 +25,10 @@ module JobReactor
       @connections ||= {}
     end
 
+    def server
+      config[:connect_to] || config[:server]
+    end
+
     # Retrying jobs if any,
     # starts server and tries to connect to distributors.
     #

data/lib/job_reactor/node/client.rb

@@ -35,7 +35,7 @@ module JobReactor
       #
       def connection_completed
         JR::Logger.log('Begin distributor handshake')
-        data = {node_info: {name: @node.config[:name], server: @node.config[:server]} }
+        data = {node_info: {name: @node.config[:name], server: @node.server} }
         data = Marshal.dump(data)
         send_data(data)
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: job_reactor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Anton Mishchuk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -100,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24