cwninja-whenever 0.1.5.3 → 0.1.5.4

data/bin/whenever

@@ -17,6 +17,7 @@ OptionParser.new do |opts|
   opts.on('-p', '--update-crontab') { options[:update] = true }
   opts.on('-m', '--marker [a specific string token]') { |token| options[:marker] = token }
   opts.on('-l', '--cron_log [logfile for cron output]') { |token| options[:cron_log] = token }
+  opts.on('-E', '--no-error-redirection') { options[:no_stderr_redirect] = true }
   opts.on('-f', '--load-file [schedule file]', 'default: config/schedule.rb') do |file|
     options[:file] = file if file
   end

data/lib/job_list.rb

@@ -9,7 +9,7 @@ module Whenever
         when String then options
         when Hash
           @cron_log = options[:cron_log] if options.has_key? :cron_log
-          
+          @no_stderr_redirect = options[:no_stderr_redirect] if options.has_key? :no_stderr_redirect
           if options[:string]
             options[:string]
           elsif options[:file]
@@ -37,6 +37,7 @@ module Whenever
     
     def command(task, options = {})
       options[:cron_log] ||= @cron_log unless options[:cron_log] === false
+      options[:no_stderr_redirect] ||= @no_stderr_redirect unless options[:no_stderr_redirect] === false
       options[:class]    ||= Whenever::Job::Default
       @jobs[@current_time_scope] ||= []
       @jobs[@current_time_scope] << options[:class].new(@options.merge(:task => task).merge(options))
@@ -79,7 +80,8 @@ module Whenever
       @jobs.each do |time, jobs|
         jobs.each do |job|
           cron = Whenever::Output::Cron.output(time, job)
-          cron << " >> #{job.cron_log} 2>&1" if job.cron_log 
+          cron << " >> #{job.cron_log}" if job.cron_log 
+          cron << " 2>&1" if job.cron_log && job.no_stderr_redirect.blank?
           cron << "\n\n"
           output << cron
         end

data/lib/job_types/default.rb

@@ -2,12 +2,13 @@ module Whenever
   module Job
     class Default
       
-      attr_accessor :task, :at, :cron_log
+      attr_accessor :task, :at, :cron_log, :no_stderr_redirect
     
       def initialize(options = {})
         @task        = options[:task]
         @at          = options[:at]
         @cron_log    = options[:cron_log]
+        @no_stderr_redirect = options[:no_stderr_redirect]
         @environment = options[:environment] || :production
         @path        = options[:path] || Whenever.path
       end

data/lib/version.rb

@@ -3,7 +3,7 @@ module Whenever
     MAJOR = 0
     MINOR = 1
     TINY  = 5
-    FORK  = 3
+    FORK  = 4
 
     STRING = [MAJOR, MINOR, TINY, FORK].join('.')
   end

data/test/output_command_test.rb

@@ -83,6 +83,59 @@ class OutputCommandTest < Test::Unit::TestCase
       assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
       assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, @output
     end
-  end
+  end 
+  
+  context "A command when the cron_log is set and the no_stderr_redirect is set too" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :cron_log, 'logfile.log'
+        set :no_stderr_redirect, true
+        every 2.hours do
+          command "blahblah"
+        end
+      file
+    end
+    
+    should "output the command with the log syntax appended but no error redirection" do
+      assert_match /^.+ .+ .+ .+ blahblah >> logfile.log$/, @output
+    end
+  end        
   
+  
+  context "A command when the cron_log is set but no_stderr_redirect is set to false" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :cron_log, 'logfile.log'
+        set :no_stderr_redirect, false
+        every 2.hours do
+          command "blahblah"
+        end
+      file
+    end
+    
+    should "output the command with the log syntax appended with error redirection" do
+      assert_match /^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, @output
+    end
+  end
+       
+  context "A command when cron_log and no_stderr_redirect are not set but the the command line sets them instead." do
+    setup do
+      @output = Whenever.cron(
+        :cron_log => "otherlog.log",
+        :no_stderr_redirect => true,
+        :string => %%
+            every 2.hours do
+              command "blahblah"
+            end
+        %
+      )
+    end
+    
+    should "output the command with the log syntax appended but no error redirection" do
+      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log$/, @output
+    end
+  end
 end

data/whenever.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.1.5.3"
+  s.version = "0.1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]
-  s.date = %q{2009-02-25}
+  s.date = %q{2009-07-21}
   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"]
   s.extra_rdoc_files = ["bin/whenever", "bin/wheneverize", "CHANGELOG.rdoc", "lib/base.rb", "lib/command_line.rb", "lib/job_list.rb", "lib/job_types/default.rb", "lib/job_types/rake_task.rb", "lib/job_types/runner.rb", "lib/outputs/cron.rb", "lib/version.rb", "lib/whenever.rb", "README.rdoc"]
-  s.files = ["bin/whenever", "bin/wheneverize", "CHANGELOG.rdoc", "lib/base.rb", "lib/command_line.rb", "lib/job_list.rb", "lib/job_types/default.rb", "lib/job_types/rake_task.rb", "lib/job_types/runner.rb", "lib/outputs/cron.rb", "lib/version.rb", "lib/whenever.rb", "Rakefile", "README.rdoc", "test/command_line_test.rb", "test/cron_test.rb", "test/output_command_test.rb", "test/output_env_test.rb", "test/output_rake_test.rb", "test/output_runner_test.rb", "test/test_helper.rb", "whenever.gemspec", "Manifest"]
+  s.files = ["bin/whenever", "bin/wheneverize", "CHANGELOG.rdoc", "lib/base.rb", "lib/command_line.rb", "lib/job_list.rb", "lib/job_types/default.rb", "lib/job_types/rake_task.rb", "lib/job_types/runner.rb", "lib/outputs/cron.rb", "lib/version.rb", "lib/whenever.rb", "Rakefile", "README.rdoc", "test/command_line_test.rb", "test/cron_test.rb", "test/output_command_test.rb", "test/output_env_test.rb", "test/output_rake_test.rb", "test/output_runner_test.rb", "test/test_helper.rb", "whenever.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/javan/whenever}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Whenever", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{whenever}
-  s.rubygems_version = %q{1.3.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Provides clean ruby syntax for defining messy cron jobs and running them Whenever.}
   s.test_files = ["test/command_line_test.rb", "test/cron_test.rb", "test/output_command_test.rb", "test/output_env_test.rb", "test/output_rake_test.rb", "test/output_runner_test.rb", "test/test_helper.rb"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwninja-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.1.5.3
+  version: 0.1.5.4
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,6 @@ files:
 - test/output_runner_test.rb
 - test/test_helper.rb
 - whenever.gemspec
-- Manifest
 has_rdoc: true
 homepage: http://github.com/javan/whenever
 post_install_message: