whenever 0.9.2 → 0.9.3

data/test/unit/job_test.rb

@@ -1,124 +1,114 @@
-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 the :roles set when #roles is called" do
-      assert_equal ['foo', 'bar'], new_job(:roles => ['foo', 'bar']).roles
-    end
-
-    should "return whether it has a role from #has_role?" do
-      assert new_job(:roles => 'foo').has_role?('foo')
-      assert_equal false, new_job(:roles => 'bar').has_role?('foo')
-    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
-
-    should "not substitute parameters for which no value is set" do
-      assert_equal 'Hello :world', new_job(:template => ':matching :world', :matching => 'Hello').output
-    end
-
-    should "escape the :path" do
-      assert_equal '/my/spacey\ path', new_job(:template => ':path', :path => '/my/spacey path').output
-    end
-
-    should "escape percent signs" do
-      job = new_job(
-        :template => "before :foo after",
-        :foo => "percent -> % <- percent"
-      )
-      assert_equal %q(before percent -> \% <- percent after), job.output
-    end
-
-    should "assume percent signs are not already escaped" do
-      job = new_job(
-        :template => "before :foo after",
-        :foo => %q(percent preceded by a backslash -> \% <-)
-      )
-      assert_equal %q(before percent preceded by a backslash -> \\\% <- after), job.output
-    end
-
-    should "squish spaces and newlines" do
-      job = new_job(
-        :template => "before :foo after",
-        :foo => "newline -> \n <- newline space ->     <- space"
-      )
-
-      assert_equal "before newline -> <- newline space -> <- space after", job.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 "reuse parameter in the job template" do
-      job = new_job(:template => ':path :task', :path => 'path', :task => "abc123", :job_template => ':path left :job right')
-      assert_equal 'path left path 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)
+require 'test_helper'
+
+class JobTest < Whenever::TestCase
+  should "return the :at set when #at is called" do
+    assert_equal 'foo', new_job(:at => 'foo').at
+  end
+
+  should "return the :roles set when #roles is called" do
+    assert_equal ['foo', 'bar'], new_job(:roles => ['foo', 'bar']).roles
+  end
+
+  should "return whether it has a role from #has_role?" do
+    assert new_job(:roles => 'foo').has_role?('foo')
+    assert_equal false, new_job(:roles => 'bar').has_role?('foo')
+  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
+
+  should "not substitute parameters for which no value is set" do
+    assert_equal 'Hello :world', new_job(:template => ':matching :world', :matching => 'Hello').output
+  end
+
+  should "escape the :path" do
+    assert_equal '/my/spacey\ path', new_job(:template => ':path', :path => '/my/spacey path').output
+  end
+
+  should "escape percent signs" do
+    job = new_job(
+      :template => "before :foo after",
+      :foo => "percent -> % <- percent"
+    )
+    assert_equal %q(before percent -> \% <- percent after), job.output
+  end
+
+  should "assume percent signs are not already escaped" do
+    job = new_job(
+      :template => "before :foo after",
+      :foo => %q(percent preceded by a backslash -> \% <-)
+    )
+    assert_equal %q(before percent preceded by a backslash -> \\\% <- after), job.output
+  end
+
+  should "squish spaces and newlines" do
+    job = new_job(
+      :template => "before :foo after",
+      :foo => "newline -> \n <- newline space ->     <- space"
+    )
+
+    assert_equal "before newline -> <- newline space -> <- space after", job.output
+  end
+end
+
+
+class JobWithQuotesTest < Whenever::TestCase
+  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
+
+class JobWithJobTemplateTest < Whenever::TestCase
+  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 "reuse parameter in the job template" do
+    job = new_job(:template => ':path :task', :path => 'path', :task => "abc123", :job_template => ':path left :job right')
+    assert_equal 'path left path 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

data/whenever.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "chronic", ">= 0.6.3"
-  s.add_dependency "activesupport", ">= 2.3.4"
 
-  s.add_development_dependency "shoulda", ">= 2.1.1"
   s.add_development_dependency "mocha", ">= 0.9.5"
   s.add_development_dependency "rake"
 end

metadata

@@ -1,83 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.4
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Clean ruby syntax for writing and deploying cron jobs.
@@ -89,8 +61,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -108,6 +80,7 @@ files:
 - lib/whenever/cron.rb
 - lib/whenever/job.rb
 - lib/whenever/job_list.rb
+- lib/whenever/numeric_seconds.rb
 - lib/whenever/output_redirection.rb
 - lib/whenever/setup.rb
 - lib/whenever/tasks/whenever.rake
@@ -119,6 +92,7 @@ files:
 - test/functional/output_env_test.rb
 - test/functional/output_jobs_for_roles_test.rb
 - test/functional/output_redirection_test.rb
+- test/test_case.rb
 - test/test_helper.rb
 - test/unit/capistrano_support_test.rb
 - test/unit/cron_test.rb
@@ -134,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cron jobs in ruby.