recurrent 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a45002b50684d1431f2e070a0166a8e77fee134c
+  data.tar.gz: 35c41dcb7ddb6a24c60dfb04f89cc17de5c0125d
+SHA512:
+  metadata.gz: c9f76d32f033df82b5db2cc0e8b7b5b6df9199e4e22fb50075b0e661569aeddb46e262b95298b01aeaca327692628ea0259634b5e749cd377c831ebca3cf2f8b
+  data.tar.gz: a90b47b2381c800d769c88a2f41ee2d45ab6d48d3974911b976726c93173cff1ad5217008435b25f88c73d363129027d2297004965b433341f4740425e9c9d78

data/.gitignore

@@ -6,3 +6,5 @@ Gemfile.lock
 pkg/*
 /.idea
 .zenflow-log
+.ruby-version
+.ruby-gemset

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/bin/recurrent

@@ -9,8 +9,7 @@ opts = Trollop::options do
   opt :system, "Command to send to the command line", :type => :string
   opt :name, "Name of the task", :default => 'command_line'
   opt :maximum_concurrent_tasks, "Maximum number of concurrent tasks to run", :type => :integer
-  opt :pool_size, "Size of database connection pool", :type => :integer
-  opt :locker_pool_size, "Size of locker database connection pool (should be >= maximum_concurrent_tasks)", :type => :integer
+  opt :process_name, "Name of the worker process", :type => :string
 end
 
 begin
@@ -18,5 +17,5 @@ begin
 rescue LoadError
   require 'recurrent'
 end
-$0 = "recurrent:worker:started-#{Time.now.to_s(:logging)}"
+$0 = opts[:process_name] || "recurrent:worker:started-#{Time.now.to_s(:logging)}"
 Recurrent::Worker.new(opts).start

data/lib/recurrent/configuration.rb

@@ -3,7 +3,7 @@ module Recurrent
 
     class << self
 
-      attr_accessor :logging, :wait_for_running_tasks_on_exit_for, :maximum_concurrent_tasks, :pool_size, :locker_pool_size
+      attr_accessor :logging, :wait_for_running_tasks_on_exit_for, :maximum_concurrent_tasks
 
       def self.block_accessor(*fields)
         fields.each do |field|

data/lib/recurrent/task.rb

@@ -17,12 +17,15 @@ module Recurrent
 
     def execute(execution_time)
       return handle_still_running(execution_time) if running?
-      return if Configuration.maximum_concurrent_tasks.present? && (scheduler.executing_tasks >= Configuration.maximum_concurrent_tasks)
       @thread = Thread.new do
         Thread.current["execution_time"] = execution_time
         scheduler && scheduler.increment_executing_tasks
         begin
-          call_action(execution_time)
+          if Configuration.maximum_concurrent_tasks.present?
+            call_action(execution_time) unless (scheduler.executing_tasks > Configuration.maximum_concurrent_tasks)
+          else
+            call_action(execution_time)
+          end
         rescue => e
           logger.warn("#{name} - #{e.message}")
           logger.warn(e.backtrace)

data/lib/recurrent/version.rb

@@ -1,3 +1,3 @@
 module Recurrent
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/recurrent/worker.rb

@@ -5,8 +5,6 @@ module Recurrent
 
     def initialize(options={})
       Configuration.maximum_concurrent_tasks = options[:maximum_concurrent_tasks]
-      Configuration.pool_size = options[:pool_size]
-      Configuration.locker_pool_size = options[:locker_pool_size]
       Configuration.setup.call if Configuration.setup
       file = options[:file]
       @scheduler = Scheduler.new(file)

data/spec/task_spec.rb

@@ -37,6 +37,7 @@ module Recurrent
 
       it "sets its execution_time" do
         @task.execute(@current_time)
+        @task.thread.join
         @task.thread['execution_time'].should == @current_time
       end
 
@@ -51,6 +52,7 @@ module Recurrent
           it "calls the action with a nil argument" do
             @task.action.should_receive(:call)
             @task.execute(@current_time)
+            @task.thread.join
           end
         end
 
@@ -62,6 +64,7 @@ module Recurrent
           it "loads the task return value and calls the action with it as an argument" do
             @task.action.should_receive(:call).with("testing")
             @task.execute(@current_time)
+            @task.thread.join
           end
 
           after :each do
@@ -111,6 +114,7 @@ module Recurrent
       context "When no method for handling a still running task is configured" do
         it "just logs that the task is still running" do
           @task.logger.should_receive(:info).with("handle_still_running_test: Execution from #{@executing_task_time.to_s(:seconds)} still running, aborting this execution.")
+          @task.thread.join
           @task.handle_still_running(@current_time)
         end
       end
@@ -168,6 +172,7 @@ module Recurrent
           @task = Task.new :name => 'save_results_test', :logger => Logger.new('some identifier')
           @current_time = Time.now
           @task.thread = Thread.new { Thread.current["execution_time"] = @current_time }
+          @task.thread.join
         end
 
         it "calls the method and logs that the value was saved" do
@@ -201,6 +206,7 @@ module Recurrent
           t = Task.new
           t.thread = Thread.new { sleep 1 }
           t.thread.kill
+          sleep 0.1
           t.running?.should be_false
         end
       end

data/spec/worker_spec.rb

@@ -36,7 +36,7 @@ module Recurrent
         waiting_thread = Thread.new { Worker.new.wait_until(Time.local(2011, 7, 26, 11, 40, 00)) }
         waiting_thread.alive?.should be_true
         Timecop.travel(Time.local(2011, 7, 26, 11, 40, 00))
-        sleep(0.5)
+        sleep(0.51)
         waiting_thread.alive?.should be_false
         Timecop.return
       end

metadata

@@ -1,164 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: recurrent
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Adam Kittelson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ice_cube
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 6
-        - 8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.6.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.8
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: pry-doc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: Task scheduler that doesn't need to bootstrap your Rails environment every time it executes a task the way running a rake task via cron does.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Task scheduler that doesn't need to bootstrap your Rails environment
+  every time it executes a task the way running a rake task via cron does.
+email:
 - adam@zencoder.com
-executables: 
+executables:
 - recurrent
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
-- .rvmrc
 - .zenflow
 - CHANGELOG.md
 - Gemfile
@@ -185,41 +174,33 @@ files:
 - spec/worker_spec.rb
 homepage: http://github.com/zencoder/recurrent
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Task scheduler that doesn't need to bootstrap your Rails environment every time it executes a task the way running a rake task via cron does.
-test_files: 
+specification_version: 4
+summary: Task scheduler that doesn't need to bootstrap your Rails environment every
+  time it executes a task the way running a rake task via cron does.
+test_files:
 - spec/logger_spec.rb
 - spec/scheduler_spec.rb
 - spec/spec_helper.rb
 - spec/task_collection_spec.rb
 - spec/task_spec.rb
 - spec/worker_spec.rb
+has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.8.7@recurrent