moneypools-whenever 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/whenever/job_sequence.rb

@@ -1,18 +1,23 @@
 module Whenever
   class JobSequence < Array
-    attr_writer :dependent
+    attr_writer :dependent, :on_failure
     
     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
       concatenation = @dependent ? " && " : "; "
       task = map(&:output).join(concatenation)
 
+      if @dependent && @on_failure && @on_failure != ''
+        task = "(#{task}) || #{@on_failure}"
+      end
+
       Job::Default.new(@options.merge(:task => task))
     end
   end

data/moneypools-whenever.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{moneypools-whenever}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]

data/test/in_sequence_test.rb

@@ -38,6 +38,24 @@ class InSequenceTest < Test::Unit::TestCase
     end
   end
   
+  context "A pair of dependent sequential tasks with a failure command" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :path, '/my/path'
+        every 1.day, :on_failure => "my_failure_command" do
+          in_sequence do
+            rake "only_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
+    end
+  end
+  
   context "A pair of tasks in the same time block that should be executed in a independent sequence" do
     setup do
       @output = Whenever.cron \

data/test/job_sequence_test.rb

@@ -20,6 +20,14 @@ 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
@@ -30,6 +38,14 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneypools-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Javan Makhmali