moneypools-whenever 0.4.2 → 0.4.3

data/.gitignore

@@ -1,3 +1,3 @@
 .DS_Store
 pkg
-docmoneypools-whenever.gemspec
+doc

data/Rakefile

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

data/lib/whenever/job_sequence.rb

@@ -10,10 +10,21 @@ module Whenever
     end
     
     def to_single_job
+      options = @options.dup
+      default_redirection = options.delete(:output)
+      
       concatenation = @dependent ? " && " : "; "
-      task = map(&:output).join(concatenation)
+      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.2' 
-end unless defined?(Whenever::VERSION)
+  VERSION = '0.4.3' 
+end unless defined?(Whenever::VERSION)

data/test/in_sequence_test.rb

@@ -19,6 +19,47 @@ class InSequenceTest < Test::Unit::TestCase
     end
   end
   
+  context "A pair of tasks in a sequence with output redirection" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :path, '/my/path'
+        every 1.day, :at => "20:15" do
+          in_sequence do
+            rake "first_task", :output => 'logfile1'
+            rake "second_task", :output => 'logfile2'
+          end
+        end
+      file
+    end
+    
+    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 tasks in the same time block that should be executed in a dependent sequence" do
     setup do
       @output = Whenever.cron \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneypools-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 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-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,6 @@ files:
 - lib/whenever/outputs/cron.rb
 - lib/whenever/outputs/cron/output_redirection.rb
 - lib/whenever/version.rb
-- moneypools-whenever.gemspec
 - test/command_line_test.rb
 - test/cron_test.rb
 - test/in_sequence_test.rb
@@ -63,7 +62,6 @@ files:
 - test/output_redirection_test.rb
 - test/output_runner_test.rb
 - test/test_helper.rb
-- whenever.gemspec
 has_rdoc: true
 homepage: http://github.com/javan/whenever
 licenses: []

data/moneypools-whenever.gemspec

@@ -1,86 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{moneypools-whenever}
-  s.version = "0.4.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Javan Makhmali"]
-  s.date = %q{2009-11-30}
-  s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
-  s.email = %q{javan@javan.us}
-  s.executables = ["whenever", "wheneverize"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.rdoc",
-     "README.rdoc",
-     "Rakefile",
-     "bin/whenever",
-     "bin/wheneverize",
-     "lib/whenever.rb",
-     "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",
-     "lib/whenever/outputs/cron.rb",
-     "lib/whenever/outputs/cron/output_redirection.rb",
-     "lib/whenever/version.rb",
-     "moneypools-whenever.gemspec",
-     "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",
-     "test/output_redirection_test.rb",
-     "test/output_runner_test.rb",
-     "test/test_helper.rb",
-     "whenever.gemspec"
-  ]
-  s.homepage = %q{http://github.com/javan/whenever}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
-  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",
-     "test/output_redirection_test.rb",
-     "test/output_runner_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
-    else
-      s.add_dependency(%q<chronic>, [">= 0.2.3"])
-    end
-  else
-    s.add_dependency(%q<chronic>, [">= 0.2.3"])
-  end
-end
-

data/whenever.gemspec

@@ -1,77 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{whenever}
-  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-11-30}
-  s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
-  s.email = %q{javan@javan.us}
-  s.executables = ["whenever", "wheneverize"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.rdoc",
-     "README.rdoc",
-     "Rakefile",
-     "bin/whenever",
-     "bin/wheneverize",
-     "lib/whenever.rb",
-     "lib/whenever/base.rb",
-     "lib/whenever/command_line.rb",
-     "lib/whenever/job_list.rb",
-     "lib/whenever/job_types/default.rb",
-     "lib/whenever/job_types/rake_task.rb",
-     "lib/whenever/job_types/runner.rb",
-     "lib/whenever/outputs/cron.rb",
-     "lib/whenever/outputs/cron/output_redirection.rb",
-     "lib/whenever/version.rb",
-     "test/command_line_test.rb",
-     "test/cron_test.rb",
-     "test/output_at_test.rb",
-     "test/output_command_test.rb",
-     "test/output_env_test.rb",
-     "test/output_rake_test.rb",
-     "test/output_redirection_test.rb",
-     "test/output_runner_test.rb",
-     "test/test_helper.rb",
-     "whenever.gemspec"
-  ]
-  s.homepage = %q{http://github.com/javan/whenever}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
-  s.test_files = [
-    "test/command_line_test.rb",
-     "test/cron_test.rb",
-     "test/output_at_test.rb",
-     "test/output_command_test.rb",
-     "test/output_env_test.rb",
-     "test/output_rake_test.rb",
-     "test/output_redirection_test.rb",
-     "test/output_runner_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
-    else
-      s.add_dependency(%q<chronic>, [">= 0.2.3"])
-    end
-  else
-    s.add_dependency(%q<chronic>, [">= 0.2.3"])
-  end
-end
-