kronparser 0.0.2 → 0.0.3

data/MIT-LICENSE

@@ -0,0 +1,8 @@
+Copyright (c) 2012 mechamogera
+https://github.com/mechamogera/kronparser
+
+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/lib/kronparser.rb

@@ -110,7 +110,7 @@ class KronParser
 
     value = nil
     next_mon, forward = next_elem(:mon, options[:mon] + 1)
-    date = Date.new(options[:year] + forward, next_mon, 1) rescue nil
+    date = Date.new(options[:year] + forward, next_mon, 1)
     next_wday = @data[:wday].find { |x| x >= date.wday }
     value = 1 + (next_wday ? (next_wday - date.wday) : (7 - date.wday + @data[:wday].first))
     
@@ -128,27 +128,20 @@ class KronParser
     if (type != :day) || (@day_type != :wday)
       next_value = @data[type].find { |x| x >= value }
       forward = next_value.nil? ? 1 : 0 
-      next_value = @data[type].first unless next_value
-    end
+      next_value = first_elem(type, options) unless next_value
 
-    if (type != :day) || (@day_type == :day)
-      return next_value, forward
+      return next_value, forward if (type != :day) || (@day_type == :day)
     end
 
-    wday_forward = nil
-    next_wday_value = value
+    wday_forward = 1
+    next_wday_value = nil
     date = Date.new(options[:year], options[:mon], value) rescue nil
     if date
       next_wday = @data[:wday].find { |x| x >= date.wday }
-      next_wday_value += next_wday ? (next_wday - date.wday) : (7 - date.wday + @data[:wday].first)
-      if next_wday_value <= 31
-        wday_forward = 0
-      else
-        next_wday_value, wday_forward = first_elem(type, options), 1
-      end
-    else
-      next_wday_value, wday_forward = first_elem(type, options), 1
+      next_wday_value = value + (next_wday ? (next_wday - date.wday) : (7 - date.wday + @data[:wday].first))
+      wday_forward = 0 if next_wday_value <= 31
     end
+    next_wday_value = first_elem(type, options) if wday_forward == 1
 
     case @day_type
     when :wday

data/lib/kronparser/version.rb

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

data/spec/kronparser_spec.rb

@@ -127,6 +127,7 @@ describe KronParser do
       ["* * 29 2 5",        :next, "2012/02/03 23:59:59", "2012/02/10 00:00:00"],
       ["* * 29 2 5",        :next, "2012/02/24 23:59:59", "2012/02/29 00:00:00"],
       ["* * 29 2 5",        :next, "2012/02/29 23:59:59", "2013/02/01 00:00:00"],
+      ["* * 29 2,5 5",      :next, "2012/02/29 23:59:59", "2012/05/04 00:00:00"],
     ]
 
     test_data.each do |cron_time_format, target_method, now_date, get_date|

metadata

@@ -1,48 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kronparser
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  segments_generated: true
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - mechamogera
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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"
+date: 2012-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id001
+  requirement: &70325128253200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70325128253200
 description: datermine next scheduled crontab run
-email: 
-- ""
+email:
+- ''
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - kronparser.gemspec
@@ -51,38 +40,30 @@ 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 
-  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"
+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: kronparser
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: datermine next scheduled crontab run
-test_files: 
+test_files:
 - spec/kronparser_spec.rb
 - spec/spec_helper.rb