whenever 0.5.0 → 0.5.2

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
-doc
+doc
+.*.sw[a-z]

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+== 0.5.2 / September 15th, 2010
+
+* Quotes automatically escaped in jobs. [Jay Adkisson]
+
+* Added --cut option to the command line to allow pruning of the crontab. [Peer Allan]
+
+* Switched to aaronh-chronic which is ruby 1.9.2 compatible. [Aaron Hurley, Javan Makhmali]
+
+* Lots of internal reorganizing; tests broken into unit and functional. [Javan Makhmali]
+
+
 == 0.5.0 / June 28th, 2010
 
 * New job_type API for writing custom jobs. Internals use this to define command, runner, and rake. [Javan Makhmali - inspired by idlefingers (Damien)]

data/README.rdoc

@@ -55,9 +55,9 @@ Would run <code>/usr/local/bin/awesome party extreme</code> every two hours. <co
 
 The default job types that ship with Whenever are defined like so:
 
-  job_type :command, ':task'
-  job_type :runner,  'cd :path && script/runner -e :environment ":task"'
-  job_type :rake,    'cd :path && RAILS_ENV=:environment /usr/bin/env rake :task'
+  job_type :command, ":task"
+  job_type :runner,  "cd :path && script/runner -e :environment ':task'"
+  job_type :rake,    "cd :path && RAILS_ENV=:environment /usr/bin/env rake :task"
 
 If a <code>:path</code> is not set it will default to the directory in which <code>whenever</code> was executed. <code>:environment</code> will default to 'production'.
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-require 'lib/whenever/version.rb'
+require File.expand_path(File.dirname(__FILE__) + "/lib/whenever/version")
 
 begin
   require 'jeweler'
@@ -13,7 +13,10 @@ begin
     gemspec.email       = "javan@javan.us"
     gemspec.homepage    = "http://github.com/javan/whenever"
     gemspec.authors     = ["Javan Makhmali"]
-    gemspec.add_dependency("chronic", '>= 0.2.3')
+    gemspec.add_dependency 'aaronh-chronic', '>= 0.3.9'
+    gemspec.add_dependency 'activesupport', '>= 2.3.4'
+    gemspec.add_development_dependency 'shoulda', '>= 2.1.1'
+    gemspec.add_development_dependency 'mocha', '>= 0.9.5'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -22,10 +25,10 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/*.rb'
-  test.verbose = true
-end
+    test.libs      << 'lib' << 'test'
+    test.pattern   = 'test/{functional,unit}/**/*_test.rb'
+    test.verbose   = true
+  end
 
 task :test => :check_dependencies
 

data/bin/whenever

@@ -10,6 +10,9 @@ OptionParser.new do |opts|
   opts.banner = "Usage: whenever [options]"
   opts.on('-v', '--version') { puts "Whenever v#{Whenever::VERSION}"; exit(0) }
   opts.on('-w', '--write-crontab') { options[:write] = true }
+  opts.on('-c', '--cut [lines]', 'Cut lines from the top of the cronfile') do |lines|
+    options[:cut] = lines.to_i if lines
+  end
   opts.on('-i', '--update-crontab [identifier]', 'Default: full path to schedule.rb file') do |identifier|
     options[:update] = true
     options[:identifier] = identifier if identifier

data/lib/whenever.rb

@@ -1,20 +1,10 @@
 require 'chronic'
+require 'active_support/all'
 
-# 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/all'
-rescue LoadError
-  warn 'To use Whenever you need the active_support gem:'
-  warn '$ gem install activesupport'
-  exit(1)
-end
-
-# Whenever files
 require 'whenever/base'
 require 'whenever/job_list'
 require 'whenever/job'
-require 'whenever/outputs/cron'
-require 'whenever/outputs/cron/output_redirection'
+require 'whenever/cron'
+require 'whenever/output_redirection'
 require 'whenever/command_line'
 require 'whenever/version'

data/lib/whenever/command_line.rb

@@ -12,6 +12,7 @@ module Whenever
       @options = options
       
       @options[:file]       ||= 'config/schedule.rb'
+      @options[:cut]        ||= 0
       @options[:identifier] ||= default_identifier
       
       unless File.exists?(@options[:file])
@@ -23,6 +24,13 @@ module Whenever
         warn("[fail] Can only update, write or clear. Choose one.")
         exit(1)
       end
+
+      unless @options[:cut].to_s =~ /[0-9]*/
+        warn("[fail] Can't cut negative lines from the crontab #{options[:cut]}")
+        exit(1)
+      end
+      @options[:cut] = @options[:cut].to_i
+      
     end
     
     def run
@@ -53,7 +61,7 @@ module Whenever
       command << "-u #{@options[:user]}" if @options[:user]
       
       command_results  = %x[#{command.join(' ')} 2> /dev/null]
-      @current_crontab = $?.exitstatus.zero? ? command_results : ''
+      @current_crontab = $?.exitstatus.zero? ? prepare(command_results) : ''
     end
     
     def write_crontab(contents)
@@ -95,6 +103,11 @@ module Whenever
       end
     end
     
+    # 
+    def prepare(contents)
+      contents.split("\n")[@options[:cut]..-1].join("\n")
+    end
+    
     def comment_base
       "Whenever generated tasks for: #{@options[:identifier]}"
     end

data/lib/whenever/{outputs/cron.rb → cron.rb}

@@ -1,6 +1,5 @@
 module Whenever
   module Output
-
     class Cron
 
       attr_accessor :time, :task
@@ -43,7 +42,7 @@ module Whenever
       end
       
       def output_redirection
-        OutputRedirection.new(@output_redirection).to_s unless @output_redirection == :not_set
+        Whenever::Output::Cron::OutputRedirection.new(@output_redirection).to_s unless @output_redirection == :not_set
       end
 
     protected
@@ -60,7 +59,7 @@ module Whenever
         end
         
         if shortcut
-          if @at.is_a?(Time) || (@at.is_a?(Numeric) && @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
@@ -134,6 +133,5 @@ module Whenever
       end
 
     end
-
   end
 end

data/lib/whenever/job.rb

@@ -1,7 +1,7 @@
 module Whenever
   class Job
     
-    attr_accessor :at, :output_redirection
+    attr_reader :at, :output_redirection
   
     def initialize(options = {})
       @options = options
@@ -13,10 +13,29 @@ module Whenever
     end
   
     def output
-      @options[:template].gsub(/:\w+/) do |key|
-        @options[key.sub(':', '').to_sym]
+      @options[:template].dup.gsub(/:\w+/) do |key|
+        before_and_after = [$`[-1..-1], $'[0..0]]
+        option = @options[key.sub(':', '').to_sym]
+
+        if before_and_after.all? { |c| c == "'" }
+          escape_single_quotes(option)
+        elsif before_and_after.all? { |c| c == '"' }
+          escape_double_quotes(option)
+        else
+          option
+        end
       end
     end
     
+  protected
+
+    def escape_single_quotes(str)
+      str.gsub(/'/) { "'\\''" }
+    end
+    
+    def escape_double_quotes(str)
+      str.gsub(/"/) { '\"' }
+    end
+    
   end
-end
+end

data/lib/whenever/job_types/default.rb

@@ -1,3 +1,3 @@
-job_type :command, ':task'
-job_type :runner,  'cd :path && script/runner -e :environment ":task"'
-job_type :rake,    'cd :path && RAILS_ENV=:environment /usr/bin/env rake :task'
+job_type :command, ":task"
+job_type :runner,  "cd :path && script/runner -e :environment ':task'"
+job_type :rake,    "cd :path && RAILS_ENV=:environment /usr/bin/env rake :task"

data/lib/whenever/version.rb

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

data/test/{command_line_test.rb → functional/command_line_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 CommandLineTest < Test::Unit::TestCase
   
@@ -174,4 +174,115 @@ NEW_CRON
       @command = Whenever::CommandLine.new(:update => true, :clear => true)
     end
   end
+  
+  context "A runner where the environment is overridden using the :set option" do
+    setup do
+      @output = Whenever.cron :set => 'environment=serious', :string => \
+      <<-file
+        set :environment, :silly
+        set :path, '/my/path'
+        every 2.hours do
+          runner "blahblah"
+        end
+      file
+    end
+    
+    should "output the runner using the override environment" do
+      assert_match two_hours + %( cd /my/path && script/runner -e serious 'blahblah'), @output
+    end
+  end
+  
+  context "A runner where the environment and path are overridden using the :set option" do
+    setup do
+      @output = Whenever.cron :set => 'environment=serious&path=/serious/path', :string => \
+      <<-file
+        set :environment, :silly
+        set :path, '/silly/path'
+        every 2.hours do
+          runner "blahblah"
+        end
+      file
+    end
+    
+    should "output the runner using the overridden path and environment" do
+      assert_match two_hours + %( cd /serious/path && script/runner -e serious 'blahblah'), @output
+    end
+  end
+  
+  context "A runner where the environment and path are overridden using the :set option with spaces in the string" do
+    setup do
+      @output = Whenever.cron :set => ' environment = serious&  path =/serious/path', :string => \
+      <<-file
+        set :environment, :silly
+        set :path, '/silly/path'
+        every 2.hours do
+          runner "blahblah"
+        end
+      file
+    end
+    
+    should "output the runner using the overridden path and environment" do
+      assert_match two_hours + %( cd /serious/path && script/runner -e serious 'blahblah'), @output
+    end
+  end
+  
+  context "A runner where the environment is overridden using the :set option but no value is given" do
+    setup do
+      @output = Whenever.cron :set => ' environment=', :string => \
+      <<-file
+        set :environment, :silly
+        set :path, '/silly/path'
+        every 2.hours do
+          runner "blahblah"
+        end
+      file
+    end
+    
+    should "output the runner using the original environmnet" do
+      assert_match two_hours + %( cd /silly/path && script/runner -e silly 'blahblah'), @output
+    end
+  end
+
+  context "prepare-ing the output" do
+    setup do
+      File.expects(:exists?).with('config/schedule.rb').returns(true)
+    end
+
+    should "not trim off the top lines of the file" do
+      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => 0)
+      existing = <<-EXISTING_CRON
+# Useless Comments
+# at the top of the file
+
+# Begin Whenever generated tasks for: My identifier
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier
+EXISTING_CRON
+
+      # here-doc adds an extra newline we need removed
+      assert_equal existing.strip, @command.send(:prepare, existing)
+    end
+    
+    should "trim off the top lines of the file" do
+      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => '3')
+      existing = <<-EXISTING_CRON
+# Useless Comments
+# at the top of the file
+
+# Begin Whenever generated tasks for: My identifier
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier
+EXISTING_CRON
+
+      new_cron = <<-NEW_CRON
+# Begin Whenever generated tasks for: My identifier
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier
+NEW_CRON
+
+      # here-doc adds an extra newline we need removed
+      assert_equal new_cron.strip, @command.send(:prepare, existing)
+    end
+  end
+
 end

data/test/{output_at_test.rb → functional/output_at_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 OutputAtTest < Test::Unit::TestCase
   
@@ -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 cd /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 cd /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 cd /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_rake_test.rb → functional/output_default_defined_jobs_test.rb}

@@ -1,47 +1,64 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
-class OutputRakeTest < Test::Unit::TestCase
+class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
   
-  # Rake are generated in an almost identical way to runners so we
-  # only need some basic tests to ensure they are output correctly
+  # command
   
-  context "A rake command with path set" do
+  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
+  
+  # runner
+  
+  context "A runner with path set" do
     setup do
       @output = Whenever.cron \
       <<-file
         set :path, '/my/path'
         every 2.hours do
-          rake "blahblah"
+          runner 'blahblah'
         end
       file
     end
     
-    should "output the rake command using that path" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
+    should "output the runner using that path" do
+      assert_match two_hours + %( cd /my/path && script/runner -e production 'blahblah'), @output
     end
   end
   
-  context "A rake command that overrides the path set" do
+  context "A runner that overrides the path set" do
     setup do
       @output = Whenever.cron \
       <<-file
         set :path, '/my/path'
         every 2.hours do
-          rake "blahblah", :path => '/some/other/path'
+          runner "blahblah", :path => '/some/other/path'
         end
       file
     end
     
-    should "output the rake command using that path" do
-      assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
+    should "output the runner using that path" do
+      assert_match two_hours + %( cd /some/other/path && script/runner -e production 'blahblah'), @output
     end
   end
   
-  context "A rake command with environment set" do
+  # rake
+  
+  context "A rake command with path set" do
     setup do
       @output = Whenever.cron \
       <<-file
-        set :environment, :silly
         set :path, '/my/path'
         every 2.hours do
           rake "blahblah"
@@ -49,25 +66,24 @@ class OutputRakeTest < Test::Unit::TestCase
       file
     end
     
-    should "output the rake command using that environment" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=silly /usr/bin/env rake blahblah', @output
+    should "output the rake command using that path" do
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
     end
   end
   
-  context "A rake command that overrides the environment set" do
+  context "A rake command that overrides the path set" do
     setup do
       @output = Whenever.cron \
       <<-file
-        set :environment, :silly
         set :path, '/my/path'
         every 2.hours do
-          rake "blahblah", :environment => :serious
+          rake "blahblah", :path => '/some/other/path'
         end
       file
     end
     
-    should "output the rake command using that environment" do
-      assert_match two_hours + ' cd /my/path && RAILS_ENV=serious /usr/bin/env rake blahblah', @output
+    should "output the rake command using that path" do
+      assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production /usr/bin/env rake blahblah', @output
     end
   end
   

data/test/{output_defined_job_test.rb → functional/output_defined_job_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 OutputDefinedJobTest < Test::Unit::TestCase
   
@@ -84,4 +84,22 @@ class OutputDefinedJobTest < Test::Unit::TestCase
     end
   end
   
+  context "A defined job that uses a :path where none is explicitly set" do
+    setup do
+      Whenever.expects(:path).returns('/my/path')
+      
+      @output = Whenever.cron \
+      <<-file
+        job_type :some_job, "cd :path && :task"
+        every 2.hours do
+          some_job 'blahblah'
+        end
+      file
+    end
+    
+    should "default to using the Whenever.path" do
+      assert_match two_hours + %( cd /my/path && blahblah), @output
+    end
+  end
+
 end

data/test/{output_env_test.rb → functional/output_env_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 OutputEnvTest < Test::Unit::TestCase
 

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
 

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,69 @@
+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 "return :output when #output_redirection is called" do
+      assert_equal 'foo', new_job(:output => 'foo').output_redirection
+    end
+    
+    should "return :not_set when #output_redirection is called and no :output is set" do
+      assert_equal :not_set, new_job.output_redirection
+    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
+
+private
+
+  def new_job(options={})
+    Whenever::Job.new(options)
+  end
+  
+end

data/whenever.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.5.0"
+  s.version = "0.5.2"
 
   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.date = %q{2010-09-15}
   s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
@@ -26,22 +26,21 @@ Gem::Specification.new do |s|
      "lib/whenever.rb",
      "lib/whenever/base.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}
@@ -50,16 +49,15 @@ Gem::Specification.new do |s|
   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",
-     "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
@@ -67,12 +65,21 @@ Gem::Specification.new do |s|
     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"])
+      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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -04:00
+date: 2010-09-15 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 
     requirements: 
@@ -26,11 +26,53 @@ dependencies:
       - !ruby/object:Gem::Version 
         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 
+    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 
+    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 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        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: javan@javan.us
 executables: 
@@ -50,22 +92,21 @@ files:
 - lib/whenever.rb
 - lib/whenever/base.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
@@ -98,13 +139,12 @@ 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_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/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_runner_test.rb

@@ -1,175 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
-
-class OutputRunnerTest < Test::Unit::TestCase
-  
-  context "A runner with path set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using that path" do
-      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
-    end
-  end
-  
-  context "A runner that overrides the path set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah", :path => '/some/other/path'
-        end
-      file
-    end
-    
-    should "output the runner using that path" do
-      assert_match two_hours + ' cd /some/other/path && script/runner -e production "blahblah"', @output
-    end
-  end
-  
-  context "A runner with no path set and RAILS_ROOT defined" do
-    setup do
-      Whenever.stubs(:path).returns('/my/path')
-      
-      @output = Whenever.cron \
-      <<-file
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using that path" do
-      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
-    end
-  end
-  
-  context "A runner with path set AND RAILS_ROOT defined" do
-    setup do
-      Whenever.stubs(:path).returns('/my/rails/path')
-      
-      @output = Whenever.cron \
-      <<-file
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "use the path" do
-      assert_match two_hours + ' cd /my/path && script/runner -e production "blahblah"', @output
-      assert_no_match /\/rails\/path/, @output
-    end
-  end
-  
-  context "A runner with an environment set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :environment, :silly
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using that environment" do
-      assert_match two_hours + ' cd /my/path && script/runner -e silly "blahblah"', @output
-    end
-  end
-  
-  context "A runner that overrides the environment set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :environment, :silly
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah", :environment => :serious
-        end
-      file
-    end
-    
-    should "output the runner using that environment" do
-      assert_match two_hours + ' cd /my/path && script/runner -e serious "blahblah"', @output
-    end
-  end
-  
-  context "A runner where the environment is overridden using the :set option" do
-    setup do
-      @output = Whenever.cron :set => 'environment=serious', :string => \
-      <<-file
-        set :environment, :silly
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using the override environment" do
-      assert_match two_hours + ' cd /my/path && script/runner -e serious "blahblah"', @output
-    end
-  end
-  
-  context "A runner where the environment and path are overridden using the :set option" do
-    setup do
-      @output = Whenever.cron :set => 'environment=serious&path=/serious/path', :string => \
-      <<-file
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using the overridden path and environment" do
-      assert_match two_hours + ' cd /serious/path && script/runner -e serious "blahblah"', @output
-    end
-  end
-  
-  context "A runner where the environment and path are overridden using the :set option with spaces in the string" do
-    setup do
-      @output = Whenever.cron :set => ' environment = serious&  path =/serious/path', :string => \
-      <<-file
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using the overridden path and environment" do
-      assert_match two_hours + ' cd /serious/path && script/runner -e serious "blahblah"', @output
-    end
-  end
-  
-  context "A runner where the environment is overridden using the :set option but no value is given" do
-    setup do
-      @output = Whenever.cron :set => ' environment=', :string => \
-      <<-file
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        end
-      file
-    end
-    
-    should "output the runner using the original environmnet" do
-      assert_match two_hours + ' cd /silly/path && script/runner -e silly "blahblah"', @output
-    end
-  end
-  
-end