moneypools-whenever 0.4.0 → 0.4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.4.1 / November 30th, 2009
+
+* exit(0) instead of just exit to make JRuby happy. [Elan Meng]
+
+* Fixed activesupport deprecation warning by requiring active_support. #37 [Andrew Nesbitt]
+
+
 == 0.4.0 / October 20th, 2009
 
 * New output option replaces the old cron_log option for output redirection and is much more flexible. #31 [Peer Allan]

data/Rakefile

@@ -29,4 +29,4 @@ end
 
 task :test => :check_dependencies
 
-task :default => :test
+task :default => :test

data/bin/whenever

@@ -10,7 +10,7 @@ options = Hash.new
 
 OptionParser.new do |opts|
   opts.banner = "Usage: whenever [options]"
-  opts.on('-v', '--version') { puts "Whenever v#{Whenever::VERSION}"; exit }
+  opts.on('-v', '--version') { puts "Whenever v#{Whenever::VERSION}"; exit(0) }
   opts.on('-w', '--write-crontab') { options[:write] = true }
   opts.on('-i', '--update-crontab [identifier]', 'Default: full path to schedule.rb file') do |identifier|
     options[:update] = true

data/lib/whenever/command_line.rb

@@ -29,7 +29,7 @@ module Whenever
         write_crontab(whenever_cron)
       else
         puts Whenever.cron(@options)
-        exit
+        exit(0)
       end
     end
     
@@ -67,7 +67,7 @@ module Whenever
         action = 'written' if @options[:write]
         action = 'updated' if @options[:update]
         puts "[write] crontab file #{action}"
-        exit
+        exit(0)
       else
         warn "[fail] Couldn't write crontab; try running `whenever' with no options to ensure your schedule file is valid."
         exit(1)

data/lib/whenever/job_sequence.rb

@@ -1,24 +1,30 @@
 module Whenever
   class JobSequence < Array
-    attr_writer :dependent, :on_failure
+    attr_writer :dependent
     
     def initialize(options={}, size=0, obj=nil)
       super(size, obj)
       
       @options = options
       @dependent = options.fetch(:dependent, true)
-      @on_failure = options[:on_failure]
     end
     
     def to_single_job
+      options = @options.dup
+      default_redirection = options.delete(:output)
+      
       concatenation = @dependent ? " && " : "; "
-      task = map(&:output).join(concatenation)
-
-      if @dependent && @on_failure && @on_failure != ''
-        task = "(#{task}) || #{@on_failure}"
+      tasks_with_redirection = map do |t|
+        if redirection = t.output_redirection.nil? || t.output_redirection == :not_set ? default_redirection : t.output_redirection
+          t.output + " " + Output::Cron::OutputRedirection.new(redirection).to_s
+        else
+          t.output
+        end
       end
+      
+      single_task = tasks_with_redirection.join(concatenation)
 
-      Job::Default.new(@options.merge(:task => task))
+      Job::Default.new(options.merge(:task => single_task))
     end
   end
-end
+end

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.4.0' 
+  VERSION = '0.4.1' 
 end unless defined?(Whenever::VERSION)

data/lib/whenever.rb

@@ -7,15 +7,15 @@ rescue LoadError
   nil
 end
 
-# If Rails' rakefile was loaded than so was activesupport, but
+# If Rails' rakefile was loaded than so was active_support, 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'
+  require 'active_support'
 rescue LoadError
-  warn 'To user Whenever you need the activesupport gem:'
-  warn '$ sudo gem install activesupport'
+  warn 'To user Whenever you need the active_support gem:'
+  warn '$ sudo gem install active_support'
   exit(1)
 end
 

data/test/in_sequence_test.rb

@@ -19,40 +19,63 @@ class InSequenceTest < Test::Unit::TestCase
     end
   end
   
-  context "A pair of tasks in the same time block that should be executed in a dependent sequence" do
+  context "A pair of tasks in a sequence with output redirection" do
     setup do
       @output = Whenever.cron \
       <<-file
         set :path, '/my/path'
-        every 2.hours do
+        every 1.day, :at => "20:15" do
           in_sequence do
-            cap "first_task"
-            rake "second_task"
+            rake "first_task", :output => 'logfile1'
+            rake "second_task", :output => 'logfile2'
           end
         end
       file
     end
     
-    should "output the pair of tasks using &&" do
-      assert_match 'cd /my/path && RAILS_ENV=production /usr/bin/env cap first_task && cd /my/path && RAILS_ENV=production /usr/bin/env rake second_task', @output
+    should "produce a set of tasks using individual output options" do
+      assert_match 'rake first_task >> logfile1', @output
+      assert_match 'rake second_task >> logfile2', @output
+    end
+  end
+
+  context "A pair of tasks in a sequence with two levels of output redirection" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :path, '/my/path'
+        every 1.day, :at => "20:15" do
+          in_sequence :output => 'fallthrough' do
+            rake "first_task"
+            rake "second_task", :output => 'logfile2'
+          end
+        end
+      file
+    end
+    
+    should "use the sequence level redirection as a default" do
+      assert_match 'rake first_task >> fallthrough', @output
+      assert_match 'rake second_task >> logfile2', @output
     end
   end
+
   
-  context "A pair of dependent sequential tasks with a failure command" do
+  context "A pair of tasks in the same time block that should be executed in a dependent sequence" do
     setup do
       @output = Whenever.cron \
       <<-file
         set :path, '/my/path'
