whedon 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f65fe47d114ba93d1c8a0f2fd0941055aa62e27
+  data.tar.gz: 7ffa65c61ac6367d50dbc2418f0059c70d05f4f7
+SHA512:
+  metadata.gz: bcf1aace39f9e20ef3a1c8ee99e0b9ed875f3abd1e4d340432fa70eeb30b0d6d3a31220772487ce121d36cf24748056d8d8a4b01febad27919b9f68b41ce7739
+  data.tar.gz: 20e0b0e7369ed786356a4bdffd83dad968e620bac366c027bdea62851c48cf53c6f799b79f459fb6a7ec1725d7e9a348348ae2f5faf73c357821065484fcfde8

data/.simplecov

@@ -0,0 +1,12 @@
+unless ENV['COVERAGE'] == 'false'
+  require 'simplecov-rcov'
+
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+      SimpleCov::Formatter::HTMLFormatter.new.format(result)
+      SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+end

data/.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
 rvm:
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+  - 2.1.10
   - 2.0.0
   - 1.9.3
   - 1.8.7

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright 2006-2013 John Mettraux
+Portions copyright 2013 Blake Thomas
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -24,7 +24,21 @@ sch.next("2020/07/01")
 # Given date/time matches cron string
 sch.matches?("2020/07/01 14:00:00")
 
+# Time.now matches cron string
+sch.now?
+
 # Give cron string represented as an array
 # [seconds minutes hours days months weekdays monthdays timezone]
 sch.to_a
 ```
+
+## And ... the Name?
+
+Why 'whedon' ? First, [when](http://rubygems.org/gems/when) was taken. I was
+considering variations on 'when do', & it occurred to me that 'whedon' (a la
+[Joss Whedon](http://en.wikipedia.org/wiki/Joss_Whedon)) was an obvious anagram
+of 'when do'. The pun regarding Whedon::Schedule being that Joss Whedon's
+television series tend to get pulled from the network schedule.
+
+## License
+[MIT](http://opensource.org/licenses/MIT). See [LICENSE](LICENSE).

data/lib/whedon/schedule.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 require 'tzinfo'
 
 
@@ -81,13 +57,13 @@ module Whedon
 
         raise ParseError.new(
           "invalid cronline: '#{line}'"
-        ) if es && es.find { |e| ! e.is_a?(Fixnum) }
+        ) if es && es.find { |e| ! e.is_a?(Integer) }
       end
     end
 
     # Returns true if the given time matches this cron line.
     #
-    def matches?(time)
+    def matches?(time=Time.now)
 
       time = as_time(time)
 
@@ -97,10 +73,7 @@ module Whedon
       return false unless date_match?(time)
       true
     end
-
-    def now?(time=Time.now)
-      matches?(time)
-    end
+    alias_method :now?, :matches?
 
     # Returns the next time that this cron line is supposed to 'fire'
     #

data/lib/whedon/version.rb

@@ -1,3 +1,3 @@
 module Whedon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -1,3 +1,16 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter                "vendor"
+  add_filter                "spec"
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 require File.expand_path("../../lib/whedon", __FILE__)
 
 class Ex < Whedon::Schedule
@@ -21,5 +34,5 @@ def cl(line)
 end
 
 def compare(line, array)
-  cl(line).to_array.should == array
+  expect(cl(line).to_array).to eq(array)
 end

data/spec/whedon/schedule_spec.rb

@@ -49,12 +49,12 @@ describe Whedon::Schedule do
 
     it 'rejects invalid weekday expressions' do
 
-      lambda { cl '0 17 * * MON_FRI' }.should raise_error
+      lambda { cl '0 17 * * MON_FRI' }.should raise_error(Whedon::ParseError)
         # underline instead of dash
 
-      lambda { cl '* * * * 9' }.should raise_error
-      lambda { cl '* * * * 0-12' }.should raise_error
-      lambda { cl '* * * * BLABLA' }.should raise_error
+      lambda { cl '* * * * 9' }.should raise_error(Whedon::ParseError)
+      lambda { cl '* * * * 0-12' }.should raise_error(Whedon::ParseError)
+      lambda { cl '* * * * BLABLA' }.should raise_error(Whedon::ParseError)
     end
 
     it 'rejects invalid cronlines' do
@@ -67,8 +67,8 @@ describe Whedon::Schedule do
       compare '* * * * * EST', [ [0], nil, nil, nil, nil, nil, nil, 'EST' ]
       compare '* * * * * * EST', [ nil, nil, nil, nil, nil, nil, nil, 'EST' ]
 
-      lambda { cl '* * * * * NotATimeZone' }.should raise_error
-      lambda { cl '* * * * * * NotATimeZone' }.should raise_error
+      lambda { cl '* * * * * NotATimeZone' }.should raise_error(Whedon::ParseError)
+      lambda { cl '* * * * * * NotATimeZone' }.should raise_error(Whedon::ParseError)
     end
 
     it 'interprets cron strings with / (slashes) correctly' do
@@ -296,6 +296,13 @@ describe Whedon::Schedule do
 
   describe '#matches?' do
 
+    it 'accepts epoch time' do
+      cl('* * * * *').matches?(Time.at(0)).should be true
+    end
+
+    it 'accepts a time string' do
+      cl('* * * * *').matches?('1969-12-31 18:00:00 -0600').should be true
+    end
 
     [ ['* * * * *',     utc(1970, 1, 1, 0, 1),      true],
       ['* * * * sun',   utc(1970, 1, 4),            true],
@@ -343,22 +350,22 @@ describe Whedon::Schedule do
 
     it 'matches correctly when there is a sun#2 involved' do
 
-      cl('* * 13 * fri#2').matches?(utc(1970, 2, 13)).should be_true
-      cl('* * 13 * fri#2').matches?(utc(1970, 2, 20)).should be_false
+      cl('* * 13 * fri#2').matches?(utc(1970, 2, 13)).should be true
+      cl('* * 13 * fri#2').matches?(utc(1970, 2, 20)).should be false
     end
 
     it 'matches correctly when there is a L involved' do
 
-      cl('* * L * *').matches?(utc(1970, 1, 31)).should be_true
-      cl('* * L * *').matches?(utc(1970, 1, 30)).should be_false
+      cl('* * L * *').matches?(utc(1970, 1, 31)).should be true
+      cl('* * L * *').matches?(utc(1970, 1, 30)).should be false
     end
 
     it 'matches correctly when there is a sun#2,sun#3 involved' do
 
-      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 4) ).should be_false
-      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 11) ).should be_true
-      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 18) ).should be_true
-      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 25) ).should be_false
+      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 4) ).should be false
+      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 11) ).should be true
+      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 18) ).should be true
+      cl('* * * * sun#2,sun#3').matches?( local(1970, 1, 25) ).should be false
     end
   end
 

data/whedon.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/bwthomas/whedon"
   s.summary     = %q{Parses cron lines}
   s.description = %q{Parses cron lines into a Schedule instance that can be queried.}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "whedon"
 
@@ -21,7 +22,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'tzinfo'
 
-  s.add_development_dependency 'rspec', '~>2.6.0'
+  s.add_development_dependency 'rspec', '~>3.5.0'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov-rcov'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whedon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - John Mettraux
@@ -10,70 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 3.5.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'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Parses cron lines into a Schedule instance that can be queried.
@@ -84,10 +103,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/whedon.rb
@@ -97,30 +118,29 @@ files:
 - spec/whedon/schedule_spec.rb
 - whedon.gemspec
 homepage: https://github.com/bwthomas/whedon
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: whedon
-rubygems_version: 1.8.23
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parses cron lines
 test_files:
 - spec/spec_helper.rb
 - spec/whedon/schedule_spec.rb
-has_rdoc: