parse-cron 0.1.1 → 0.1.2

data/lib/cron_parser.rb

@@ -1,3 +1,4 @@
+require 'set'
 #
 # Parses cron expressions and computes the next occurence of the "job"
 #
@@ -5,17 +6,20 @@ class CronParser
   # internal "mutable" time representation
   class InternalTime
     attr_accessor :year, :month, :day, :hour, :min
+    attr_accessor :time_source
 
-    def initialize(time)
+    def initialize(time,time_source = Time)
       @year = time.year
       @month = time.month
       @day = time.day
       @hour = time.hour
       @min = time.min
+
+      @time_source = time_source
     end
 
     def to_time
-      Time.local(@year, @month, @day, @hour, @min, 0)
+      time_source.local(@year, @month, @day, @hour, @min, 0)
     end
 
     def inspect
@@ -46,21 +50,22 @@ class CronParser
      "sat" => "6"
   }
 
-  def initialize(source)
+  def initialize(source,time_source = Time)
     @source = source
+    @time_source = time_source
   end
 
 
   # returns the next occurence after the given date
-  def next(now = Time.now)
-    t = InternalTime.new(now)
+  def next(now = @time_source.now)
+    t = InternalTime.new(now,@time_source)
 
     unless time_specs[:month][0].include?(t.month)
       nudge_month(t)
       t.day = 0
     end
 
-    unless t.day == 0 || interpolate_weekdays(t.year, t.month)[0].include?(t.day)
+    unless interpolate_weekdays(t.year, t.month)[0].include?(t.day)
       nudge_date(t)
       t.hour = -1
     end
@@ -76,8 +81,8 @@ class CronParser
   end
 
   # returns the last occurence before the given date
-  def last(now = Time.now)
-    t = InternalTime.new(now)
+  def last(now = @time_source.now)
+    t = InternalTime.new(now,@time_source)
 
     unless time_specs[:month][0].include?(t.month)
       nudge_month(t, :last)

data/lib/parse-cron.rb

@@ -0,0 +1,2 @@
+# More logical way to require 'cron_parser'
+require File.join(File.dirname(__FILE__), 'cron_parser')

data/lib/parse-cron/version.rb

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

data/spec/cron_parser_spec.rb

@@ -41,6 +41,7 @@ describe "CronParser#next" do
     ["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"],
   ].each do |line, now, expected_next|
     it "should return #{expected_next} for '#{line}' when now is #{now}" do
       now = parse_date(now)
@@ -80,3 +81,11 @@ describe "CronParser#last" do
     end
   end
 end
+
+describe "time source" do
+  it "should use an alternate specified time source" do
+    ExtendedTime = Class.new(Time)
+    ExtendedTime.should_receive(:local).once
+    CronParser.new("* * * * *",ExtendedTime).next
+  end
+end

metadata

@@ -1,93 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: parse-cron
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Michael Siebert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 description: Parses cron expressions and calculates the next occurence
-email: 
+email:
 - siebertm85@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
 - README
 - Rakefile
 - lib/cron_parser.rb
+- lib/parse-cron.rb
 - lib/parse-cron/version.rb
 - parse-cron.gemspec
 - spec/cron_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/siebertm/parse-cron
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: parse-cron
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Parses cron expressions and calculates the next occurence
-test_files: 
+test_files:
 - spec/cron_parser_spec.rb
 - spec/spec_helper.rb