whenever 0.5.0 → 0.6.1

data/test/{output_redirection_test.rb → functional/output_redirection_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 class OutputRedirectionTest < Test::Unit::TestCase
 
@@ -6,6 +6,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, nil
         every 2.hours do
           command "blahblah"
@@ -23,6 +24,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, 'logfile.log'
         every 2.hours do
           command "blahblah"
@@ -39,6 +41,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:standard => 'dev_null', :error => 'dev_err'}
         end
@@ -54,6 +57,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, 'logfile.log'
         every 2.hours do
           command "blahblah", :output => 'otherlog.log'
@@ -71,6 +75,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, 'logfile.log'
         every 2.hours do
           command "blahblah", :output => {:error => 'dev_err', :standard => 'dev_null' }
@@ -88,6 +93,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, 'logfile.log'
         every 2.hours do
           command "blahblah", :output => false
@@ -105,6 +111,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron :set => 'output=otherlog.log', :string => \
       <<-file
+        set :job_template, nil
         set :output, 'logfile.log'
         every 2.hours do
           command "blahblah"
@@ -122,6 +129,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, {:error => 'dev_err', :standard => 'dev_null' }
         every 2.hours do
           command "blahblah"
@@ -138,6 +146,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, {:error => 'dev_null'}
         every 2.hours do
           command "blahblah"
@@ -154,6 +163,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :output, {:standard => 'dev_out'}
         every 2.hours do
           command "blahblah"
@@ -170,6 +180,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:error => 'dev_err'}
         end
@@ -185,6 +196,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:standard => 'dev_out'}
         end
@@ -200,6 +212,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:standard => nil}
         end
@@ -215,6 +228,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:error => nil}
         end
@@ -230,6 +244,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:error => nil, :standard => nil}
         end
@@ -245,6 +260,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:error => nil, :standard => 'my.log'}
         end
@@ -260,6 +276,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         every 2.hours do
           command "blahblah", :output => {:error => 'my_error.log', :standard => nil}
         end
@@ -275,6 +292,7 @@ class OutputRedirectionTest < Test::Unit::TestCase
     setup do
       @output = Whenever.cron \
       <<-file
+        set :job_template, nil
         set :cron_log, "cron.log"
         every 2.hours do
           command "blahblah"

data/test/test_helper.rb

@@ -1,24 +1,11 @@
 require 'rubygems'
-require 'test/unit'
 
-require File.expand_path(File.dirname(__FILE__) + "/../lib/whenever")
-
-begin
-  require 'shoulda'
-rescue LoadError
-  warn 'To test Whenever you need the shoulda gem:'
-  warn '$ sudo gem install thoughtbot-shoulda'
-  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
+# Want to test the files here, in lib, not in an installed version of the gem.
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'whenever'
 
+require 'shoulda'
+require 'mocha'
 
 module TestExtensions
   

data/test/{cron_test.rb → unit/cron_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 class CronTest < Test::Unit::TestCase
 

data/test/unit/job_test.rb

@@ -0,0 +1,77 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+
+class JobTest < Test::Unit::TestCase
+  
+  context "A Job" do
+    should "return the :at set when #at is called" do
+      assert_equal 'foo', new_job(:at => 'foo').at
+    end
+    
+    should "substitute the :task when #output is called" do
+      job = new_job(:template => ":task", :task => 'abc123')
+      assert_equal 'abc123', job.output
+    end
+    
+    should "substitute the :path when #output is called" do
+      assert_equal 'foo', new_job(:template => ':path', :path => 'foo').output
+    end
+    
+    should "substitute the :path with the default Whenever.path if none is provided when #output is called" do
+      Whenever.expects(:path).returns('/my/path')
+      assert_equal '/my/path', new_job(:template => ':path').output
+    end
+  end
+
+  
+  context "A Job with quotes" do
+    should "output the :task if it's in single quotes" do
+      job = new_job(:template => "':task'", :task => 'abc123')
+      assert_equal %q('abc123'), job.output
+    end
+    
+    should "output the :task if it's in double quotes" do
+      job = new_job(:template => '":task"', :task => 'abc123')
+      assert_equal %q("abc123"), job.output
+    end
+    
+    should "output escaped single quotes in when it's wrapped in them" do
+      job = new_job(
+        :template => "before ':foo' after",
+        :foo => "quote -> ' <- quote"
+      )
+      assert_equal %q(before 'quote -> '\'' <- quote' after), job.output
+    end
+    
+    should "output escaped double quotes when it's wrapped in them" do
+      job = new_job(
+        :template => 'before ":foo" after',
+        :foo => 'quote -> " <- quote'
+      )
+      assert_equal %q(before "quote -> \" <- quote" after), job.output
+    end
+  end
+  
+  context "A Job with a job_template" do
+    should "use the job template" do
+      job = new_job(:template => ':task', :task => 'abc123', :job_template => 'left :job right')
+      assert_equal 'left abc123 right', job.output
+    end
+    
+    should "escape single quotes" do
+      job = new_job(:template => "before ':task' after", :task => "quote -> ' <- quote", :job_template => "left ':job' right")
+      assert_equal %q(left 'before '\''quote -> '\\''\\'\\'''\\'' <- quote'\'' after' right), job.output
+    end
+    
+    should "escape double quotes" do
+      job = new_job(:template => 'before ":task" after', :task => 'quote -> " <- quote', :job_template => 'left ":job" right')
+      assert_equal %q(left "before \"quote -> \\\" <- quote\" after" right), job.output
+    end
+  end
+
+private
+
+  def new_job(options={})
+    Whenever::Job.new(options)
+  end
+  
+end

data/whenever.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.5.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]
-  s.date = %q{2010-06-28}
-  s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
+  s.date = %q{2010-10-20}
+  s.description = %q{http://www.allyrics.net/Kid-Cudi/lyrics/Whenever/}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
   s.extra_rdoc_files = [
@@ -25,54 +25,62 @@ Gem::Specification.new do |s|
      "bin/wheneverize",
      "lib/whenever.rb",
      "lib/whenever/base.rb",
+     "lib/whenever/capistrano.rb",
      "lib/whenever/command_line.rb",
+     "lib/whenever/cron.rb",
      "lib/whenever/job.rb",
      "lib/whenever/job_list.rb",
      "lib/whenever/job_types/default.rb",
-     "lib/whenever/outputs/cron.rb",
-     "lib/whenever/outputs/cron/output_redirection.rb",
+     "lib/whenever/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_defined_job_test.rb",
-     "test/output_env_test.rb",
-     "test/output_rake_test.rb",
-     "test/output_redirection_test.rb",
-     "test/output_runner_test.rb",
+     "test/functional/command_line_test.rb",
+     "test/functional/output_at_test.rb",
+     "test/functional/output_default_defined_jobs_test.rb",
+     "test/functional/output_defined_job_test.rb",
+     "test/functional/output_env_test.rb",
+     "test/functional/output_redirection_test.rb",
      "test/test_helper.rb",
+     "test/unit/cron_test.rb",
+     "test/unit/job_test.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.6}
-  s.summary = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Clean ruby syntax for writing and deploying 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_defined_job_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"
+    "test/functional/command_line_test.rb",
+     "test/functional/output_at_test.rb",
+     "test/functional/output_default_defined_jobs_test.rb",
+     "test/functional/output_defined_job_test.rb",
+     "test/functional/output_env_test.rb",
+     "test/functional/output_redirection_test.rb",
+     "test/test_helper.rb",
+     "test/unit/cron_test.rb",
+     "test/unit/job_test.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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.1.1"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
     else
-      s.add_dependency(%q<chronic>, [">= 0.2.3"])
+      s.add_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_dependency(%q<shoulda>, [">= 2.1.1"])
+      s.add_dependency(%q<mocha>, [">= 0.9.5"])
     end
   else
-    s.add_dependency(%q<chronic>, [">= 0.2.3"])
+    s.add_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+    s.add_dependency(%q<shoulda>, [">= 2.1.1"])
+    s.add_dependency(%q<mocha>, [">= 0.9.5"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 0
-  version: 0.5.0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -14,24 +14,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -04:00
+date: 2010-10-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: chronic
+  name: aaronh-chronic
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
         - 3
-        version: 0.2.3
+        - 9
+        version: 0.3.9
   type: :runtime
   version_requirements: *id001
-description: Clean ruby syntax for defining and deploying messy cron jobs.
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 5
+        version: 0.9.5
+  type: :development
+  version_requirements: *id004
+description: http://www.allyrics.net/Kid-Cudi/lyrics/Whenever/
 email: javan@javan.us
 executables: 
 - whenever
@@ -49,23 +95,23 @@ files:
 - bin/wheneverize
 - lib/whenever.rb
 - lib/whenever/base.rb
+- lib/whenever/capistrano.rb
 - lib/whenever/command_line.rb
+- lib/whenever/cron.rb
 - lib/whenever/job.rb
 - lib/whenever/job_list.rb
 - lib/whenever/job_types/default.rb
-- lib/whenever/outputs/cron.rb
-- lib/whenever/outputs/cron/output_redirection.rb
+- lib/whenever/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_defined_job_test.rb
-- test/output_env_test.rb
-- test/output_rake_test.rb
-- test/output_redirection_test.rb
-- test/output_runner_test.rb
+- test/functional/command_line_test.rb
+- test/functional/output_at_test.rb
+- test/functional/output_default_defined_jobs_test.rb
+- test/functional/output_defined_job_test.rb
+- test/functional/output_env_test.rb
+- test/functional/output_redirection_test.rb
 - test/test_helper.rb
+- test/unit/cron_test.rb
+- test/unit/job_test.rb
 - whenever.gemspec
 has_rdoc: true
 homepage: http://github.com/javan/whenever
@@ -77,6 +123,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -84,6 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -93,18 +141,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Clean ruby syntax for defining and deploying messy cron jobs.
+summary: Clean ruby syntax for writing and deploying cron jobs.
 test_files: 
-- test/command_line_test.rb
-- test/cron_test.rb
-- test/output_at_test.rb
-- test/output_command_test.rb
-- test/output_defined_job_test.rb
-- test/output_env_test.rb
-- test/output_rake_test.rb
-- test/output_redirection_test.rb
-- test/output_runner_test.rb
+- test/functional/command_line_test.rb
+- test/functional/output_at_test.rb
+- test/functional/output_default_defined_jobs_test.rb
+- test/functional/output_defined_job_test.rb
+- test/functional/output_env_test.rb
+- test/functional/output_redirection_test.rb
 - test/test_helper.rb
+- test/unit/cron_test.rb
+- test/unit/job_test.rb

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

@@ -1,60 +0,0 @@
-module Whenever
-  module Output
-    class Cron
-      class OutputRedirection
-        
-        def initialize(output)
-          @output = output
-        end
-        
-        def to_s
-          return '' unless defined?(@output)
-          case @output
-            when String   then redirect_from_string
-            when Hash     then redirect_from_hash
-            when NilClass then ">> /dev/null 2>&1"
-            else ''
-          end 
-        end
-        
-      protected
-        
-        def stdout
-          return unless @output.has_key?(:standard)
-          @output[:standard].nil? ? '/dev/null' : @output[:standard]
-        end
-
-        def stderr
-          return unless @output.has_key?(:error)
-          @output[:error].nil? ? '/dev/null' : @output[:error]
-        end
-
-        def redirect_from_hash
-          case
-            when stdout == '/dev/null' && stderr == '/dev/null'
-              "> /dev/null 2>&1"
-            when stdout && stderr == '/dev/null'
-              ">> #{stdout} 2> /dev/null"
-            when stdout && stderr
-              ">> #{stdout} 2>> #{stderr}"
-            when stderr == '/dev/null'
-              "2> /dev/null"
-            when stderr
-              "2>> #{stderr}"
-            when stdout == '/dev/null'
-              "> /dev/null"
-            when stdout
-              ">> #{stdout}"
-            else
-              ''
-          end
-        end
-
-        def redirect_from_string
-          ">> #{@output} 2>&1"
-        end
-        
-      end
-    end
-  end
-end

data/test/output_command_test.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
-
-class OutputCommandTest < Test::Unit::TestCase
-  
-  context "A plain command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-    
-    should "output the command" do
-      assert_match /^.+ .+ .+ .+ blahblah$/, @output
-    end
-  end
-  
-  context "An every statement with two commands in it" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        every 1.hour do
-          command "first"
-          command "second"
-        end
-      file
-    end
-
-    should "output both commands" do
-      assert_match "0 * * * * first", @output
-      assert_match "0 * * * * second", @output
-    end
-  end
-    
-end

data/test/output_env_test.rb

@@ -1,56 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
-
-class OutputEnvTest < Test::Unit::TestCase
-
-  context "The output from Whenever with environment variables set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        env :MYVAR, 'blah'
-        env 'MAILTO', "someone@example.com"
-      file
-    end
-
-    should "output MYVAR environment variable" do
-      assert_match "MYVAR=blah", @output
-    end
-  
-    should "output MAILTO environment variable" do
-      assert_match "MAILTO=someone@example.com", @output
-    end
-  end
-  
-  context "No PATH environment variable set" do
-    setup do
-      Whenever::JobList.any_instance.expects(:read_path).at_least_once.returns('/usr/local/bin')
-      @output = Whenever.cron ""
-    end
-    
-    should "add a PATH variable based on the user's PATH" do
-      assert_match "PATH=/usr/local/bin", @output
-    end
-  end
-  
-  context "A PATH environment variable set" do
-    setup do
-      Whenever::JobList.stubs(:read_path).returns('/usr/local/bin')
-      @output = Whenever.cron "env :PATH, '/my/path'"
-    end
-    
-    should "use that path and the user's PATH" do
-      assert_match "PATH=/my/path", @output
-      assert_no_match /local/, @output
-    end
-  end
-  
-  context "No PATH set and instructed not to automatically load the user's path" do
-    setup do
-      @output = Whenever.cron "set :set_path_automatically, false"
-    end
-    
-    should "not have a PATH set" do
-      assert_no_match /PATH/, @output
-    end
-  end
-
-end