-        every 1.day, :on_failure => "my_failure_command" do
+        every 2.hours do
           in_sequence do
-            rake "only_task"
+            cap "first_task"
+            rake "second_task"
           end
         end
       file
     end
     
-    should "produce pair of tasks using && with a command that runs if they fail" do
-      assert_match '(cd /my/path && RAILS_ENV=production /usr/bin/env rake only_task) || my_failure_command', @output
+    should "output the pair of tasks using &&" do
+      assert_match 'cd /my/path && RAILS_ENV=production /usr/bin/env cap first_task && cd /my/path && RAILS_ENV=production /usr/bin/env rake second_task', @output
     end
   end
   

data/test/job_sequence_test.rb

@@ -20,14 +20,6 @@ class JobSequenceTest < Test::Unit::TestCase
     
         assert_equal sequence.to_single_job.output, "first_task && second_task"
       end
-      
-      should "wrap sequence and fire failure command conditionally" do
-        sequence = Whenever::JobSequence.new(:on_failure => "failure_command")
-        sequence << Whenever::Job::Default.new(:task => "first_task", :path => @path)
-        sequence << Whenever::Job::Default.new(:task => "second_task", :path => @path)
-    
-        assert_equal sequence.to_single_job.output, "(first_task && second_task) || failure_command"
-      end
     end
     
     context "with independent sequences" do
@@ -38,14 +30,6 @@ class JobSequenceTest < Test::Unit::TestCase
     
         assert_equal sequence.to_single_job.output, "first_task; second_task"
       end
-      
-      should "not wrap sequence since it is not meaningful" do
-        sequence = Whenever::JobSequence.new(:dependent => false, :on_failure => "failure_command")
-        sequence << Whenever::Job::Default.new(:task => "first_task", :path => @path)
-        sequence << Whenever::Job::Default.new(:task => "second_task", :path => @path)
-    
-        assert_equal sequence.to_single_job.output, "first_task; second_task"
-      end
     end
   end
 end

data/test/output_at_test.rb

@@ -113,14 +113,12 @@ class OutputAtTest < Test::Unit::TestCase
   
   context "A command every 1.month at very diverse times" do
     setup do
-      Timecop.freeze(Date.new(2009, 1, 1)) do
-        @output = Whenever.cron \
-        <<-file
-          every [1.month, 1.day], :at => 'beginning of the month at 5:02am, june 17th at 2:22pm, june 3rd at 3:33am' do
-            command "blahblah"
-          end
-        file
-      end
+      @output = Whenever.cron \
+      <<-file
+        every [1.month, 1.day], :at => 'january 5:02am, june 17th at 2:22pm, june 3rd at 3:33am' do
+          command "blahblah"
+        end
+      file
     end
     
     should "output 6 commands since none align" do

data/test/test_helper.rb

@@ -3,26 +3,29 @@ require 'test/unit'
 
 require File.expand_path(File.dirname(__FILE__) + "/../lib/whenever")
 
-requirements = {
-  'shoulda' => 'thoughtbot-shoulda',
-  'mocha' => 'mocha',
-  'timecop' => 'timecop'
-}
+begin
+  require 'shoulda'
+rescue LoadError
+  warn 'To test Whenever you need the shoulda gem:'
+  warn '$ sudo gem install thoughtbot-shoulda'
+  exit(1)
+end
 
-requirements.each_pair do |gem_name, gem_source|
-  begin
-    require gem_name
-  rescue LoadError
-    warn "To test Whenever you need the #{gem_name} gem:"
-    warn "$ sudo gem install #{gem_source}"
-    exit(1)
-  end
+begin
+  require 'mocha'
+rescue LoadError
+  warn 'To test Whenever you need the mocha gem:'
+  warn '$ sudo gem install mocha'
+  exit(1)
 end
 
+
 module TestExtensions
+  
   def two_hours
     "0 0,2,4,6,8,10,12,14,16,18,20,22 * * *"
   end
+  
 end
 
 class Test::Unit::TestCase

data/whenever.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2009-12-02}
   s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
      "lib/whenever/base.rb",
      "lib/whenever/command_line.rb",
      "lib/whenever/job_list.rb",
+     "lib/whenever/job_sequence.rb",
+     "lib/whenever/job_types/cap_task.rb",
      "lib/whenever/job_types/default.rb",
      "lib/whenever/job_types/rake_task.rb",
      "lib/whenever/job_types/runner.rb",
@@ -35,7 +37,10 @@ Gem::Specification.new do |s|
      "lib/whenever/version.rb",
      "test/command_line_test.rb",
      "test/cron_test.rb",
+     "test/in_sequence_test.rb",
+     "test/job_sequence_test.rb",
      "test/output_at_test.rb",
+     "test/output_cap_test.rb",
      "test/output_command_test.rb",
      "test/output_env_test.rb",
      "test/output_rake_test.rb",
@@ -52,7 +57,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/command_line_test.rb",
      "test/cron_test.rb",
+     "test/in_sequence_test.rb",
+     "test/job_sequence_test.rb",
      "test/output_at_test.rb",
+     "test/output_cap_test.rb",
      "test/output_command_test.rb",
      "test/output_env_test.rb",
      "test/output_rake_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneypools-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -06:00
+date: 2009-12-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency