whenever 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.7.2 / December 23rd, 2011
+
+* Accept @reboot and friends as raw cron syntax. [Felix Buenemann]
+
+* Fix clear_crontab task so it will work both standalone and during deploy. [Justin Giancola]
+
+
 ### 0.7.1 / December 19th, 2011
 
 * Require thread before active_support for compatibility with Rails < 2.3.11 and RubyGems >= 1.6.0. [Micah Geisel]

data/lib/whenever/capistrano.rb

@@ -58,7 +58,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     DESC
     task :clear_crontab do
       options = fetch(:whenever_options)
-      run "cd #{fetch :current_path} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options if find_servers(options).any?
+      run "cd #{fetch :latest_release} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options if find_servers(options).any?
     end
   end
 end

data/lib/whenever/cron.rb

@@ -3,7 +3,8 @@ require 'chronic'
 module Whenever
   module Output
     class Cron
-      REGEX = /^.+ .+ .+ .+ .+.?$/
+      KEYWORDS = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly]
+      REGEX = /^(@(#{KEYWORDS.join '|'})|.+ .+ .+ .+ .+.?)$/
 
       attr_accessor :time, :task
 
@@ -52,25 +53,18 @@ module Whenever
 
     protected
       def day_given?
-        months = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"]
+        months = %w(jan feb mar apr may jun jul aug sep oct nov dec)
         @at_given.is_a?(String) && months.any? { |m| @at_given.downcase.index(m) }
       end
 
       def parse_symbol
         shortcut = case @time
-          when :reboot   then '@reboot'
+          when *KEYWORDS then "@#{@time}" # :reboot => '@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.is_a?(Numeric)

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/test/unit/cron_test.rb

@@ -184,7 +184,7 @@ class CronTest < Test::Unit::TestCase
     should "parse a :symbol into the correct shortcut" do
       assert_equal '@reboot',   parse_time(:reboot)
       assert_equal '@annually', parse_time(:annually)
-      assert_equal '@annually', parse_time(:yearly)
+      assert_equal '@yearly',   parse_time(:yearly)
       assert_equal '@daily',    parse_time(:daily)
       assert_equal '@midnight', parse_time(:midnight)
       assert_equal '@monthly',  parse_time(:monthly)
@@ -217,7 +217,9 @@ class CronTest < Test::Unit::TestCase
 
   context "When given raw cron sytax" do
     should "return the same cron sytax" do
-      crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *']
+      crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *',
+               '@reboot', '@yearly', '@annually', '@monthly', '@weekly',
+               '@daily', '@midnight', '@hourly']
       crons.each do |cron|
         assert_equal cron, parse_time(cron)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70096166103200 !ruby/object:Gem::Requirement
+  requirement: &70249786924020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70096166103200
+  version_requirements: *70249786924020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70096166102060 !ruby/object:Gem::Requirement
+  requirement: &70249786922720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70096166102060
+  version_requirements: *70249786922720
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70096166100840 !ruby/object:Gem::Requirement
+  requirement: &70249786921560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *70096166100840
+  version_requirements: *70249786921560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70096166076460 !ruby/object:Gem::Requirement
+  requirement: &70249786898020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70096166076460
+  version_requirements: *70249786898020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70096166074280 !ruby/object:Gem::Requirement
+  requirement: &70249786895900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096166074280
+  version_requirements: *70249786895900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70096166071760 !ruby/object:Gem::Requirement
+  requirement: &70249786893560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096166071760
+  version_requirements: *70249786893560
 description: Clean ruby syntax for writing and deploying cron jobs.
 email:
 - javan@javan.us