javan-whenever 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,7 +1,15 @@
+== 0.3.1 / June 25th, 2009
+
+* Removed activesupport gem dependency. #1 [Javan Makhmali]
+
+* Switched to numeric days of the week for Solaris support (and probably others). #8 [Roger Ertesvåg]
+
+
 == 0.3.0 / June 2nd, 2009
 
 * Added ability to set variables on the fly from the command line (ex: whenever --set environment=staging). [Javan Makhmali]
 
+
 == 0.2.2 / April 30th, 2009
 
 * Days of week jobs can now accept an :at directive (ex: every :monday, :at => '5pm'). [David Eisinger]

data/README.rdoc

@@ -2,6 +2,10 @@
 
 Whenever is a Ruby gem that provides a clear syntax for defining cron jobs. It outputs valid cron syntax and can even write your crontab file for you. It is designed to work well with Rails applications and can be deployed with Capistrano. Whenever works fine independently as well.
 
+Ryan Bates created a great Railscast about Whenever: http://railscasts.com/episodes/164-cron-in-ruby
+
+Discussion: http://groups.google.com/group/whenever-gem
+
 == Installation
 
 Regular (non-Rails) install:
@@ -89,15 +93,19 @@ If you wish to simply overwrite your crontab file each time you deploy, use the
 
 By mixing and matching the <code>--load-file</code> and <code>--user</code> options with your various :roles in Capistrano it is entirely possible to deploy different crontab schedules under different users to all your various servers. Get creative!
 
