zmq_jobs 0.0.1.alpha → 0.0.1.alpha2

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
-require 'rdoc/task'
 require 'rspec/core/rake_task'
 
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)

data/config/zmq_jobs.yml

@@ -10,5 +10,5 @@ broker:
     hosts: ['127.0.0.1']
     ports: [<%= (2200..2202).to_a.join(', ') %>]
   backend:
-    host: '127.0.0.1'
-    port: 2203
+    hosts: '127.0.0.1'
+    ports: 2203

data/examples/config/zmq_jobs.yml

@@ -14,5 +14,5 @@ broker:
     hosts: ['127.0.0.1']
     ports: [<%= (2200..2202).to_a.join(', ') %>]
   backend:
-    host: '127.0.0.1'
-    port: 2203
+    hosts: '127.0.0.1'
+    ports: 2203

data/examples/publisher.rb

@@ -8,8 +8,8 @@ Signal.trap('INT') do
 end
 
 publisher = ZmqJobs::Socket::Pub.new(
-  'host' => '127.0.0.1',
-  'port' => 2200
+  'hosts' => '127.0.0.1',
+  'ports' => 2200
 )
 publisher.run do |socket|
   msg = message.call(index)

data/lib/command.rb

@@ -6,7 +6,8 @@ require 'erb'
 module ZmqJobs
   class Command
     attr_reader :daemonize, :monitor, :config_file, :execute_dir, :options
-    DEVICES = {'broker' => Broker, 'balancer' => Balancer}
+    
+    ALLOW_COMMANDS = %W{start stop restart}
     
     def self.define_properties options
       options.each do |property, value|
@@ -25,7 +26,7 @@ module ZmqJobs
       @config_file = './config/zmq_jobs.yml'
       @options = read_config_file
       
-      if args.empty?
+      if args.empty? || !ALLOW_COMMANDS.include?(args.first)
         puts opts_parser
         exit 1
       else
@@ -64,7 +65,7 @@ module ZmqJobs
     end
     
     def opts_banner
-      "Usage: #{type} <start|stop|restart> [options]"
+      "Usage: #{type} <#{ALLOW_COMMANDS.join('|')}> [options]"
     end
   
     def start_daemon daemon_name, config
@@ -85,7 +86,12 @@ module ZmqJobs
     end
     
     def read_config_file
-      YAML.load(ERB.new(File.new(File.expand_path(config_file, execute_dir)).read).result)
+      full_path = File.expand_path(config_file, execute_dir)
+      raise(
+        "Config file not found in '#{full_path}'. Create config file or define its with -c option"
+      ) unless File.exists?(full_path)
+      
+      YAML.load(ERB.new(File.new(full_path).read).result)
     end
     
     def daemon_config name
@@ -117,11 +123,15 @@ module ZmqJobs
       success = workers_to_start.map{|worker|
         preload_worker_class(daemon_classname(worker))
         start_daemon(worker, daemon_config(worker))
-      }.inject(&:'&&')
+      }.inject(true){|result, value|result &&= value}
       
       ::ZmqJobs.logger.info('One or more workers do not started') unless success
     end
     
+    def daemon_class name=nil
+      ActiveSupport::Inflector.constantize(daemon_classname(name))
+    end
+    
     protected
     def preload_worker_class classname
       worker_class_dir = File.expand_path(options['workers_dir'], execute_dir)
@@ -145,10 +155,6 @@ module ZmqJobs
       )
     end
     
-    def daemon_class name=nil
-      ActiveSupport::Inflector.constantize(daemon_classname(name))
-    end
-    
     def daemon_classname name
       ActiveSupport::Inflector.camelize(name, true)
     end

data/lib/zmq_jobs/devices/device.rb

@@ -55,7 +55,7 @@ module ZmqJobs
     
     def backend_options
       options['backend'].
-        assert_valid_keys('host', 'port')
+        assert_valid_keys('hosts', 'ports', 'linger')
     end
     
     def logger

data/lib/zmq_jobs/socket/base.rb

@@ -8,7 +8,7 @@ module ZmqJobs
         iothreads = options['iothreads'] ? options['iothreads'].to_i : 1
         @context = options.delete('context') || ZMQ::Context.create(iothreads)
         raise Error.new('Can not create context') unless @context
-        @options = default_options.merge(options)
+        @options = build_default_options.merge(options)
         @socket = @context.socket(ZMQ::PUB)
         @running = false
       end
@@ -82,11 +82,17 @@ module ZmqJobs
         options['ports'].is_a?(Array) ? options['ports'] : [options['ports']]
       end
 
-      def default_options
+      def build_default_options
         {
+          'linger' => 0,
           'hosts' => '*',
           'ports' => 2200
-        }
+        }.merge(default_options).
+        delete_if{|k,v|v.nil?}
+      end
+      
+      def default_options
+        {}
       end
     end
   end

data/lib/zmq_jobs/socket/pub.rb

@@ -4,6 +4,7 @@ module ZmqJobs
       def initialize options={}
         super(options)
         @socket = @context.socket(ZMQ::PUB)
+        assert(socket.setsockopt(ZMQ::LINGER, self.options['linger'])) if self.options['linger']
       end
 
       def create_link url
@@ -15,17 +16,16 @@ module ZmqJobs
 
       private
       def hosts
-        options['host'].is_a?(Array) ? [options['host'].first] : [options['host']]
+        options['hosts'].is_a?(Array) ? [options['hosts'].first] : [options['hosts']]
       end
 
       def ports
-        options['port'].is_a?(Array) ? [options['port'].first] : [options['port']]
+        options['ports'].is_a?(Array) ? [options['ports'].first] : [options['ports']]
       end
 
       def default_options
         {
-          'host' => '*',
-          'port' => 2200
+          'linger' => nil
         }
       end
     end

data/lib/zmq_jobs/socket/sub.rb

@@ -17,10 +17,9 @@ module ZmqJobs
       protected
       def default_options
         {
-          'linger' => 0,
           'subscribe' => '',
-          'hosts' => ['127.0.0.1'],
-          'ports' => [2200]
+          'hosts' => '127.0.0.1',
+          'ports' => 2200
         }
       end
     end

data/lib/zmq_jobs/version.rb

@@ -1,3 +1,3 @@
 module ZmqJobs
-  VERSION = "0.0.1.alpha"
+  VERSION = "0.0.1.alpha2"
 end

data/lib/zmq_jobs/worker/base.rb

@@ -5,11 +5,10 @@ module ZmqJobs
       class << self
         def cmd args
           count = args[2].to_i || 0
-          options = {
-            'hosts' => [args[0]],
-            'ports' => (args[1].to_i..(args[1].to_i + count)).to_a
-          }
-          options['iothreads'] = args[3] if args[3]
+          options = {}
+          options['hosts'] = args[0] if args[0]
+          options['ports'] = (args[1].to_i..(args[1].to_i + count)).to_a if args[1]
+          options['iothreads'] = args[3].to_i if args[3]
           start(options)
         end
         

data/spec/lib/command_spec.rb

@@ -1,13 +1,26 @@
 require 'spec_helper.rb'
 
-describe ZmqJobs::BrokerCommand do
-  let(:command) do
-    ZmqJobs::BrokerCommand.any_instance.stub(:read_config_file => options, :start => true)
-    ZmqJobs::BrokerCommand.new(args)
+class TestWorker
+end
+class AnotherTestWorker
+end
+
+describe ZmqJobs::Command do
+  describe '.new' do
+    let(:command) do
+      ZmqJobs::Command.new(['start'])
+    end
+    
+    it 'should raise exception' do
+      lambda{command}.should raise_error(RuntimeError)
+    end
   end
-  let(:options){{:key1 => :value1, :key2 => :value2}}
+end
+
+shared_examples_for 'initialization' do
+  let(:daemon_options){{:key => :value}}
   
-  context 'without option' do
+  context 'without options' do
     let(:args){['start']}
     
     specify{command.daemonize.should be_false}
@@ -15,8 +28,9 @@ describe ZmqJobs::BrokerCommand do
     specify{command.config_file.should == './config/zmq_jobs.yml'}
     specify{command.execute_dir.should == Dir.pwd}
     specify{command.options.should == options}
-    specify{command.type.should == 'broker'}
-    specify{command.daemon_class.should == ZmqJobs::Broker}
+    specify{command.type.should == type}
+    specify{command.daemon_class(daemon).should == classname}
+    specify{command.send(:daemon_config, daemon).should == daemon_options}
   end
   
   context 'with option -d' do
@@ -43,3 +57,159 @@ describe ZmqJobs::BrokerCommand do
     specify{command.config_file.should == 'bla-bla-bla'}
   end
 end
+
+shared_examples_for 'daemonization' do
+  let(:args){['start']}
+  let(:daemon_options){{:key => :value}}
+  
+  specify{command.start}
+end
+
+describe ZmqJobs::BrokerCommand do
+  before do
+    ZmqJobs::BrokerCommand.any_instance.stub(:read_config_file => options)
+  end
+  
+  let(:command){ZmqJobs::BrokerCommand.new(args)}
+  let(:type){'broker'}
+  let(:daemon){type}
+  let(:options){{daemon => daemon_options}}
+  
+  describe '.new' do
+    before do
+      ZmqJobs::BrokerCommand.any_instance.stub(:start => true)
+    end
+    
+    let(:classname){ZmqJobs::Broker}
+    
+    it_behaves_like 'initialization'
+  end
+  
+  describe '#start' do
+    before do
+      ZmqJobs::BrokerCommand.any_instance.should_receive(:start_daemon).with(daemon, daemon_options).and_return(true)
+    end
+    
+    it_behaves_like 'daemonization'
+  end
+end
+
+describe ZmqJobs::BalancerCommand do
+  before do
+    ZmqJobs::BalancerCommand.any_instance.stub(:read_config_file => options)
+  end
+  
+  let(:command){ZmqJobs::BalancerCommand.new(args)}
+  let(:type){'balancer'}
+  let(:daemon){type}
+  let(:options){{daemon => daemon_options}}
+  
+  describe '.new' do
+    before do
+      ZmqJobs::BalancerCommand.any_instance.stub(:start => true)
+    end
+    
+    let(:classname){ZmqJobs::Balancer}
+    
+    it_behaves_like 'initialization'
+  end
+  
+  describe '#start' do
+    before do
+      ZmqJobs::BalancerCommand.any_instance.should_receive(:start_daemon).with(daemon, daemon_options).and_return(true)
+    end
+    
+    it_behaves_like 'daemonization'
+  end
+end
+
+describe ZmqJobs::WorkerCommand do
+  before do
+    ZmqJobs::WorkerCommand.any_instance.stub(:read_config_file => options)
+  end
+  
+  let(:command){ZmqJobs::WorkerCommand.new(args)}
+  let(:type){'worker'}
+  
+  describe '.new' do
+    before do
+      ZmqJobs::WorkerCommand.any_instance.stub(:start => true)
+    end
+    
+    let(:daemon){'test_worker'}
+    let(:classname){TestWorker}
+    let(:options){{'workers' => {daemon => daemon_options}}}
+    
+    it_behaves_like 'initialization'
+    
+    context 'test workers initialization' do
+      let(:daemon_options){{:key => :value}}
+      context do
+        let(:workers){%W{worker1 worker2 worker3}}
+        let(:args){['start']}
+
+        specify{command.send(:input_workers).should == nil}
+        specify{command.send(:all_workers).should == ['test_worker']}      
+        specify{command.send(:workers_to_start).should == ['test_worker']}      
+      end
+
+      context do
+        let(:workers){%W{worker1 worker2 worker3}}
+        let(:args){['start', '-w', workers.join(',')]}
+
+        specify{command.send(:input_workers).should == workers}
+        specify{command.send(:all_workers).should == ['test_worker']}      
+        specify{command.send(:workers_to_start).should == []}      
+      end
+      
+      context do
+        let(:workers){%W{worker1 worker2 worker3 test_worker}}
+        let(:args){['start', '-w', workers.join(',')]}
+      
+        specify{command.send(:input_workers).should == workers}
+        specify{command.send(:all_workers).should == ['test_worker']}      
+        specify{command.send(:workers_to_start).should == ['test_worker']}
+      end 
+    end
+  end
+  
+  describe '#start' do
+    before do
+      ZmqJobs::WorkerCommand.any_instance.stub(:workers_to_start => workers)
+      ZmqJobs::WorkerCommand.any_instance.stub(:preload_worker_class => true)
+    end
+    
+    let(:args){['start', '-d']}
+    let(:first_daemon_options){{:key => :first}}
+    
+    context 'daemonization for one worker' do
+      let(:workers){%W{test_worker}}
+      let(:options){{'workers' => {workers.first => first_daemon_options}}}
+      
+      before do
+        command.should_receive(:start_daemon).
+          with(workers.first, first_daemon_options).and_return(true)
+      end
+      
+      specify{command.start}
+    end
+    
+    context 'daemonization for many workers' do
+      let(:workers){%W{test_worker another_test_worker}}
+      let(:last_daemon_options){{:key => :last}}
+      let(:options){{'workers' => {
+        workers.first => first_daemon_options,
+        workers.last => last_daemon_options
+      }}}
+      
+      before do
+        command.should_receive(:start_daemon).
+          with(workers.first, first_daemon_options).and_return(true)
+        command.should_receive(:start_daemon).
+          with(workers.last, last_daemon_options).and_return(true)
+      end
+      
+      specify{command.start}
+    end
+  end
+end

data/spec/lib/worker/base_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper.rb'
+
+TestWorker = Class.new(ZmqJobs::Worker::Base)
+
+describe ZmqJobs::Worker::Base do
+  describe '.cmd' do
+    before do
+      worker = mock(:worker, :start => true)
+      TestWorker.should_receive(:new).with(result_options).and_return(worker)
+    end
+    
+    subject{TestWorker.cmd(options)}
+    
+    
+    context 'without arguments' do
+      let(:options){[]}
+      let(:result_options){{}}
+      
+      specify{subject.should be_true}
+    end
+    
+    context 'with one argument' do
+      let(:options){['127.0.0.1']}
+      let(:result_options){{'hosts' => '127.0.0.1'}}
+      
+      specify{subject.should be_true}
+    end
+    
+    context 'with two arguments' do
+      let(:options){['127.0.0.1', '2200']}
+      let(:result_options){{'hosts' => '127.0.0.1', 'ports' => [2200]}}
+      
+      specify{subject.should be_true}
+    end
+    
+    context 'with three arguments' do
+      let(:options){['127.0.0.1', '2200', '3']}
+      let(:result_options){{'hosts' => '127.0.0.1', 'ports' => [2200, 2201, 2202, 2203]}}
+      
+      specify{subject.should be_true}
+    end
+    
+    context 'with four arguments' do
+      let(:options){['127.0.0.1', '2200', '3', '2']}
+      let(:result_options){{'hosts' => '127.0.0.1', 'ports' => [2200, 2201, 2202, 2203], 'iothreads' => 2}}
+      
+      specify{subject.should be_true}
+    end
+  end
+  
+  describe '.new' do
+    
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: zmq_jobs
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.0.1.alpha
+  version: 0.0.1.alpha2
 platform: ruby
 authors: 
 - Undr
@@ -10,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 +07:00
+date: 2011-11-11 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2"
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +33,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +44,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,10 +66,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ffi
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +77,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ffi-rzmq
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,10 +88,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -100,10 +99,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: daemons
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,6 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id009
 description: ZeroMQ-based queue system for background job
 email: 
@@ -146,6 +146,7 @@ files:
 - lib/zmq_jobs/version.rb
 - lib/zmq_jobs/worker/base.rb
 - spec/lib/command_spec.rb
+- spec/lib/worker/base_spec.rb
 - spec/spec_helper.rb
 - zmq_jobs.gemspec
 has_rdoc: true
@@ -162,6 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2610017728678870612
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -178,4 +182,5 @@ specification_version: 3
 summary: ZeroMQ-based queue system for background job
 test_files: 
 - spec/lib/command_spec.rb
+- spec/lib/worker/base_spec.rb
 - spec/spec_helper.rb