whenever 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+== 0.4.2 / April 26th, 2010
+
+* runners now cd into the app's directory and then execute. [Michael Guterl]
+
+* Fix STDERR output redirection to file to append instead of overwrite. [weplay]
+
+* Move require of tempfile lib to file that actually uses it. [Finn Smith]
+
+* bugfix: comparison Time with 0 failed. #32 [Dan Hixon]
+
+
 == 0.4.1 / November 30th, 2009
 
 * exit(0) instead of just exit to make JRuby happy. [Elan Meng]

data/README.rdoc

@@ -7,18 +7,8 @@ Ryan Bates created a great Railscast about Whenever: http://railscasts.com/episo
 Discussion: http://groups.google.com/group/whenever-gem
 
 == Installation
-
-If you haven't already, get set up with http://gemcutter.org
-  
-  $ sudo gem install whenever
-
-In a Rails (2.1 or greater) application:
   
-in your "config/environment.rb" file:
-
-  Rails::Initializer.run do |config|
-    config.gem 'whenever', :lib => false, :source => 'http://gemcutter.org/'
-  end
+$ sudo gem install whenever
 
 == Getting started
 
@@ -91,7 +81,7 @@ If you've found a genuine bug or issue, please use the Issues section on github:
 
 == License
 
-Copyright (c) 2009 Javan Makhmali
+Copyright (c) 2009+ Javan Makhmali
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/bin/whenever

@@ -2,8 +2,6 @@
 
 require 'rubygems'
 require 'optparse'
-require 'fileutils'
-require 'tempfile'
 require 'whenever'
 
 options = Hash.new
@@ -27,4 +25,4 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-Whenever::CommandLine.execute(options)
+Whenever::CommandLine.execute(options)

data/lib/whenever.rb

@@ -12,10 +12,10 @@ end
 # 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 'active_support'
+  require 'active_support/all'
 rescue LoadError
-  warn 'To user Whenever you need the active_support gem:'
-  warn '$ sudo gem install active_support'
+  warn 'To use Whenever you need the active_support gem:'
+  warn '$ gem install activesupport'
   exit(1)
 end
 

data/lib/whenever/command_line.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'tempfile'
+
 module Whenever
   class CommandLine
     
@@ -105,4 +108,4 @@ module Whenever
     end
     
   end
-end
+end

data/lib/whenever/job_types/runner.rb

@@ -4,7 +4,7 @@ module Whenever
 
       def output
         path_required
-        %Q(#{File.join(@path, 'script', 'runner')} -e #{@environment} #{task.inspect})
+        %Q(cd #{File.join(@path)} && script/runner -e #{@environment} #{task.inspect})
       end
       
     end

data/lib/whenever/outputs/cron.rb

@@ -60,7 +60,7 @@ module Whenever
         end
         
         if shortcut
-          if @at > 0
+          if @at.is_a?(Time) || (@at.is_a?(Numeric) && @at>0)
             raise ArgumentError, "You cannot specify an ':at' when using the shortcuts for times."
           else
             return shortcut

data/lib/whenever/outputs/cron/output_redirection.rb

@@ -32,11 +32,17 @@ module Whenever
         def redirect_from_hash
           case
             when stdout == '/dev/null' && stderr == '/dev/null'
-              ">> /dev/null 2>&1"
+              "> /dev/null 2>&1"
+            when stdout && stderr == '/dev/null'
+              ">> #{stdout} 2> /dev/null"
             when stdout && stderr
-              ">> #{stdout} 2> #{stderr}"
+              ">> #{stdout} 2>> #{stderr}"
+            when stderr == '/dev/null'
+              "2> /dev/null"
             when stderr
-              "2> #{stderr}"
+              "2>> #{stderr}"
+            when stdout == '/dev/null'
+              "> /dev/null"
             when stdout
               ">> #{stdout}"
             else

data/lib/whenever/version.rb

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

data/test/output_at_test.rb

@@ -91,7 +91,7 @@ class OutputAtTest < Test::Unit::TestCase
     end
     
     should "output the runner using one entry because the times are aligned" do
-      assert_match '2 5,15 * * 1,3,5 /your/path/script/runner -e production "blahblah"', @output
+      assert_match '2 5,15 * * 1,3,5 cd /your/path && script/runner -e production "blahblah"', @output
     end
   end
   
@@ -168,9 +168,9 @@ class OutputAtTest < Test::Unit::TestCase
     
     should "output all of the commands @daily" do
       assert_match '@daily cd /your/path && RAILS_ENV=production /usr/bin/env rake blah:blah', @output
-      assert_match '@daily /your/path/script/runner -e production "runner_1"', @output
+      assert_match '@daily cd /your/path && script/runner -e production "runner_1"', @output
       assert_match '@daily command_1', @output
-      assert_match '@daily /your/path/script/runner -e production "runner_2"', @output
+      assert_match '@daily cd /your/path && script/runner -e production "runner_2"', @output
       assert_match '@daily command_2', @output
     end
   end

data/test/output_redirection_test.rb

@@ -46,7 +46,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2> dev_err$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
     end
   end
 
@@ -80,7 +80,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
   
     should "output the command with the overridden redirection syntax appended" do
       assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2> dev_err$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
     end
   end
 
@@ -130,7 +130,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command without the redirection syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2> dev_err$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
     end
   end
 
@@ -145,8 +145,8 @@ class OutputRedirectionTest < Test::Unit::TestCase
       file
     end
 
-    should "output the command without the standard errror syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2> dev_null$/, @output
+    should "output the command without the standard error syntax appended" do
+      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_null$/, @output
     end
   end
 
@@ -177,7 +177,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2> dev_err$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_err$/, @output
     end
   end
 
@@ -207,7 +207,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command with stdout directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null$/, @output
     end
   end
 
@@ -237,7 +237,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, @output
     end
   end
 
@@ -267,7 +267,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     end
 
     should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2> my_error.log$/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, @output
     end
   end
 
@@ -286,4 +286,4 @@ class OutputRedirectionTest < Test::Unit::TestCase
       assert_match /^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, @output
     end
   end
-end
+end

data/test/output_runner_test.rb

@@ -14,7 +14,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using that path" do
-      assert_match two_hours + ' /my/path/script/runner -e production "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
     end
   end
   
@@ -30,7 +30,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using that path" do
-      assert_match two_hours + ' /some/other/path/script/runner -e production "blahblah"', @output
+      assert_match two_hours + ' cd /some/other/path && script/runner -e production "blahblah"', @output
     end
   end
   
@@ -47,7 +47,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using that path" do
-      assert_match two_hours + ' /my/path/script/runner -e production "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
     end
   end
   
@@ -65,7 +65,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "use the path" do
-      assert_match two_hours + ' /my/path/script/runner -e production "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
       assert_no_match /\/rails\/path/, @output
     end
   end
@@ -101,7 +101,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using that environment" do
-      assert_match two_hours + ' /my/path/script/runner -e silly "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e silly "blahblah"', @output
     end
   end
   
@@ -118,7 +118,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using that environment" do
-      assert_match two_hours + ' /my/path/script/runner -e serious "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e serious "blahblah"', @output
     end
   end
   
@@ -135,7 +135,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using the override environment" do
-      assert_match two_hours + ' /my/path/script/runner -e serious "blahblah"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e serious "blahblah"', @output
     end
   end
   
@@ -152,7 +152,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using the overridden path and environment" do
-      assert_match two_hours + ' /serious/path/script/runner -e serious "blahblah"', @output
+      assert_match two_hours + ' cd /serious/path && script/runner -e serious "blahblah"', @output
     end
   end
   
@@ -169,7 +169,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using the overridden path and environment" do
-      assert_match two_hours + ' /serious/path/script/runner -e serious "blahblah"', @output
+      assert_match two_hours + ' cd /serious/path && script/runner -e serious "blahblah"', @output
     end
   end
   
@@ -186,7 +186,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using the original environmnet" do
-      assert_match two_hours + ' /silly/path/script/runner -e silly "blahblah"', @output
+      assert_match two_hours + ' cd /silly/path && script/runner -e silly "blahblah"', @output
     end
   end
   
@@ -202,7 +202,7 @@ class OutputRunnerTest < Test::Unit::TestCase
     end
     
     should "output the runner using the original environmnet" do
-      assert_match two_hours + ' /my/path/script/runner -e production "Product.import(\"http://example.com/product.xml\")"', @output
+      assert_match two_hours + ' cd /my/path && script/runner -e production "Product.import(\"http://example.com/product.xml\")"', @output
     end
   end
   

data/whenever.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.4.1"
+  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.date = %q{2010-04-26}
   s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
   s.test_files = [
     "test/command_line_test.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: whenever
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -05:00
+date: 2010-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chronic
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 3
         version: 0.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Clean ruby syntax for defining and deploying messy cron jobs.
 email: javan@javan.us
 executables: 
@@ -71,18 +80,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Clean ruby syntax for defining and deploying messy cron jobs.