le1t0-whenever 0.4.2.003 → 0.6.2.001

data/test/functional/output_env_test.rb

@@ -0,0 +1,23 @@
+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
+
+end

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: le1t0-whenever
 version: !ruby/object:Gem::Version 
+  hash: 117
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 6
   - 2
-  - 3
-  version: 0.4.2.003
+  - 1
+  version: 0.6.2.001
 platform: ruby
 authors: 
 - Le1t0
@@ -15,95 +16,147 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +02:00
+date: 2010-11-22 00:00:00 +01: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 
+        hash: 1
         segments: 
         - 0
-        - 2
         - 3
-        version: 0.2.3
+        - 9
+        version: 0.3.9
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        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 
+        hash: 9
+        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 
+        hash: 49
+        segments: 
+        - 0
+        - 9
+        - 5
+        version: 0.9.5
+  type: :development
+  version_requirements: *id004
 description: Clean ruby syntax for defining and deploying messy cron jobs.
 email: dev@ewout.to
 executables: 
-- whenever
 - wheneverize
+- whenever
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
-- .gitignore
-- CHANGELOG.rdoc
-- README.rdoc
+- CHANGELOG.md
+- README.md
 - Rakefile
 - bin/whenever
 - 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/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/output_redirection.rb
+- lib/whenever/setup.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/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
 has_rdoc: true
 homepage: http://github.com/le1t0/whenever
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 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.
 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/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