sidekiq-cron 0.1.9 → 0.2.0

data/Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 
+gem 'tilt' , '< 2.0.0'
 gem "sidekiq", ">= 2.17.3"
 gem 'rufus-scheduler', '>= 2.0.24'
 
 group :development do
   gem "bundler"
   gem "simplecov"
-  
+
   gem 'shoulda-context'
   gem "turn"
 
@@ -14,12 +15,12 @@ group :development do
   gem 'rack-test'
 
   gem "jeweler", "~> 1.8.3"
-  
+
   gem "sdoc" # sdoc -N .
-  
+
   gem "slim"
   gem "sinatra"
-  
+
   gem 'mocha'
   gem 'coveralls'
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/lib/sidekiq/cron/job.rb

@@ -168,8 +168,11 @@ module Sidekiq
         #set status of job
         @status = args['status'] || status_from_redis
 
+        #set last enqueue time - from args or from existing job
         if args['last_enqueue_time'] && !args['last_enqueue_time'].empty?
           @last_enqueue_time = Time.parse(args['last_enqueue_time'])
+        else
+          @last_enqueue_time = last_enqueue_time_from_redis
         end
 
         #get right arguments for job
@@ -223,15 +226,23 @@ module Sidekiq
       end
 
       def status_from_redis
+        out = "enabled"
         if exists?
-          out = "enabled"
           Sidekiq.redis do |conn|
             out = conn.hget redis_key, "status"
           end
-          out
-        else
-          "enabled"
         end
+        out
+      end
+
+      def last_enqueue_time_from_redis
+        out = nil
+        if exists?
+          Sidekiq.redis do |conn|
+            out = Time.parse(conn.hget(redis_key, "last_enqueue_time")) rescue nil
+          end
+        end
+        out
       end
 
       #export job data to hash

data/sidekiq-cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2014-01-27"
+  s.date = "2014-01-31"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<tilt>, ["< 2.0.0"])
       s.add_runtime_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<coveralls>, [">= 0"])
       s.add_development_dependency(%q<shotgun>, [">= 0"])
     else
+      s.add_dependency(%q<tilt>, ["< 2.0.0"])
       s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
       s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shotgun>, [">= 0"])
     end
   else
+    s.add_dependency(%q<tilt>, ["< 2.0.0"])
     s.add_dependency(%q<sidekiq>, [">= 2.17.3"])
     s.add_dependency(%q<rufus-scheduler>, [">= 2.0.24"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/test/test_helper.rb

@@ -25,6 +25,7 @@ require "mocha/setup"
 
 #SIDEKIQ Require - need to have sidekiq running!
 require 'celluloid/autostart'
+require 'tilt'
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq/web'

data/test/unit/job_test.rb

@@ -291,6 +291,18 @@ class CronJobTest < Test::Unit::TestCase
         job = Sidekiq::Cron::Job.find(@args)
         assert_equal job.status, "disabled", "after second find"
       end
+
+      should "last_enqueue_time shouldn't be rewritten after save" do
+        #adding last_enqueue_time to initialize is only for test purpose
+        last_enqueue_time = '2013-01-01 23:59:59'
+        Sidekiq::Cron::Job.create(@args.merge('last_enqueue_time' => last_enqueue_time))
+        job = Sidekiq::Cron::Job.find(@args)
+        assert_equal job.last_enqueue_time, Time.parse(last_enqueue_time)
+
+        Sidekiq::Cron::Job.create(@args)
+        job = Sidekiq::Cron::Job.find(@args)
+        assert_equal job.last_enqueue_time, Time.parse(last_enqueue_time), "after second create should have same time"
+      end
     end
 
     context "initialize args" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -890325318725409661
+      hash: -1703053486073250500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: