parse-cron 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.3"

data/Gemfile

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 gemspec
 
 gem "ZenTest", "4.6.0"
+gem "rake"

data/License

@@ -0,0 +1,21 @@
+Copyright (C) 2013 Michael Siebert <siebertm85@googlemail.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.

data/README.md

@@ -0,0 +1,17 @@
+# parse-cron - parse crontab syntax & determine next scheduled run [![Build Status](https://travis-ci.org/siebertm/parse-cron.png)](https://travis-ci.org/siebertm/parse-cron)
+
+The goal of this gem is to parse a crontab timing specification and determine when the
+job should be run. It is not a scheduler, it does not run the jobs.
+
+## API example
+
+```
+cron_parser = CronParser.new('30 * * * *')
+
+# Comming times
+next_comming_time = cron_parser.next(Time.now)
+
+# Times that have been
+most_resently_time = cron_parser.last(Time.now)
+```
+

data/lib/cron_parser.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'date'
 #
 # Parses cron expressions and computes the next occurence of the "job"
 #
@@ -28,18 +29,18 @@ class CronParser
   end
 
   SYMBOLS = {
-     "jan" => "0",
-     "feb" => "1",
-     "mar" => "2",
-     "apr" => "3",
-     "may" => "4",
-     "jun" => "5",
-     "jul" => "6",
-     "aug" => "7",
-     "sep" => "8",
-     "oct" => "9",
-     "nov" => "10",
-     "dec" => "11",
+     "jan" => "1",
+     "feb" => "2",
+     "mar" => "3",
+     "apr" => "4",
+     "may" => "5",
+     "jun" => "6",
+     "jul" => "7",
+     "aug" => "8",
+     "sep" => "9",
+     "oct" => "10",
+     "nov" => "11",
+     "dec" => "12",
 
      "sun" => "0",
      "mon" => "1",
@@ -53,6 +54,7 @@ class CronParser
   def initialize(source,time_source = Time)
     @source = source
     @time_source = time_source
+    validate_source
   end
 
 
@@ -114,9 +116,9 @@ class CronParser
       else
         if SUBELEMENT_REGEX === subel
           if $5 # with range
-            stepped_range($1.to_i..($3.to_i + 1), $5.to_i)
+            stepped_range($1.to_i..$3.to_i, $5.to_i)
           elsif $3 # range without step
-            stepped_range($1.to_i..($3.to_i + 1), 1)
+            stepped_range($1.to_i..$3.to_i, 1)
           else # just a numeric
             [$1.to_i]
           end
@@ -211,7 +213,7 @@ class CronParser
   end
 
   def substitute_parse_symbols(str)
-    SYMBOLS.inject(str) do |s, (symbol, replacement)|
+    SYMBOLS.inject(str.downcase) do |s, (symbol, replacement)|
       s.gsub(symbol, replacement)
     end
   end
@@ -237,4 +239,14 @@ class CronParser
       allowed.sort.reverse.find { |val| val < current }
     end
   end
+
+  def validate_source
+    unless @source.respond_to?(:split)
+      raise ArgumentError, 'not a valid cronline'
+    end
+    source_length = @source.split(/\s+/).length
+    unless source_length >= 5 && source_length <= 6
+      raise ArgumentError, 'not a valid cronline'
+    end
+  end
 end

data/lib/parse-cron/version.rb

@@ -1,5 +1,5 @@
 module Parse
   module Cron
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/spec/cron_parser_spec.rb

@@ -1,7 +1,7 @@
 require "time"
 require "./spec/spec_helper"
 require "cron_parser"
-require "time"
+require "date"
 
 def parse_date(str)
   dt = DateTime.strptime(str, "%Y-%m-%d %H:%M")
@@ -10,16 +10,16 @@ end
 
 describe "CronParser#parse_element" do
   [
-    ["*", 0..60, (0..60).to_a],
-    ["*/10", 0..60, [0, 10, 20, 30, 40, 50]],
-    ["10", 0..60, [10]],
-    ["10,30", 0..60, [10, 30]],
-    ["10-15", 0..60, [10, 11, 12, 13, 14, 15]],
-    ["10-40/10", 0..60, [10, 20, 30, 40]],
+    ["*", 0..59, (0..59).to_a],
+    ["*/10", 0..59, [0, 10, 20, 30, 40, 50]],
+    ["10", 0..59, [10]],
+    ["10,30", 0..59, [10, 30]],
+    ["10-15", 0..59, [10, 11, 12, 13, 14, 15]],
+    ["10-40/10", 0..59, [10, 20, 30, 40]],
   ].each do |element, range, expected|
     it "should return #{expected} for '#{element}' when range is #{range}" do
-      parser = CronParser.new('')
-      parser.parse_element(element, range) == expected
+      parser = CronParser.new('* * * * *')
+      parser.parse_element(element, range).first.to_a.sort.should == expected.sort
     end
   end
 end
@@ -38,10 +38,14 @@ describe "CronParser#next" do
     ["0 9 * * *",       "2011-12-31 10:15",  "2012-01-01 09:00"],
     ["* * 12 * *",      "2010-04-15 10:15",  "2010-05-12 00:00"],
     ["* * * * 1,3",     "2010-04-15 10:15",  "2010-04-19 00:00"],
+    ["* * * * MON,WED", "2010-04-15 10:15",  "2010-04-19 00:00"],
     ["0 0 1 1 *",       "2010-04-15 10:15",  "2011-01-01 00:00"],
     ["0 0 * * 1",       "2011-08-01 00:00",  "2011-08-08 00:00"],
     ["0 0 * * 1",       "2011-07-25 00:00",  "2011-08-01 00:00"],
     ["45 23 7 3 *",     "2011-01-01 00:00",  "2011-03-07 23:45"],
+    ["0 0 1 jun *",     "2013-05-14 11:20",  "2013-06-01 00:00"],
+    ["0 0 1 may,jul *", "2013-05-14 15:00",  "2013-07-01 00:00"],
+    ["0 0 1 MAY,JUL *", "2013-05-14 15:00",  "2013-07-01 00:00"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
       now = parse_date(now)
@@ -69,7 +73,11 @@ describe "CronParser#last" do
     ["0 9 * * *",       "2012-01-01 00:15",  "2011-12-31 09:00"],
     ["* * 12 * *",      "2010-04-15 10:15",  "2010-04-12 23:59"],
     ["* * * * 1,3",     "2010-04-15 10:15",  "2010-04-14 23:59"],
+    ["* * * * MON,WED", "2010-04-15 10:15",  "2010-04-14 23:59"],
     ["0 0 1 1 *",       "2010-04-15 10:15",  "2010-01-01 00:00"],
+    ["0 0 1 jun *",     "2013-05-14 11:20",  "2012-06-01 00:00"],
+    ["0 0 1 may,jul *", "2013-05-14 15:00",  "2013-05-01 00:00"],
+    ["0 0 1 MAY,JUL *", "2013-05-14 15:00",  "2013-05-01 00:00"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
       now = parse_date(now)
@@ -82,6 +90,16 @@ describe "CronParser#last" do
   end
 end
 
+describe "CronParser#new" do
+  it 'should not raise error when given a valid cronline' do
+    expect { CronParser.new('30 * * * *') }.not_to raise_error
+  end
+
+  it 'should raise error when given an invalid cronline' do
+    expect { CronParser.new('* * * *') }.to raise_error('not a valid cronline')
+  end
+end
+
 describe "time source" do
   it "should use an alternate specified time source" do
     ExtendedTime = Class.new(Time)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -36,8 +36,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
-- README
+- License
+- README.md
 - Rakefile
 - lib/cron_parser.rb
 - lib/parse-cron.rb
@@ -69,6 +71,4 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Parses cron expressions and calculates the next occurence
-test_files:
-- spec/cron_parser_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/README

@@ -1,5 +0,0 @@
-# parse-cron - parse crontab syntax & determine next scheduled run
-
-The goal of this gem is to parse a crontab timing specification and determine when the
-job should be run. It is not a scheduler, it does not run the jobs.
-