jlw-whenever 0.3.1.1 → 0.3.1.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.1.2 / June 19, 2009
+
+* Limited */5 syntax to minutes and hours. [Jeremy Weathers]
+* Updated tests to pass with my changes. [Jeremy Weathers]
+
 == 0.3.1 / June 19, 2009
 
 * Added --silent flag to rake tasks so cron output emails aren't generated if the task doesn't have any output. [Jeremy Weathers]

data/lib/outputs/cron.rb

@@ -100,7 +100,7 @@ module Whenever
         return '*'       if frequency == 1
         return frequency if frequency > (max * 0.5).ceil
 
-        return "*/#{frequency}" if 0 == (0 == start ? max + 1 : max) % frequency
+        return "*/#{frequency}" if 0 == start && 0 == (max + 1) % frequency # only for hours & minutes
 
         original_start = start
 

data/test/cron_test.rb

@@ -16,9 +16,9 @@ class CronTest < Test::Unit::TestCase
     # For santity, do some tests on straight String
     should "parse correctly" do
       assert_equal '* * * * *', parse_time(1.minute)
-      assert_equal '0,5,10,15,20,25,30,35,40,45,50,55 * * * *', parse_time(5.minutes)
+      assert_equal '*/5 * * * *', parse_time(5.minutes)
       assert_equal '7,14,21,28,35,42,49,56 * * * *', parse_time(7.minutes)
-      assert_equal '0,30 * * * *', parse_time(30.minutes)
+      assert_equal '*/30 * * * *', parse_time(30.minutes)
       assert_equal '32 * * * *', parse_time(32.minutes)
       assert_not_equal '60 * * * *', parse_time(60.minutes) # 60 minutes bumps up into the hour range
     end
@@ -30,7 +30,9 @@ class CronTest < Test::Unit::TestCase
         start += num unless 60.modulo(num).zero?
         minutes = (start..59).step(num).to_a
 
-        assert_equal "#{minutes.join(',')} * * * *", parse_time(num.minutes)
+        expected = [2,3,4,5,6,10,12,15,20,30].include?(num) ? "*/#{num} * * * *" : "#{minutes.join(',')} * * * *"
+
+        assert_equal expected, parse_time(num.minutes)
       end
     end
   end
@@ -38,8 +40,8 @@ class CronTest < Test::Unit::TestCase
   context "When parsing time in hours" do
     should "parse correctly" do
       assert_equal '0 * * * *', parse_time(1.hour)
-      assert_equal '0 0,2,4,6,8,10,12,14,16,18,20,22 * * *', parse_time(2.hours)
-      assert_equal '0 0,3,6,9,12,15,18,21 * * *', parse_time(3.hours)
+      assert_equal '0 */2 * * *', parse_time(2.hours)
+      assert_equal '0 */3 * * *', parse_time(3.hours)
       assert_equal '0 5,10,15,20 * * *', parse_time(5.hours)
       assert_equal '0 17 * * *', parse_time(17.hours)
       assert_not_equal '0 24 * * *', parse_time(24.hours) # 24 hours bumps up into the day range
@@ -51,7 +53,9 @@ class CronTest < Test::Unit::TestCase
         start += num unless 24.modulo(num).zero?
         hours = (start..23).step(num).to_a
 
-        assert_equal "0 #{hours.join(',')} * * *", parse_time(num.hours)
+        expected = [2,3,4,6,8,12].include?(num) ? "0 */#{num} * * *" : "0 #{hours.join(',')} * * *"
+
+        assert_equal expected, parse_time(num.hours)
       end
     end
 

data/test/output_rake_test.rb

@@ -17,7 +17,7 @@ class OutputRakeTest < Test::Unit::TestCase
     end
     
     should "output the rake command using that path" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=production /usr/bin/env rake --silent blahblah', @output
     end
   end
   
@@ -33,7 +33,7 @@ class OutputRakeTest < Test::Unit::TestCase
     end
     
     should "output the rake command using that path" do
-      assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
+      assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production /usr/bin/env rake --silent blahblah', @output
     end
   end
   
@@ -50,7 +50,7 @@ class OutputRakeTest < Test::Unit::TestCase
     end
     
     should "output the rake command using that environment" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=silly /usr/bin/env rake blahblah', @output
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=silly /usr/bin/env rake --silent blahblah', @output
     end
   end
   
@@ -67,7 +67,7 @@ class OutputRakeTest < Test::Unit::TestCase
     end
     
     should "output the rake command using that environment" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=serious /usr/bin/env rake blahblah', @output
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=serious /usr/bin/env rake --silent blahblah', @output
     end
   end
   

data/test/test_helper.rb

@@ -23,7 +23,7 @@ end
 module TestExtensions
   
   def two_hours
-    "0 0,2,4,6,8,10,12,14,16,18,20,22 * * *"
+    "0 */2 * * *"
   end
   
 end

data/whenever.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.3.1.1"
+  s.version = "0.3.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jlw-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.1
+  version: 0.3.1.2
 platform: ruby
 authors: 
 - Javan Makhmali