whenever 0.6.7 → 0.6.8

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.6.8 / May 24th, 2011
+
+* Convert most shortcuts to seconds. every :day -> every 1.day. #129 [Javan Makhmali]
+
+* Allow commas in raw cron syntax. #130 [Marco Bergantin, Javan Makhmali]
+
+* Output no update message as comments. #135 [Javan Makhmali]
+
+* require 'thread' to support Rubygems >= 1.6.0. #132 [Javan Makhmali]
+
+
 ### 0.6.7 / March 23rd, 2011
 
 * Fix issue with comment block being corrupted during subsequent insertion of duplicate entries to the crontab. #123 [Jeremy (@lingmann)]

data/README.md

@@ -95,6 +95,13 @@ For example, if you're using bundler do this:
     set :whenever_command, "bundle exec whenever"
     require "whenever/capistrano"
 
+If you are using different environments (such as staging, production), then you may want to do this:
+
+    set :whenever_environment, defer { stage }
+    require "whenever/capistrano"
+
+The capistrano variable `:stage` should be the one holding your environment name. This will make the correct `:environment` available in your schedule.rb.
+
 ### The `whenever` command
 
     $ cd /my/rails/app

data/lib/whenever.rb

@@ -1,5 +1,6 @@
 require 'chronic'
 require 'active_support/all'
+require 'thread'
 
 require 'whenever/job_list'
 require 'whenever/job'

data/lib/whenever/command_line.rb

@@ -39,8 +39,8 @@ module Whenever
         write_crontab(whenever_cron)
       else
         puts Whenever.cron(@options)
-        puts "[message] Above is your schedule file converted to cron syntax; your crontab file was not updated."
-        puts "[message] Run `whenever --help' for more options."
+        puts "## [message] Above is your schedule file converted to cron syntax; your crontab file was not updated."
+        puts "## [message] Run `whenever --help' for more options."
         exit(0)
       end
     end

data/lib/whenever/cron.rb

@@ -1,6 +1,7 @@
 module Whenever
   module Output
     class Cron
+      REGEX = /^.+ .+ .+ .+ .+.?$/
 
       attr_accessor :time, :task
 
@@ -10,9 +11,14 @@ module Whenever
         @at   = at.is_a?(String) ? (Chronic.parse(at) || 0) : (at || 0)
       end
 
-      def self.enumerate(item)
+      def self.enumerate(item, detect_cron = true)
         if item and item.is_a?(String)
-          items = item.split(',')
+          items = 
+            if detect_cron && item =~ REGEX
+              [item]
+            else
+              item.split(',')
+            end
         else
           items = item
           items = [items] unless items and items.respond_to?(:each)
@@ -22,7 +28,7 @@ module Whenever
 
       def self.output(times, job)
         enumerate(times).each do |time|
-          enumerate(job.at).each do |at|
+          enumerate(job.at, false).each do |at|
             yield new(time, job.output, at).output
           end
         end
@@ -34,7 +40,7 @@ module Whenever
 
       def time_in_cron_syntax
         case @time
-          when /^.+ .+ .+ .+ .+.?$/ then @time # raw cron sytax given
+          when REGEX  then @time # raw cron sytax given
           when Symbol then parse_symbol
           when String then parse_as_string
           else parse_time
@@ -45,16 +51,25 @@ module Whenever
 
       def parse_symbol
         shortcut = case @time
-          when :reboot          then '@reboot'
-          when :year, :yearly   then '@annually'
-          when :day, :daily     then '@daily'
-          when :midnight        then '@midnight'
-          when :month, :monthly then '@monthly'
-          when :week, :weekly   then '@weekly'
-          when :hour, :hourly   then '@hourly'
+          when :reboot   then '@reboot'
+          when :year     then 12.months
+          when :yearly, 
+               :annually then '@annually'
+          when :day      then 1.day
+          when :daily    then '@daily'
+          when :midnight then '@midnight'
+          when :month    then 1.month
+          when :monthly  then '@monthly'
+          when :week     then 1.week
+          when :weekly   then '@weekly'
+          when :hour     then 1.hour
+          when :hourly   then '@hourly'
         end
         
-        if shortcut
+        if shortcut.is_a?(Numeric)
+          @time = shortcut
+          parse_time
+        elsif shortcut
           if @at.is_a?(Time) || (@at.is_a?(Numeric) && @at > 0)
             raise ArgumentError, "You cannot specify an ':at' when using the shortcuts for times."
           else

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.6.7' 
+  VERSION = '0.6.8' 
 end

data/test/functional/output_at_test.rb

@@ -166,7 +166,7 @@ class OutputAtTest < Test::Unit::TestCase
       <<-file
         set :job_template, nil
         set :path, '/your/path'
-        every :day do
+        every :daily do
           rake "blah:blah"
           runner "runner_1"
           command "command_1"
@@ -254,14 +254,14 @@ class OutputAtTest < Test::Unit::TestCase
       @output = Whenever.cron \
       <<-file
         set :job_template, nil
-        every '0 0 27-31 * *' do
+        every '0 0 27,31 * *' do
           command "blahblah"
         end
       file
     end
     
     should "output the command using the same cron syntax" do
-      assert_match '0 0 27-31 * * blahblah', @output
+      assert_match '0 0 27,31 * * blahblah', @output
     end
   end
   

data/test/unit/cron_test.rb

@@ -174,20 +174,26 @@ class CronTest < Test::Unit::TestCase
   context "When parsing time using the cron shortcuts" do
     should "parse a :symbol into the correct shortcut" do
       assert_equal '@reboot',   parse_time(:reboot)
-      assert_equal '@annually', parse_time(:year)
+      assert_equal '@annually', parse_time(:annually)
       assert_equal '@annually', parse_time(:yearly)
-      assert_equal '@daily',    parse_time(:day)
       assert_equal '@daily',    parse_time(:daily)
       assert_equal '@midnight', parse_time(:midnight)
-      assert_equal '@monthly',  parse_time(:month)
       assert_equal '@monthly',  parse_time(:monthly)
-      assert_equal '@hourly',   parse_time(:hour)
+      assert_equal '@weekly',   parse_time(:weekly)
       assert_equal '@hourly',   parse_time(:hourly)
     end
     
+    should "convert time-based shortcuts to times" do
+      assert_equal '0 0 1 * *',  parse_time(:month)
+      assert_equal '0 0 * * *',  parse_time(:day)
+      assert_equal '0 * * * *',  parse_time(:hour)
+      assert_equal '0 0 1 12 *', parse_time(:year)
+      assert_equal '0 0 1,8,15,22 * *', parse_time(:week)
+    end
+    
     should "raise an exception if a valid shortcut is given but also an :at" do
       assert_raises ArgumentError do
-        parse_time(:hour, nil, "1:00 am")
+        parse_time(:hourly, nil, "1:00 am")
       end
       
       assert_raises ArgumentError do
@@ -195,7 +201,7 @@ class CronTest < Test::Unit::TestCase
       end
       
       assert_raises ArgumentError do
-        parse_time(:day, nil, '4:20pm')
+        parse_time(:daily, nil, '4:20pm')
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whenever
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency