clockwork 3.0.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5a8d520eb475e3eb5b3e75b3b175a4a66c3804584912afc9d4392c1d82f3d7
-  data.tar.gz: 558bc615e123ceaf146c2107b71202fef3eaf307215c93aa8f421826e25a8d4a
+  metadata.gz: 933ed51cd69b305509c5195ee3f85ced1e940564477e97f1d3a699b47a355ba7
+  data.tar.gz: ff85eb5d04d318c96c6c34150e4aff31f5c5eb535cd7f4212bcf0d9e29cc05c2
 SHA512:
-  metadata.gz: d60240815eee8a5001004f854ccfd1fe94f01023ca5099799100bcc04a99ae982bc96f14b746b4965c4afc2aba77d2138ebae96c41da075bb7b8c4f15b863493
-  data.tar.gz: 4beb2d7f2cd09940e9159e5d4e1d1e62db2268f82b75ff86c344e7b11076a2e6d57865039fe19c361208c1fee8e5af8c3f72657880f6183107e8f90f33129e47
+  metadata.gz: b02588a3fb02ed15f9b5ae9753a9b1f7fefe9b312d54bbc14e8ce069e0fce321f33db8aff2f0728477e9923fabb3503a7c04bfd20a355a13718903a0a9d32867
+  data.tar.gz: de59b9bf5a34e5ece39915c193a5fdf680984695f2596913f83219c8053686c0656f57708a1d2fc0be04938acbc925ae6f9f69cdb220e1eeee4fcefe18285e97

data/.github/workflows/tests.yml

@@ -11,15 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ "2.7", "3.0", "3.1", "3.2", jruby ]
-        active_support: [ "6.0", "7.0" ]
-        exclude:
-          - ruby: "3.0"
-            active_support: "6.0"
-          - ruby: "3.1"
-            active_support: "6.0"
-          - ruby: "3.2"
-            active_support: "6.0"
+        ruby: [ "3.2", "3.3", "3.4", "4.0" ]
+        active_support: [ "8.0", "8.1" ]
     name: Ruby ${{ matrix.ruby }} - ActiveSupport ${{ matrix.active_support }}
     env:
       ACTIVE_SUPPORT_VERSION: ${{ matrix.active_support }}

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.0.1 ##
+
+* Update ACTIVE_SUPPORT_VERSION default to 8.1 (81b6cd2)
+* Drop test-unit dependency with migrated test (eac1064)
+* Remove unused base64, bigdecimal and ostruct dependencies (f171d8f)
+
+## 4.0.0 ##
+
+* BREAKING CHANGE: Drop EOL versions of Ruby and ActiveSupport, drop JRuby support (4f0d4a7)
+* Add Spring DST fix for Issue 60 with tests (89f15ed)
+
 ## 3.0.2 ##
 
 * Fixing clockworkd on Ruby 3.2 (a73a9d5)

data/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-rails_version = ENV.fetch("ACTIVE_SUPPORT_VERSION", "7.0")
+rails_version = ENV.fetch("ACTIVE_SUPPORT_VERSION", "8.1")
 
 gem "activesupport", "~> #{rails_version}"
 gem "minitest", "~> 5.0"
+gem "ostruct"

data/clockwork.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "clockwork"
-  s.version = "3.0.2"
+  s.version = "4.0.1"
 
   s.authors = ["Adam Wiggins", "tomykaira"]
   s.license = 'MIT'
@@ -24,5 +24,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "daemons"
   s.add_development_dependency "minitest", "~> 5.8"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "test-unit"
 end

data/lib/clockwork/event.rb

@@ -71,7 +71,15 @@ module Clockwork
     end
 
     def elapsed_ready?(t)
-      @last.nil? || (t - @last.to_i).to_i >= @period
+      # We only need to calculate this if the period is >= 1 day. The UTC offset check only makes sense
+      # for periods >= 1.day since these are the shortest period where increasing the date by a day, may not
+      # exactly match the exact elapsed time.
+      change_in_utc_offset = if @period >= 1.day
+        t.utc_offset - (t - @period).utc_offset
+      else
+        0
+      end
+      @last.nil? || (t - @last.to_i).to_i >= (@period - change_in_utc_offset)
     end
 
     def run_at?(t)

data/test/event_test.rb

@@ -70,5 +70,36 @@ describe Clockwork::Event do
         assert_equal true, event.run_now?(Time.now)
       end
     end
+
+    describe 'with Pacific Time TZ' do
+      before do
+        @manager = Class.new
+        @manager.stubs(:config).returns({ :tz => 'America/Los_Angeles' })
+      end
+
+      describe 'event non DST to DST transition' do
+        it 'returns true when it crosses the transition' do
+          event = Clockwork::Event.new(@manager, 1.day, nil, nil)
+          starting_time = Time.utc(2022, 3, 13, 6)
+          assert_equal true, event.run_now?(starting_time)
+          event.instance_variable_set('@last', starting_time)
+          # This will return true, since the UTC offset is moved forward by 1 hour. With the 1 hour, it will be
+          # equal to 1 day since the last time it was run.
+          assert_equal true, event.run_now?(starting_time + 23.hours)
+        end
+      end
+
+      describe 'event DST to non DST transition' do
+        it 'returns true when it crosses the transition' do
+          event = Clockwork::Event.new(@manager, 1.day, nil, nil)
+          starting_time = Time.utc(2021, 11, 7, 5)
+          assert_equal true, event.run_now?(starting_time)
+          event.instance_variable_set('@last', starting_time)
+          # This returns false since it hasn't reached a full 'real' day yet.
+          assert_equal false, event.run_now?(starting_time + 24.hours)
+          assert_equal true, event.run_now?(starting_time + 25.hours)
+        end
+      end
+    end
   end
 end

data/test/manager_test.rb

@@ -3,6 +3,7 @@ require "minitest/autorun"
 require 'mocha/minitest'
 require 'time'
 require 'active_support/time'
+require 'stringio'
 
 describe Clockwork::Manager do
   before do
@@ -117,7 +118,7 @@ describe Clockwork::Manager do
     @manager.handler { raise 'boom' }
     @manager.every(1.minute, 'myjob')
 
-    mocked_logger = MiniTest::Mock.new
+    mocked_logger = Minitest::Mock.new
     mocked_logger.expect :error, true, [RuntimeError]
     @manager.configure { |c| c[:logger] = mocked_logger }
     @manager.tick(Time.now)

data/test/samples/signal_test.rb

@@ -1,5 +1,6 @@
 require 'clockwork'
 require 'active_support/time'
+require 'stringio'
 
 module Clockwork
   LOGFILE = File.expand_path('../../tmp/signal_test.log', __FILE__)

data/test/signal_test.rb

@@ -1,34 +1,32 @@
-require 'test/unit'
+require "minitest/autorun"
 require 'mocha/minitest'
 require 'fileutils'
 
-class SignalTest < Test::Unit::TestCase
-  CMD     = File.expand_path('../../bin/clockwork', __FILE__)
-  SAMPLE  = File.expand_path('../samples/signal_test.rb', __FILE__)
-  LOGFILE = File.expand_path('../tmp/signal_test.log', __FILE__)
-
-  setup do
-    FileUtils.mkdir_p(File.dirname(LOGFILE))
-    @pid = spawn(CMD, SAMPLE)
-    until File.exist?(LOGFILE)
+describe "SignalTest" do
+  before do
+    @command = File.expand_path('../../bin/clockwork', __FILE__)
+    @sample = File.expand_path('../samples/signal_test.rb', __FILE__)
+    @logfile = File.expand_path('../tmp/signal_test.log', __FILE__)
+    FileUtils.mkdir_p(File.dirname(@logfile))
+    @pid = spawn(@command, @sample)
+    until File.exist?(@logfile)
       sleep 0.1
     end
   end
 
-  teardown do
-    FileUtils.rm_r(File.dirname(LOGFILE))
+  after do
+    FileUtils.rm_r(File.dirname(@logfile))
   end
 
-  test 'should gracefully shutdown with SIGTERM' do
+  it 'should gracefully shutdown with SIGTERM' do
     Process.kill(:TERM, @pid)
     sleep 0.2
-    assert_equal 'done', File.read(LOGFILE)
+    assert_equal 'done', File.read(@logfile)
   end
 
-  test 'should forcely shutdown with SIGINT' do
+  it 'should forcely shutdown with SIGINT' do
     Process.kill(:INT, @pid)
     sleep 0.2
-    assert_equal 'start', File.read(LOGFILE)
+    assert_equal 'start', File.read(@logfile)
   end
 end
-

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clockwork
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Adam Wiggins
 - tomykaira
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -95,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A scheduler process to replace cron, using a more flexible Ruby syntax
   running as a single long-running process.  Inspired by rufus-scheduler and resque-scheduler.
 email:
@@ -157,7 +142,6 @@ homepage: http://github.com/Rykian/clockwork
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A scheduler process to replace cron.
 test_files: