kronparser 0.0.1 → 0.0.2

data/lib/kronparser.rb

@@ -10,6 +10,21 @@ class KronParser
     :mon => 1..12,
     :wday => 0..6,
   }
+
+  MONTH_LAST_DATE = {
+    1 => 31,
+    2 => 29,
+    3 => 31,
+    4 => 30,
+    5 => 31,
+    6 => 30,
+    7 => 31,
+    8 => 31,
+    9 => 30,
+    10 => 31,
+    11 => 30,
+    12 => 31
+  }
     
   def self.parse(cron_time_format)
     return KronParser.new(cron_time_format)
@@ -17,6 +32,8 @@ class KronParser
 
   def initialize(cron_time_format)
     elems = cron_time_format.split
+    raise ArgumentError.new("invalid format #{cron_time_format}") if elems.size != 5
+    
     @data = {}
     [:min, :hour, :day, :mon, :wday].each_with_index do |t, idx|
       @data[t] = parse_elem(elems[idx], TIME_RANGE[t])
@@ -29,9 +46,13 @@ class KronParser
     else
       @day_type = :each
     end
+
+    @is_time_exist = time_exist?
   end
 
   def next(time = Time.now)
+    return nil unless @is_time_exist
+
     forward = 1
     time_items = [:min, :hour, :day, :mon]
     time_data = {}
@@ -71,6 +92,17 @@ class KronParser
 
   private
 
+  def time_exist? 
+    return true if @day_type != :day
+    @data[:mon].each do |mon|
+      last_date = MONTH_LAST_DATE[mon]
+      return true if last_date == 31
+      return true if @data[:day].find { |x| x <= last_date }
+    end
+
+    return false
+  end
+
   def first_elem(type, options = {})
     if (type != :day) || (@day_type == :day)
        return @data[type].first
@@ -133,10 +165,12 @@ class KronParser
     when "*"
       return range.to_a
     when /^\d+$/
+      raise ArgumentError.new("out of range #{format}") unless range.member?(format.to_i)
       return [format.to_i]
     when /^(\d+)-(\d+)$/
       first = $1.to_i
       last = $2.to_i
+      raise ArgumentError.new("out of range #{format}") unless range.member?(first) && range.member?(last)
       if first <= last
         return ($1.to_i..$2.to_i).to_a
       else
@@ -154,6 +188,8 @@ class KronParser
       end
 
       return result
+    else
+      raise ArgumentError.new("invalid format #{format}")
     end
   end
 end

data/lib/kronparser/version.rb

@@ -1,3 +1,3 @@
 class KronParser
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/kronparser_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'time'
 
 describe KronParser do
