rufus-scheduler 3.1.0 → 3.2.0

data/lib/rufus/scheduler.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.1.0'
+    VERSION = '3.2.0'
 
     #
     # A common error class for rufus-scheduler
@@ -385,9 +385,9 @@ module Rufus
     #
     def scheduled?(job_or_job_id)
 
-      job, job_id = fetch(job_or_job_id)
+      job, _ = fetch(job_or_job_id)
 
-      !! (job && job.next_time != nil)
+      !! (job && job.unscheduled_at.nil? && job.next_time != nil)
     end
 
     # Lists all the threads associated with this scheduler.
@@ -441,7 +441,7 @@ module Rufus
       if format == :timeline
         a = []
         h.each { |j, ts| ts.each { |t| a << [ t, j ] } }
-        a.sort_by { |(t, j)| t }
+        a.sort_by { |(t, _)| t }
       else
         h
       end
@@ -592,11 +592,11 @@ module Rufus
 
         job = t[:rufus_scheduler_job]
         to = t[:rufus_scheduler_timeout]
+        ts = t[:rufus_scheduler_time]
 
-        next unless job && to
+        next unless job && to && ts
           # thread might just have become inactive (job -> nil)
 
-        ts = t[:rufus_scheduler_time]
         to = to.is_a?(Time) ? to : ts + to
 
         next if to > Time.now
@@ -629,7 +629,7 @@ module Rufus
 
       job = job_class.new(self, t, opts, block || callable)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "job frequency (#{job.frequency}) is higher than " +
         "scheduler frequency (#{@frequency})"
       ) if job.respond_to?(:frequency) && job.frequency < @frequency

data/rufus-scheduler.gemspec

@@ -22,7 +22,7 @@ job scheduler for Ruby (at, cron, in and every jobs).
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
     'Rakefile',
-    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,45 +83,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- lib/rufus-scheduler.rb
-- lib/rufus/scheduler.rb
-- lib/rufus/scheduler/locks.rb
-- lib/rufus/scheduler/zotime.rb
 - lib/rufus/scheduler/cronline.rb
-- lib/rufus/scheduler/util.rb
+- lib/rufus/scheduler/job_array.rb
 - lib/rufus/scheduler/jobs.rb
+- lib/rufus/scheduler/locks.rb
+- lib/rufus/scheduler/util.rb
 - lib/rufus/scheduler/zones.rb
-- lib/rufus/scheduler/job_array.rb
-- spec/job_spec.rb
-- spec/schedule_in_spec.rb
-- spec/zotime_spec.rb
-- spec/spec_helper.rb
-- spec/job_array_spec.rb
-- spec/schedule_interval_spec.rb
-- spec/job_at_spec.rb
-- spec/schedule_at_spec.rb
-- spec/error_spec.rb
-- spec/lock_spec.rb
-- spec/schedule_cron_spec.rb
-- spec/job_interval_spec.rb
-- spec/job_repeat_spec.rb
-- spec/schedule_every_spec.rb
-- spec/threads_spec.rb
-- spec/cronline_spec.rb
-- spec/lock_lockfile_spec.rb
-- spec/job_in_spec.rb
-- spec/parse_spec.rb
-- spec/scheduler_spec.rb
-- spec/lock_custom_spec.rb
-- spec/basics_spec.rb
-- spec/job_cron_spec.rb
-- spec/job_every_spec.rb
-- spec/lock_flock_spec.rb
+- lib/rufus/scheduler/zotime.rb
+- lib/rufus/scheduler.rb
+- lib/rufus-scheduler.rb
 - rufus-scheduler.gemspec
 - CHANGELOG.txt
-- TODO.txt
-- LICENSE.txt
 - CREDITS.txt
+- LICENSE.txt
+- TODO.txt
 - README.md
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
@@ -144,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)

data/spec/basics_spec.rb

@@ -1,54 +0,0 @@
-
-#
-# Specifying rufus-scheduler
-#
-# Sun Jun  1 05:52:24 JST 2014
-#
-
-require 'spec_helper'
-
-
-describe 'basics' do
-
-  def tts(time)
-
-    time.strftime('%Y-%m-%d %H:%M:%S %z') + (time.dst? ? ' dst' : '')
-  end
-
-  describe 'Time.new' do
-
-    it 'accepts a timezone final argument' do
-
-      if jruby? or ruby18?
-
-        expect(true).to be(true)
-
-      else
-
-        expect(
-          tts(Time.new(2014, 1, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-01-01 01:00:00 +0100')
-        expect(
-          tts(Time.new(2014, 8, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-08-01 01:00:00 +0100')
-        expect(
-          tts(Time.new(2014, 8, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-08-01 01:00:00 +0100')
-      end
-    end
-  end
-
-  describe 'Time.local' do
-
-    it 'works as expected' do
-
-      expect(
-        tts(in_zone('Europe/Berlin') { Time.local(2014, 1, 1, 1, 0, 0) })
-      ).to eq('2014-01-01 01:00:00 +0100')
-      expect(
-        tts(in_zone('Europe/Berlin') { Time.local(2014, 8, 1, 1, 0, 0) })
-      ).to eq('2014-08-01 01:00:00 +0200 dst')
-    end
-  end
-end
-