whenever 0.4.1 → 0.5.3

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
 
@@ -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/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.4.1"
+  s.version = "0.5.3"
 
   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-09-24}
   s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]
@@ -26,52 +26,60 @@ 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/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/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",
      "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.5}
+  s.rubygems_version = %q{1.3.7}
   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_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

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whenever
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,19 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -05:00
+date: 2010-09-24 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 
+        hash: 1
+        segments: 
+        - 0
+        - 3
+        - 9
+        version: 0.3.9
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  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 
-        version: 0.2.3
-    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: javan@javan.us
 executables: 
@@ -41,22 +101,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/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/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
 - whenever.gemspec
 has_rdoc: true
 homepage: http://github.com/javan/whenever
@@ -68,31 +127,37 @@ 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+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

data/lib/whenever/job_types/rake_task.rb

@@ -1,12 +0,0 @@
-module Whenever
-  module Job
-    class RakeTask < Whenever::Job::Default
-      
-      def output
-        path_required
-        "cd #{@path} && RAILS_ENV=#{@environment} /usr/bin/env rake #{task}"
-      end
-      
-    end
-  end
-end

data/lib/whenever/job_types/runner.rb

@@ -1,12 +0,0 @@
-module Whenever
-  module Job
-    class Runner < Whenever::Job::Default
-
-      def output
-        path_required
-        %Q(#{File.join(@path, 'script', 'runner')} -e #{@environment} #{task.inspect})
-      end
-      
-    end
-  end
-end

data/test/command_line_test.rb

@@ -1,101 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/test_helper")
-
-class CommandLineTest < Test::Unit::TestCase
-  
-  context "A command line write" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-      @command = Whenever::CommandLine.new(:write => true, :identifier => 'My identifier')
-      @task = "#{two_hours} /my/command"
-      Whenever.expects(:cron).returns(@task)
-    end
-
-    should "output the cron job with identifier blocks" do
-      output = <<-EXPECTED
-# Begin Whenever generated tasks for: My identifier
-#{@task}
-# End Whenever generated tasks for: My identifier
-EXPECTED
-      
-      assert_equal output, @command.send(:whenever_cron)
-    end
-    
-    should "write the crontab when run" do
-      @command.expects(:write_crontab).returns(true)
-      assert @command.run
-    end
-  end
-  
-  context "A command line update" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
-      @task = "#{two_hours} /my/command"
-      Whenever.expects(:cron).returns(@task)
-    end
-
-    should "add the cron to the end of the file if there is no existing identifier block" do
-      existing = '# Existing crontab'
-      @command.expects(:read_crontab).at_least_once.returns(existing)
-      
-      new_cron = <<-EXPECTED
-#{existing}
-
-# Begin Whenever generated tasks for: My identifier
-#{@task}
-# End Whenever generated tasks for: My identifier
-EXPECTED
-      
-      assert_equal new_cron, @command.send(:updated_crontab)
-      
-      @command.expects(:write_crontab).with(new_cron).returns(true)
-      assert @command.run
-    end
-    
-    should "replace an existing block if the identifier matches" do
-      existing = <<-EXISTING_CRON
-# Something
-
-# Begin Whenever generated tasks for: My identifier
-My whenever job that was already here
-# End Whenever generated tasks for: My identifier
-
-# Begin Whenever generated tasks for: Other identifier
-This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
-EXISTING_CRON
-
-      @command.expects(:read_crontab).at_least_once.returns(existing)
-      
-      new_cron = <<-NEW_CRON
-# Something
-
-# Begin Whenever generated tasks for: My identifier
-#{@task}
-# End Whenever generated tasks for: My identifier
-
-# Begin Whenever generated tasks for: Other identifier
-This shouldn't get replaced
-# End Whenever generated tasks for: Other identifier
-NEW_CRON
-      
-      assert_equal new_cron, @command.send(:updated_crontab)
-      
-      @command.expects(:write_crontab).with(new_cron).returns(true)
-      assert @command.run
-    end
-  end
-  
-  context "A command line update with no identifier" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-      Whenever::CommandLine.any_instance.expects(:default_identifier).returns('DEFAULT')
-      @command = Whenever::CommandLine.new(:update => true, :file => @file)
-    end
-
-    should "use the default identifier" do
-      assert_equal "Whenever generated tasks for: DEFAULT", @command.send(:comment_base)
-    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