+If you want to override a variable (like your environment) at the time of deployment you can do so with the <code>--set</code> option: http://wiki.github.com/javan/whenever/setting-variables-on-the-fly
+
 == Credit
 
 Whenever was created for use at Inkling (http://inklingmarkets.com) where I work. Their take on it: http://blog.inklingmarkets.com/2009/02/whenever-easy-way-to-do-cron-jobs-from.html
 
 While building Whenever, I learned a lot by digging through the source code of Capistrano - http://github.com/jamis/capistrano
 
-== Feedback
+== Discussion / Feedback / Issues / Bugs
+
+For general discussion and questions, please use the google group: http://groups.google.com/group/whenever-gem
 
-Email me: javan [at] javan (dot) us
+If you've found a genuine bug or issue, please use the Issues section on github: http://github.com/javan/whenever/issues
 
 == License
 

data/Rakefile

@@ -9,5 +9,5 @@ Echoe.new('whenever', Whenever::VERSION::STRING) do |p|
   p.url            = "http://github.com/javan/whenever"
   p.author         = "Javan Makhmali"
   p.email          = "javan@javan.us"
-  p.dependencies   = ["chronic >=0.2.3", "activesupport >=1.3.0"]
+  p.dependencies   = ["chronic >=0.2.3"]
 end

data/lib/outputs/cron.rb

@@ -85,11 +85,11 @@ module Whenever
         timing[0] = @at.is_a?(Time) ? @at.min  : 0
         timing[1] = @at.is_a?(Time) ? @at.hour : 0
 
-        return (timing << 'mon-fri') * " " if string.downcase.index('weekday')
-        return (timing << 'sat,sun') * " " if string.downcase.index('weekend')
+        return (timing << '1-5') * " " if string.downcase.index('weekday')
+        return (timing << '6,0') * " " if string.downcase.index('weekend')
 
-        %w(sun mon tue wed thu fri sat).each do |day|
-          return (timing << day) * " " if string.downcase.index(day)
+        %w(sun mon tue wed thu fri sat).each_with_index do |day, i|
+          return (timing << i) * " " if string.downcase.index(day)
         end
 
         raise ArgumentError, "Couldn't parse: #{@time}"

data/lib/version.rb

@@ -2,7 +2,7 @@ module Whenever
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/whenever.rb

@@ -9,10 +9,20 @@ unless defined?(Whenever)
   end
 end
 
-# Dependencies
-require 'activesupport'
 require 'chronic'
 
+# If Rails' rakefile was loaded than so was activesupport, but
+# if this is being used in a non-rails enviroment we need to require it.
+# It was previously defined as a dependency of this gem, but that became
+# problematic. See: http://github.com/javan/whenever/issues#issue/1
+begin
+  require 'activesupport'
+rescue LoadError => e
+  warn 'To user Whenever you need the activesupport gem:'
+  warn '$ sudo gem install activesupport'
+  exit(1)
+end
+
 # Whenever files
 %w{ 
 base 

data/test/cron_test.rb

@@ -136,13 +136,13 @@ class CronTest < Test::Unit::TestCase
   context "When parsing time in days (of week)" do
     should "parse days of the week correctly" do
       {
-        'sun' => %w(sun Sunday SUNDAY SUN),
-        'mon' => %w(mon Monday MONDAY MON),
-        'tue' => %w(tue tues Tuesday TUESDAY TUE),
-        'wed' => %w(wed Wednesday WEDNESDAY WED),
-        'thu' => %w(thu thurs thur Thursday THURSDAY THU),
-        'fri' => %w(fri Friday FRIDAY FRI),
-        'sat' => %w(sat Saturday SATURDAY SAT)
+        '0' => %w(sun Sunday SUNDAY SUN),
+        '1' => %w(mon Monday MONDAY MON),
+        '2' => %w(tue tues Tuesday TUESDAY TUE),
+        '3' => %w(wed Wednesday WEDNESDAY WED),
+        '4' => %w(thu thurs thur Thursday THURSDAY THU),
+        '5' => %w(fri Friday FRIDAY FRI),
+        '6' => %w(sat Saturday SATURDAY SAT)
       }.each do |day, day_tests|
         day_tests.each do |day_test|
           assert_equal "0 0 * * #{day}", parse_time(day_test)
@@ -151,23 +151,23 @@ class CronTest < Test::Unit::TestCase
     end
 
     should "allow additional directives" do
-      assert_equal '30 13 * * fri', parse_time('friday', nil, "1:30 pm")
-      assert_equal '22 2 * * mon', parse_time('Monday', nil, "2:22am")
-      assert_equal '55 17 * * thu', parse_time('THU', nil, "5:55PM")
+      assert_equal '30 13 * * 5', parse_time('friday', nil, "1:30 pm")
+      assert_equal '22 2 * * 1', parse_time('Monday', nil, "2:22am")
+      assert_equal '55 17 * * 4', parse_time('THU', nil, "5:55PM")
     end
 
     should "parse weekday correctly" do
-      assert_equal '0 0 * * mon-fri', parse_time('weekday')
-      assert_equal '0 0 * * mon-fri', parse_time('Weekdays')
-      assert_equal '0 1 * * mon-fri', parse_time('Weekdays', nil, "1:00 am")
-      assert_equal '59 5 * * mon-fri', parse_time('Weekdays', nil, "5:59 am")
+      assert_equal '0 0 * * 1-5', parse_time('weekday')
+      assert_equal '0 0 * * 1-5', parse_time('Weekdays')
+      assert_equal '0 1 * * 1-5', parse_time('Weekdays', nil, "1:00 am")
+      assert_equal '59 5 * * 1-5', parse_time('Weekdays', nil, "5:59 am")
     end
 
     should "parse weekend correctly" do
-      assert_equal '0 0 * * sat,sun', parse_time('weekend')
-      assert_equal '0 0 * * sat,sun', parse_time('Weekends')
-      assert_equal '0 7 * * sat,sun', parse_time('Weekends', nil, "7am")
-      assert_equal '2 18 * * sat,sun', parse_time('Weekends', nil, "6:02PM")
+      assert_equal '0 0 * * 6,0', parse_time('weekend')
+      assert_equal '0 0 * * 6,0', parse_time('Weekends')
+      assert_equal '0 7 * * 6,0', parse_time('Weekends', nil, "7am")
+      assert_equal '2 18 * * 6,0', parse_time('Weekends', nil, "6:02PM")
     end
   end
   

data/whenever.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]
-  s.date = %q{2009-06-02}
+  s.date = %q{2009-06-25}
   s.description = %q{Provides clean ruby syntax for defining messy cron jobs and running them Whenever.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
@@ -27,13 +27,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 1.3.0"])
     else
       s.add_dependency(%q<chronic>, [">= 0.2.3"])
-      s.add_dependency(%q<activesupport>, [">= 1.3.0"])
     end
   else
     s.add_dependency(%q<chronic>, [">= 0.2.3"])
-    s.add_dependency(%q<activesupport>, [">= 1.3.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: javan-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
 description: Provides clean ruby syntax for defining messy cron jobs and running them Whenever.
 email: javan@javan.us
 executables: