montrose 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64686c4f9d89dce6369bcee10e33c33a353ed1ce
-  data.tar.gz: 5ab0820e474cea7b84b8f5c0e9bfa1ebb10cf738
+SHA256:
+  metadata.gz: aea4b303d8edcae6f8273a01596ad8cef6bc44a910b14ccb386b7c31e75e9770
+  data.tar.gz: 542674604e253fbc5a33ecd37ad4776291d30a45263a10440d898690cb7554ca
 SHA512:
-  metadata.gz: 5bec08f7aaabb73027e9627c2cd85813a199ef0a92bc9018305a06650ffb2a2a3a14dcebccc961b3bf0f238fc458860a0e1389a0e15d65fdb09026d9be264d88
-  data.tar.gz: c373fa0f7e8ae214950d6252a581b65630594163fb5ab3c7a09a24dd7d09d506f18998ea837b7fc5ee65881bf1fd5c09f61daccf0eb00b1c7788f7400db2c319
+  metadata.gz: 9a807b48aef8b5143f7cfe45d5ccbb8192e529dbb802aed82c21c375e48889cfd447d0f29e7238004458e56806164db387ae966a5c492433808bc90a5698ec8e
+  data.tar.gz: 2653cfceb13a13e4941ead84dbacc1ed5ef05cad74465bd39ab738cbcd48a3cebc9e70b59d521c8c38be1aacdd120dfdb75ae6ba81e991e644039adfa2f65697

data/.gitignore

@@ -10,3 +10,5 @@
 /profile.log
 /trace.txt
 gemfiles/*.lock
+/.ruby-gemset
+/.ruby-version

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
     - 'bin/**/*'
     - 'gemfiles/**/*'
     - 'tmp/**/*'
-  TargetRubyVersion: '2.1.0'
+  TargetRubyVersion: '2.3.0'
 
 Lint/HandleExceptions:
   Exclude:
@@ -39,12 +39,6 @@ Metrics/BlockLength:
 Documentation:
   Enabled: false # TODO: Enable again once we have more docs
 
-Lint/EndAlignment:
-  Enabled: false
-
-Lint/DefEndAlignment:
-  Enabled: false
-
 Lint/HandleExceptions:
   Enabled: false
 
@@ -52,6 +46,9 @@ Style/GlobalVars:
   Exclude:
   - spec/support/trace.rb
 
+Style/SafeNavigation:
+  Enabled: false
+
 Style/SpecialGlobalVars:
   Enabled: false
 
@@ -79,6 +76,12 @@ Style/StringLiteralsInInterpolation:
 Layout/ClosingParenthesisIndentation:
   Enabled: false
 
+Layout/EndAlignment:
+  Enabled: false
+
+Layout/DefEndAlignment:
+  Enabled: false
+
 Style/OneLineConditional:
   Enabled: false
 

data/.travis.yml

@@ -1,6 +1,7 @@
 bundler_args: "--jobs 4 --retry 3"
 cache: bundler
 gemfile:
+- gemfiles/activesupport_6.0.gemfile
 - gemfiles/activesupport_5.2.gemfile
 - gemfiles/activesupport_5.1.gemfile
 - gemfiles/activesupport_5.0.gemfile
@@ -9,23 +10,22 @@ gemfile:
 language: ruby
 matrix:
   exclude:
-  - rvm: 2.1
-    gemfile: gemfiles/activesupport_5.0.gemfile # Requires Ruby 2.2+
-  - rvm: 2.1
-    gemfile: gemfiles/activesupport_5.1.gemfile # Requires Ruby 2.2+
-  - rvm: 2.1
-    gemfile: gemfiles/activesupport_5.2.gemfile # Requires Ruby 2.2+
+  - rvm: 2.3
+    gemfile: gemfiles/activesupport_6.0.gemfile # Requires ruby 2.5+
   - rvm: 2.4
     gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
+  - rvm: 2.4
+    gemfile: gemfiles/activesupport_6.0.gemfile # Requires ruby 2.5+
   - rvm: 2.5
     gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
+  - rvm: 2.6
+    gemfile: gemfiles/activesupport_4.1.gemfile # Requires json 1.8.5+
   fast_finish: true
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
 sudo: false
 before_install:
   - gem update --system

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.9.0 - (2019-03-11)
+
+* enhancements
+  * enables support for ActiveRecord 6
+
+* bug fixes
+  * Fixes bug for nth day of month when used with yearly interval
+
+* breaking changes
+  * using selected with :month with :day as a Hash will now enforce the
+    `NthDayOfMonth` recurrence rule
+  * drops official support for Ruby 2.1 and 2.2
+
 ### 0.8.2 - (2018-08-02)
 
 * bug fixes

data/Gemfile

@@ -6,9 +6,12 @@ gemspec
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: %i[ruby_22 ruby_23] # Guard no longer supports ruby 2.1
-  gem "guard-minitest", platforms: %i[ruby_22 ruby_23]
-  gem "guard-rubocop", platforms: %i[ruby_22 ruby_23]
-  gem "pry-byebug", platforms: %i[ruby_21 ruby_22 ruby_23 ruby_24]
   gem "yard"
+
+  unless ENV["CI"]
+    gem "guard"
+    gem "guard-minitest"
+    gem "guard-rubocop"
+    gem "pry-byebug"
+  end
 end

data/README.md

@@ -34,7 +34,7 @@ More specifically, this project intends to:
 
 * model recurring events in Ruby
 * embrace Ruby idioms
-* support Ruby 2.1+
+* support recent Rubies
 * be reasonably performant
 * serialize to yaml, hash, and [ical](http://www.kanzaki.com/docs/ical/rrule.html#basic) formats
 * be suitable for integration with persistence libraries
@@ -271,9 +271,6 @@ Montrose.every(4.years, month: :november, on: { tuesday: 2..8 })
 date = Date.new(2016, 9, 1)
 Montrose.hourly(between: date..(date+1), hour: 9..17, interval: 3)
 
-# every 15 minutes for 6 occurrences
-Montrose.every(90.minutes, total: 6)
-
 # every hour and a half for four occurrences
 Montrose.every(90.minutes, total: 4)
 

data/gemfiles/activesupport_4.1.gemfile

@@ -6,10 +6,6 @@ gem "activesupport", "~> 4.1.0"
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: [:ruby_22, :ruby_23]
-  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
-  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
 end
 

data/gemfiles/activesupport_4.2.gemfile

@@ -6,10 +6,6 @@ gem "activesupport", "~> 4.2.0"
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: [:ruby_22, :ruby_23]
-  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
-  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
 end
 

data/gemfiles/activesupport_5.0.gemfile

@@ -6,10 +6,6 @@ gem "activesupport", "~> 5.0.0"
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: [:ruby_22, :ruby_23]
-  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
-  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
 end
 

data/gemfiles/activesupport_5.1.gemfile

@@ -6,10 +6,6 @@ gem "activesupport", "~> 5.1.0"
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: [:ruby_22, :ruby_23]
-  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
-  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
 end
 

data/gemfiles/activesupport_5.2.gemfile

@@ -6,10 +6,6 @@ gem "activesupport", "~> 5.2.0"
 
 group :development do
   gem "coveralls"
-  gem "guard", platforms: [:ruby_22, :ruby_23]
-  gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
-  gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
-  gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
   gem "yard"
 end
 

data/gemfiles/activesupport_6.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.0.0.beta2"
+
+group :development do
+  gem "coveralls"
+  gem "yard"
+end
+
+gemspec path: "../"

data/lib/montrose/frequency/weekly.rb

@@ -9,6 +9,7 @@ module Montrose
 
       def to_cron
         raise "Intervals unsupported" unless @interval == 1
+
         "#{@starts.min} #{@starts.hour} * * #{@starts.wday}"
       end
 

data/lib/montrose/frequency/yearly.rb

@@ -9,6 +9,7 @@ module Montrose
 
       def to_cron
         raise "Intervals unsupported" unless @interval == 1
+
         "#{@starts.min} #{@starts.hour} #{@starts.day} #{@starts.month} *"
       end
     end

data/lib/montrose/options.rb

@@ -11,6 +11,7 @@ module Montrose
     class << self
       def new(options = {})
         return options if options.is_a?(self)
+
         super
       end
 
@@ -142,6 +143,7 @@ module Montrose
 
     def fetch(key, *args, &_block)
       fail ArgumentError, "wrong number of arguments (#{args.length} for 1..2)" if args.length > 1
+
       found = send(key)
       return found if found
       return args.first if args.length == 1
@@ -305,8 +307,10 @@ module Montrose
     def month_or_day(key)
       month = month_number(key)
       return [:month, month] if month
+
       day = day_number(key)
       return [:day, day] if day
+
       fail ConfigurationError, "Did not recognize #{key} as a month or day"
     end
 

data/lib/montrose/recurrence.rb

@@ -222,6 +222,7 @@ module Montrose
     class << self
       def new(options = {})
         return options if options.is_a?(self)
+
         super
       end
 

data/lib/montrose/rule/nth_day_of_month.rb

@@ -8,7 +8,7 @@ module Montrose
       include Montrose::Rule
 
       def self.apply_options?(opts)
-        opts[:every] == :month && opts[:day].is_a?(Hash)
+        (opts[:every] == :month || opts[:month]) && opts[:day].is_a?(Hash)
       end
 
       def self.apply_options(opts)

data/lib/montrose/rule/nth_day_of_year.rb

@@ -8,7 +8,7 @@ module Montrose
       include Montrose::Rule
 
       def self.apply_options?(opts)
-        opts[:every] == :year && opts[:day].is_a?(Hash)
+        opts[:every] == :year && !opts[:month] && opts[:day].is_a?(Hash)
       end
 
       def self.apply_options(opts)

data/lib/montrose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Montrose
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/montrose.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "montrose/version"
 
@@ -20,15 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1.0"
+  spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_dependency "activesupport", ">= 4.1", "< 5.3"
+  spec.add_dependency "activesupport", ">= 4.1", "< 6.0"
 
   spec.add_development_dependency "appraisal", "~> 2.2.0"
-  spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "m", "~> 1.5"
-  spec.add_development_dependency "minitest", "~> 5.10"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rubocop", "~> 0.52.1"
+  spec.add_development_dependency "rubocop", "~> 0.64.0"
   spec.add_development_dependency "timecop"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +62,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.64.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +147,7 @@ files:
 - gemfiles/activesupport_5.0.gemfile
 - gemfiles/activesupport_5.1.gemfile
 - gemfiles/activesupport_5.2.gemfile
+- gemfiles/activesupport_6.0.gemfile
 - lib/montrose.rb
 - lib/montrose/chainable.rb
 - lib/montrose/clock.rb
@@ -209,15 +196,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Recurring events in Ruby