sidekiq-cron 0.1.5 → 0.1.6

data/.travis.yml

@@ -11,6 +11,8 @@ notifications:
   email:
     recipients:
       - ondrej@bartas.cz
+env:
+  travis: 'yes'
 matrix:
   allow_failures:
     - rvm: jruby-19mode

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem "sidekiq", ">= 2.13.1"
-gem 'parse-cron', '>= 0.1.2'
+gem 'rufus-scheduler', '>= 2.0.24'
 
 group :development do
   gem "bundler"

data/README.md

@@ -38,7 +38,7 @@ _Job properties_:
  'klass' => 'MyClass',
  #OPTIONAL
  'queue' => 'name of queue',
- 'args'  => '[Array or Hash] of arguments hich will be passed to perform method'
+ 'args'  => '[Array or Hash] of arguments which will be passed to perform method'
 }
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/sidekiq/cron/job.rb

@@ -1,7 +1,7 @@
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq/actor'
-require 'parse-cron'
+require 'rufus-scheduler'
 
 module Sidekiq
   module Cron
@@ -263,8 +263,8 @@ module Sidekiq
           errors << "'cron' must be set" 
         else
           begin 
-            cron = CronParser.new(@cron)
-            cron.next(Time.now)
+            cron = Rufus::Scheduler::CronLine.new(@cron)
+            cron.next_time(Time.now)
           rescue Exception => e
             #fix for different versions of cron-parser
             if e.message == "Bad Vixie-style specification bad"
@@ -336,10 +336,7 @@ module Sidekiq
       # Parse cron specification '* * * * *' and returns
       # time when last run should be performed
       def last_time now = Time.now
-        # add 1 minute to Time now - Cron parser return last time after minute ends,
-        # so by adding 60 second we will get last time after the right time happens 
-        # without any delay!
-        CronParser.new(@cron).last(now + 60)
+        Rufus::Scheduler::CronLine.new(@cron).previous_time(now)
       end
 
       def formated_last_time now = Time.now
@@ -376,6 +373,8 @@ module Sidekiq
           rescue JSON::ParserError
             [*args]   # cast to string array
           end
+        when Hash
+          [args]      # just put hash into array
         when Array
           args        # do nothing, already array
         else

data/sidekiq-cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2013-09-07"
+  s.date = "2013-10-13"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ondrejbartas/sidekiq-cron"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
 
   if s.respond_to? :specification_version then
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sidekiq>, [">= 2.13.1"])
-      s.add_runtime_dependency(%q<parse-cron>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shotgun>, [">= 0"])
     else
       s.add_dependency(%q<sidekiq>, [">= 2.13.1"])
-      s.add_dependency(%q<parse-cron>, [">= 0.1.2"])
+      s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
@@ -86,7 +86,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sidekiq>, [">= 2.13.1"])
-    s.add_dependency(%q<parse-cron>, [">= 0.1.2"])
+    s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])

data/test/unit/job_test.rb

@@ -523,9 +523,9 @@ class CronJobTest < Test::Unit::TestCase
           #set something bag to hash
           @jobs_hash['name_of_job']['cron'] = "bad cron"
           out = Sidekiq::Cron::Job.load_from_hash @jobs_hash
-          assert_equal out.size, 1, "should have 1 error"
-          assert_equal out, {"name_of_job"=>["'cron' -> bad cron: not a valid cronline"]}
-          assert_equal Sidekiq::Cron::Job.all.size, 1, "Should have only 1 job after load"          
+          assert_equal 1, out.size, "should have 1 error"
+          assert_equal ({"name_of_job"=>["'cron' -> bad cron: not a valid cronline : 'bad cron'"]}), out
+          assert_equal 1, Sidekiq::Cron::Job.all.size, "Should have only 1 job after load"          
         end
 
         should "create new jobs and then destroy them all" do

data/test/unit/poller_test.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require './test/test_helper'
 
+
 class CronPollerTest < Test::Unit::TestCase
 
   context 'Cron Poller' do
@@ -25,9 +26,13 @@ class CronPollerTest < Test::Unit::TestCase
       }
       @args2 = @args.merge(name: 'with_queue', klass: 'CronTestClassWithQueue', cron: "*/10 * * * *")
 
+      Celluloid.boot
       @poller = Sidekiq::Cron::Poller.new
     end
 
+    teardown do
+      Celluloid.shutdown
+    end
 
     should 'not enqueue any job - new jobs' do
       now = Time.now
@@ -154,4 +159,4 @@ class CronPollerTest < Test::Unit::TestCase
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.13.1
 - !ruby/object:Gem::Dependency
-  name: parse-cron
+  name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.0.24
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2947287720654605412
+      hash: -593131828609245339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sidekiq Cron helps to add repeated scheduled jobs