chrono 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d252cd6e02cae1bbb12c6a310402e15de067158
-  data.tar.gz: a8f41a68a6e85e74a05edc049cab7593f51e89e0
+SHA256:
+  metadata.gz: 946e2892180dd9ae752e3883cd0d85de26697b48303dc46d6ef9083958faccaa
+  data.tar.gz: b7a7dae085130625666abe7ebcdf40e50fa5ebe040b1cea101410458fbd165ae
 SHA512:
-  metadata.gz: 6e7cf6afc4ad77ade83fde6f5fea043dcfaa91167905cd2165e872840264f57395e93dbe22e11003568537b9998e90f42d0f066741b036b6dfac0fe57ce17f04
-  data.tar.gz: 29f662fa1ea7aa28d9e613e1bc73c80b6869662e003e52f92f5250e4c3da5c574b59d0829c4d16f478054db219f44723dcf405083d8c51435c31f811d6cec050
+  metadata.gz: 45245d747c9904409700776623301c7f2ab6b4c26f93a078f7b4d84221fa6549d441a51a939ead6f0ded5b979617b8c48f21027a594769f75faecd2d17190458
+  data.tar.gz: b148ea5a87ff74823c69d642f9b8e5af0630b2a0720ac92abf51a49b6856347b45fa79381d33acfe1404d8c5ba39024c230394731285923ebf898f06ed367ca5

data/.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7.2
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGELOG.md

@@ -1,31 +1,83 @@
+# Changelog
+
+## Unreleased
+
+## 0.6.0
+
+### Added
+
+- Add last-day-of-month syntax (thx @itkrt2y).
+
+## 0.5.0
+
+### Added
+
+- Add support for activesupport 7 (thx @unasuke).
+
+### Changed
+
+- Drop support of activesupport below 5.2.
+
 ## 0.4.0
 
-- Raise ArgumentError on inifinite loop detected (thx @nurse)
+### Changed
+
+- Raise ArgumentError on inifinite loop detected (thx @nurse).
 
 ## 0.3.0
-- Fix bug on day and wday specs
+
+### Fixed
+
+- Fix bug on day and wday specs.
 
 ## 0.2.0
-- Add more strict validations
-- Support some alias field names
+
+### Added
+
+- Support some alias field names.
+
+### Changed
+
+- Add more strict validations.
 
 ## 0.1.0
-- Raise errors on invalid fields (thx @eagletmt)
+
+### Changed
+
+- Raise errors on invalid fields (thx @eagletmt).
 
 ## 0.0.6
-- Support ActiveSupport 3 and 4
+
+### Changed
+
+- Support ActiveSupport 3 and 4.
 
 ## 0.0.5
-- Fix missing version dependency on ActiveSupport 4
+
+### Changed
+
+- Fix missing version dependency on ActiveSupport 4.
 
 ## 0.0.4
-- Add extra 1sec sleep to adjust to exact minute
+
+### Changed
+
+- Add extra 1sec sleep to adjust to exact minute.
 
 ## 0.0.3
-- Schedule more accurate second
+
+### Changed
+
+- Schedule more accurate second.
 
 ## 0.0.2
-- Chrono::Trigger was added
+
+### Added
+
+- Chrono::Trigger was added.
 
 ## 0.0.1
-- Chrono::Iterator was added
+
+### Added
+
+- Chrono::Iterator was added.

data/README.md

@@ -1,4 +1,7 @@
-# Chrono [![Build Status](https://travis-ci.org/r7kamura/chrono.png)](https://travis-ci.org/r7kamura/chrono) [![Code Climate](https://codeclimate.com/github/r7kamura/chrono.png)](https://codeclimate.com/github/r7kamura/chrono) [![Code Climate](https://codeclimate.com/github/r7kamura/chrono/coverage.png)](https://codeclimate.com/github/r7kamura/chrono)
+# Chrono
+
+[![test](https://github.com/r7kamura/chrono/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/chrono/actions/workflows/test.yml)
+[![Gem Version](https://badge.fury.io/rb/chrono.svg)](https://rubygems.org/gems/chrono)
 
 Provides a chain of logics about chronology.
 

data/chrono.gemspec

@@ -16,10 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", '>= 5.2'
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.4.0"
-  spec.add_development_dependency "simplecov"
 end

data/lib/chrono/fields/base.rb

@@ -21,7 +21,7 @@ module Chrono
           fields.map(&:to_a).flatten.uniq.sort
         else
           validate!
-          lower.step(upper, step).to_a.sort
+          wildcard? ? [] : lower.step(upper, step).to_a.sort
         end
       end
 
@@ -31,11 +31,21 @@ module Chrono
         source.gsub("*", "#{range.first}-#{range.last}")
       end
 
+      def wildcards
+        []
+      end
+
+      def wildcard?
+        wildcards.include?(source)
+      end
+
       def validate!
         unless match_data
           raise InvalidField.new('Unparsable field', source)
         end
 
+        return true if wildcard?
+
         if lower < range.begin || range.end < upper
           raise InvalidField.new('The field is out-of-range', source)
         end
@@ -68,7 +78,11 @@ module Chrono
       end
 
       def pattern
-        %r<\A(\d+)(?:-(\d+))?(?:/(\d+))?\z>
+        ptn = %r<\A(\d+)(?:-(\d+))?(?:/(\d+))?\z>
+        if wildcards.any?
+          ptn = Regexp.union(ptn, *wildcards.map { |w| /\A#{w}\z/ })
+        end
+        ptn
       end
 
       def match_data

data/lib/chrono/fields/day.rb

@@ -6,6 +6,10 @@ module Chrono
       def range
         1..31
       end
+
+      def wildcards
+        ['L']
+      end
     end
   end
 end

data/lib/chrono/next_time.rb

@@ -1,13 +1,5 @@
+require "active_support"
 require "active_support/core_ext/numeric/time"
-require "active_support/version"
-
-if ActiveSupport::VERSION::MAJOR >= 4
-  require "active_support/core_ext/date"
-  require "active_support/core_ext/time"
-else
-  require "active_support/core_ext/date/calculations"
-  require "active_support/core_ext/time/calculations"
-end
 
 module Chrono
   class NextTime
@@ -56,7 +48,9 @@ module Chrono
     end
 
     def scheduled_in_this_day?
-      if schedule.days?
+      if schedule.last_day_of_month?
+        time.day == time.end_of_month.day
+      elsif schedule.days?
         if schedule.wdays?
           schedule.days.include?(time.day) || schedule.wdays.include?(time.wday)
         else

data/lib/chrono/schedule.rb

@@ -46,6 +46,10 @@ module Chrono
       fields[4] != '*'
     end
 
+    def last_day_of_month?
+      fields[2] == 'L'
+    end
+
     private
 
     def fields

data/lib/chrono/version.rb

@@ -1,3 +1,3 @@
 module Chrono
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/spec/chrono/iterator_spec.rb

@@ -25,6 +25,8 @@ describe Chrono::Iterator do
       "2000-01-01 00:00:00", "2000-01-03 00:00:00", "0 0 1,15 * 1",
       "2000-01-01 00:00:00", "2000-01-05 00:00:00", "0 0 5,15,25 * 5",
       "2000-02-29 00:00:01", "2004-02-29 00:00:00", "0 0 29 2 *",
+      "2000-01-01 00:00:00", "2000-01-31 00:00:00", "0 0 L * *",
+      "2000-01-31 00:00:00", "2000-02-29 00:00:00", "0 0 L * *",
     ].each_slice(3) do |from, to, source|
       it "ticks #{from} to #{to} by #{source}" do
         now = Time.parse(from)

data/spec/chrono/schedule_spec.rb

@@ -124,6 +124,10 @@ describe Chrono::Schedule do
       let (:source){ '0 0 32 * *' }
       it { expect{subject}.to raise_error(Chrono::Fields::Base::InvalidField) }
     end
+    context 'last day of the month' do
+      let (:source){ '0 0 L * *' }
+      it { is_expected.to eq [] }
+    end
   end
 
   describe '#months' do

data/spec/spec_helper.rb

@@ -1,11 +1,3 @@
-require "simplecov"
-SimpleCov.start
-
-if ENV["CI"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "chrono"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chrono
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,29 +66,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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: 
+description:
 email:
 - r7kamura@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -129,7 +101,7 @@ homepage: https://github.com/r7kamura/chrono
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Provides a chain of logics about chronology.
 test_files:

data/.travis.yml

@@ -1,9 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-branches:
-  only:
-    - master
-env:
-  global:
-    secure: bzOuKK2sEcdWchOeiS5VgKIj8R6ZFZLtmlJ3aENdYAXcrrVW+1XKAGQlT3NxH5G2EloV8nNPOX8oNXbYjs81AvEEdjZGRMYUnC59GbvtL+2zQgG77yq5xI/UXypuBQIzUBhzrwFMImSAltKsdlbsrVUtl7x8Arg1HajcMbEsg9Y=