beanworker 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.0.2 2011-10-24
+
+* 1 major enhancement:
+  * added 'beanworker' in bin
+* 1 minor enhancement:
+  added DSL sample to README
+
 === 0.0.1 2011-10-20
 
 * 1 major enhancement:

data/Manifest.txt

@@ -3,4 +3,5 @@ Manifest.txt
 README.rdoc
 Rakefile
 lib/beanworker.rb
-lib/beanworker/worker.rb
+lib/beanworker/worker.rb
+bin/beanworker

data/README.rdoc

@@ -21,6 +21,40 @@ beanstalk-client
 -P|--pid       - path to the directory, where pid-file(s) will be saved, default is current directory
 
 == DSL
+jobs.rb:
+
+    class SomeWorker
+      extend Beanworker::Worker
+
+      class << self
+        def some_job(args={})
+          do_somethin_slow_with(args)
+        end
+
+        def another_job(args={})
+          do_something
+        end
+      end
+    end
+
+    class AnotherWorker
+      extend Beanworker::Worker
+
+      class << self
+        def scheduled_job(args={})
+          do_somethin_slow_with(args)
+        end
+      end
+
+      schedule :scheduled_job, 2*24*3600, at: '04:30', timeout: 3600, { param1: 'some_value' }
+    end
+
+    SlowWorker.perform    2, :some_job.
+                             :another_job
+
+    AnotherWorker.perform 1, :scheduled_jov
+
+== API:
 
 TODO
 

data/bin/beanworker

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+if ARGV[0] == '-h' || ARGV[0] == '--help'
+  abort 'beanworker <jobs.rb> <host:port|path/to/file.yml> [-d|--daemonize] [-m|--monitor] [-P|--pid <path/to/pid/dir>]'
+end
+
+if ARGV[0] == '-v' || ARGV[0] == '--version'
+  abort Beanworker::VERSION
+end
+
+opts = {
+    daemonize:  ARGV.include?('-d') || ARGV.include?('--daemonize'),
+    monitor:    ARGV.include?('-m') || ARGV.include?('--monitor'),
+    pid_dir:    (i = ARGV.index('-P') || ARGV.index('--pid')) ? File.expand_path(ARGV[i+1], Dir.pwd) : './',
+    jobs_file:  File.expand_path(ARGV[0], Dir.pwd)
+}
+
+conn_file = File.expand_path(ARGV[1], Dir.pwd)
+File.file?(conn_file) ? opts[:connection_file] = conn_file : opts[:connection_host] = ARGV[1]
+
+trap('INT') do
+  puts 'Exiting'
+  exit
+end
+
+
+require File.expand_path('../../lib/beanworker', __FILE__)
+Beanworker.run opts

data/lib/beanworker/worker.rb

@@ -1,5 +1,6 @@
 #coding: utf-8
 require 'timeout'
+require 'time'
 require 'pry'
 
 module Beanworker
@@ -16,6 +17,22 @@ module Beanworker
       end
     end
 
+    def schedule(name, frequency, opts={}, *args)
+      at = make_first_schedule(frequency, opts[:at])
+      timeout_secs = [opts[:timeout] || frequency, frequency-5].min
+      Thread.new do
+        loop do
+          sleep(at - Time.now)
+          Timeout.timeout timeout_secs do
+            self.send(name, *args)
+          end
+          at += frequency
+        end
+      end
+    end
+
+    private
+
     def get_one_job(connection)
       job = connection.reserve
       name, args = job.stats['tube'].gsub('.', '_'), job.ybody
@@ -47,5 +64,14 @@ module Beanworker
     def fork_default(val)
       @need_fork = val
     end
+
+    def make_first_schedule(frequency, at)
+      if at && (frequency % (24*3600) == 0)
+        t = Time.parse at
+        t > Time.now ? t : (t + 24*3600)
+      else
+        Time.now + frequency
+      end
+    end
   end
 end

data/lib/beanworker.rb

@@ -4,7 +4,7 @@ require 'beanqueue'
 require File.dirname(__FILE__) + '/beanworker/worker'
 
 module Beanworker
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   class << self
     attr_accessor :connection_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanworker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &27436880 !ruby/object:Gem::Requirement
+  requirement: &15411580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27436880
+  version_requirements: *15411580
 - !ruby/object:Gem::Dependency
   name: beanqueue
-  requirement: &27436380 !ruby/object:Gem::Requirement
+  requirement: &15410040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *27436380
+  version_requirements: *15410040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &27435920 !ruby/object:Gem::Requirement
+  requirement: &15407500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,13 +43,14 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *27435920
+  version_requirements: *15407500
 description: ! 'It is a worker-side Beanstalk-based job-queueing dispatcher
 
   This is a pre-release, I will complete tests and docs in couple days'
 email:
 - gearhead@it-primorye.ru
-executables: []
+executables:
+- beanworker
 extensions: []
 extra_rdoc_files:
 - History.txt
@@ -61,6 +62,7 @@ files:
 - Rakefile
 - lib/beanworker.rb
 - lib/beanworker/worker.rb
+- bin/beanworker
 - test/test_beanworker.rb
 - .gemtest
 homepage: http://github.com/GearHead90/beanworker