-  it "could get next and last time" do
+  it "could get next time" do
     test_data = [
       ["1 * * * *",     :next, "2011/12/21 12:31:52", "2011/12/21 13:01:00"],
       ["* 1 * * *",     :next, "2011/12/21 12:31:52", "2011/12/22 01:00:00"],
@@ -20,6 +20,21 @@ describe KronParser do
       ["41-43 * * * *",  :next, "2011/12/21 12:41:52", "2011/12/21 12:42:00"],
       ["41-43 * * * *",  :next, "2011/12/21 12:42:52", "2011/12/21 12:43:00"],
       ["41-43 * * * *",  :next, "2011/12/21 12:43:52", "2011/12/21 13:41:00"],
+      ["30-0 * * * *",   :next, "2011/12/21 12:43:52", "2011/12/21 12:44:00"],
+      ["30-0 * * * *",   :next, "2011/12/21 12:15:52", "2011/12/21 12:30:00"],
+      ["30-0 * * * *",   :next, "2011/12/21 12:00:52", "2011/12/21 12:30:00"],
+      ["30-0 * * * *",   :next, "2011/12/21 11:59:52", "2011/12/21 12:00:00"],
+      ["30-0 * * * *",   :next, "2011/12/21 12:30:52", "2011/12/21 12:31:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:15:52", "2011/12/21 12:30:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:29:52", "2011/12/21 12:30:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:30:52", "2011/12/21 12:31:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:45:52", "2011/12/21 12:46:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:03:52", "2011/12/21 12:04:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:09:52", "2011/12/21 12:10:00"],
+      ["30-10 * * * *",  :next, "2011/12/21 12:10:52", "2011/12/21 12:30:00"],
+      ["3-3 * * * *",    :next, "2011/12/21 12:10:52", "2011/12/21 13:03:00"],
+      ["3-3 * * * *",    :next, "2011/12/21 12:03:52", "2011/12/21 13:03:00"],
+      ["3-3 * * * *",    :next, "2011/12/21 12:02:52", "2011/12/21 12:03:00"],
       ["15-30/7 * * * *",  :next, "2011/12/21 12:04:52", "2011/12/21 12:15:00"],
       ["15-30/7 * * * *",  :next, "2011/12/21 12:14:52", "2011/12/21 12:15:00"],
       ["15-30/7 * * * *",  :next, "2011/12/21 12:15:52", "2011/12/21 12:22:00"],
@@ -119,4 +134,103 @@ describe KronParser do
       result_date.should == Time.parse(get_date)
     end
   end
+
+  it "could get nil if next time is not exist" do
+    data = [
+      ["* * 31 1 *",        :next, "2012/01/31 23:59:59", "2013/01/31 00:00:00"],
+      ["* * 31 2 *",        :next, "2012/01/31 23:59:59", nil],
+      ["* * 30 2 *",        :next, "2012/01/31 23:59:59", nil],
+      ["* * 29 2 *",        :next, "2012/02/29 23:59:59", "2016/02/29 00:00:00"],
+      ["* * 28 2 *",        :next, "2012/02/29 23:59:59", "2013/02/28 00:00:00"],
+      ["* * 31 3 *",        :next, "2012/02/29 23:59:59", "2012/03/31 00:00:00"],
+      ["* * 30 4 *",        :next, "2012/02/29 23:59:59", "2012/04/30 00:00:00"],
+      ["* * 31 4 *",        :next, "2012/02/29 23:59:59", nil],
+      ["* * 31 5 *",        :next, "2012/02/29 23:59:59", "2012/05/31 00:00:00"],
+      ["* * 30 6 *",        :next, "2012/02/29 23:59:59", "2012/06/30 00:00:00"],
+      ["* * 31 6 *",        :next, "2012/02/29 23:59:59", nil],
+      ["* * 31 7 *",        :next, "2012/02/29 23:59:59", "2012/07/31 00:00:00"],
+      ["* * 31 8 *",        :next, "2012/02/29 23:59:59", "2012/08/31 00:00:00"],
+      ["* * 30 9 *",        :next, "2012/02/29 23:59:59", "2012/09/30 00:00:00"],
+      ["* * 31 9 *",        :next, "2012/02/29 23:59:59", nil],
+      ["* * 31 10 *",       :next, "2012/02/29 23:59:59", "2012/10/31 00:00:00"],
+      ["* * 30 11 *",       :next, "2012/02/29 23:59:59", "2012/11/30 00:00:00"],
+      ["* * 31 11 *",       :next, "2012/02/29 23:59:59", nil],
+      ["* * 31 12 *",       :next, "2012/02/29 23:59:59", "2012/12/31 00:00:00"],
+      ["* * 31 2,4,6,9,11 *",       :next, "2012/02/29 23:59:59", nil],
+      ["* * 31 1,2,4,6,9,11 *",     :next, "2012/02/29 23:59:59", "2013/01/31 00:00:00"],
+      ["* * 31 2-3 *",              :next, "2012/02/29 23:59:59", "2012/03/31 00:00:00"],
+    ]
+
+    data.each do |cron_time_format, target_method, now_date, get_date|
+      result_date = KronParser.parse(cron_time_format).send(target_method, Time.parse(now_date))
+      result_date.should == (get_date ? Time.parse(get_date) : nil)
+    end
+  end
+
+  it "should raise ArgmentError when value is out of range" do
+    data = [
+      ["-1 * * * *",  false],
+      ["0 * * * *",   true],
+      ["59 * * * *",  true],
+      ["60 * * * *",  false],
+      ["* -1 * * *",  false],
+      ["* 0 * * *",   true],
+      ["* 23 * * *",  true],
+      ["* 24 * * *",  false],
+      ["* * 0 * *",   false],
+      ["* * 1 * *",   true],
+      ["* * 31 * *",  true],
+      ["* * 32 * *",  false],
+      ["* * * 0 *",   false],
+      ["* * * 1 *",   true],
+      ["* * * 12 *",  true],
+      ["* * * 13 *",  false],
+      ["* * * * 0",   true],
+      ["* * * * 6",   true],
+      ["* * * * 7",   false],
+      ["9-60 * * * *",  false],
+      ["9-23 * * * *",  true],
+      ["-1-23 * * * *", false],
+      ["* 22-24 * * *", false],
+      ["* 22-23 * * *", true],
+      ["* -1-23 * * *", false],
+      ["* * 0-15 * *",  false],
+      ["* * 1-12 * *",  true],
+      ["* * 16-32 * *", false],
+      ["* * 16-30 * *", true],
+      ["* * * 0-5 *",   false],
+      ["* * * 2-5 *",   true],
+      ["* * * 5-13 *",  false],
+      ["* * * 5-11 *",  true],
+      ["* * * * 4-7",   false],
+      ["* * * * 4-4",   true],
+    ]
+
+    data.each do |time, is_range|
+      s = is_range ? :should_not : :should
+      lambda { KronParser.parse(time) }.send(s, raise_error(ArgumentError))
+    end
+  end
+
+  it "should raise ArgmentError by invalid format" do
+    data = [
+      ["a * * * *",       false],
+      ["1-5/* * * * *",   false],
+      ["*/* * * * *",     false],
+      ["*/a * * * *",     false],
+      ["1-a * * * *",     false],
+      ["a-1 * * * *",     false],
+      ["3+5 * * * *",     false],
+      ["* * * * * *",     false],
+      ["* * * *",         false],
+      ["* * *",           false],
+      ["* *",             false],
+      ["*",               false],
+    ]
+
+    data.each do |time, is_range|
+      s = is_range ? :should_not : :should
+      lambda { KronParser.parse(time) }.send(s, raise_error(ArgumentError))
+    end
+  end
 end

metadata

@@ -1,34 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kronparser
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  segments_generated: true
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - mechamogera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2160350020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-10-27 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  name: rspec
+  requirement: *id001
   prerelease: false
-  version_requirements: *2160350020
 description: datermine next scheduled crontab run
-email:
-- ''
+email: 
+- ""
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -39,30 +51,38 @@ files:
 - lib/kronparser/version.rb
 - spec/kronparser_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/mechamogera/kronparser
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      segments_generated: true
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      segments_generated: true
+      version: "0"
 requirements: []
+
 rubyforge_project: kronparser
-rubygems_version: 1.8.17
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: datermine next scheduled crontab run
-test_files:
+test_files: 
 - spec/kronparser_spec.rb
 - spec/spec_helper.rb