whenever 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca12a3bcee3b722d97603d4b68c6dbb1a9340bde
-  data.tar.gz: 4c14d0e96f2fc3e2fff8f4b1d06217184d6d2a5a
+  metadata.gz: c96bb55bfcc94c54bab65174a8fb046aa4bfcff1
+  data.tar.gz: fbce8b6cd1f6c8558e9281af9f6cbccade7dcd71
 SHA512:
-  metadata.gz: 43e5babdecdfe28f925233cf41c04f2caae3b6796c433a30baa265d47c0b82f3d7fe570ee6b84e64ac3e5b4f9e28b252265361c78e24f2699466399ce0d43bde
-  data.tar.gz: 6ab32597cd5cfc23ee23e16e072589cbfc33fad7da0ac460707fadb60a01b3dc41c28862b8903be785aa588681ecd410e648ddc052ce138f8ec5dddecb990112
+  metadata.gz: a23ed3067c55356fb7f98f18d267d508d410cbe63a9ea2dc1f3aaa491bfa6df03cf856ff315a2adb64290cab7fa9348ed486ac362afec8b35583d4efc251eef6
+  data.tar.gz: 3e79b8eba708dd80fa79fa8ba80a81205a889f196f6a5a00ee3cdfce82c669ef93e96a10c321cfb4c7cd7fe9addc1ca75860aaa5c082da6ed6400def6c42d575

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 * Time zone support
 
 
+### 0.8.4 / July 22, 2012
+
+* Don't require schedule file when clearing. [Javan Makhmali]
+
+* Use bin/rails when available. [Javan Makhmali]
+
+
 ### 0.8.3 / July 11, 2013
 
 * Improve Cap rollback logic. [Jeroen Jacobs]

data/lib/whenever.rb

@@ -19,7 +19,11 @@ module Whenever
     Dir.pwd
   end
 
-  def self.rails3?
+  def self.bin_rails?
+    File.exists?(File.join(path, 'bin', 'rails'))
+  end
+
+  def self.script_rails?
     File.exists?(File.join(path, 'script', 'rails'))
   end
 

data/lib/whenever/command_line.rb

@@ -6,15 +6,15 @@ module Whenever
     def self.execute(options={})
       new(options).run
     end
-    
+
     def initialize(options={})
       @options = options
-      
+
       @options[:file]       ||= 'config/schedule.rb'
       @options[:cut]        ||= 0
       @options[:identifier] ||= default_identifier
-      
-      unless File.exists?(@options[:file])
+
+      if !File.exists?(@options[:file]) && @options[:clear].nil?
         warn("[fail] Can't find file: #{@options[:file]}")
         exit(1)
       end
@@ -30,7 +30,7 @@ module Whenever
       end
       @options[:cut] = @options[:cut].to_i
     end
-    
+
     def run
       if @options[:update] || @options[:clear]
         write_crontab(updated_crontab)
@@ -43,28 +43,28 @@ module Whenever
         exit(0)
       end
     end
-    
+
   protected
-    
+
     def default_identifier
       File.expand_path(@options[:file])
     end
-  
+
     def whenever_cron
       return '' if @options[:clear]
       @whenever_cron ||= [comment_open, Whenever.cron(@options), comment_close].compact.join("\n") + "\n"
     end
-    
+
     def read_crontab
       return @current_crontab if @current_crontab
-      
+
       command = ['crontab -l']
       command << "-u #{@options[:user]}" if @options[:user]
-      
+
       command_results  = %x[#{command.join(' ')} 2> /dev/null]
       @current_crontab = $?.exitstatus.zero? ? prepare(command_results) : ''
     end
-    
+
     def write_crontab(contents)
       tmp_cron_file = Tempfile.open('whenever_tmp_cron')
       tmp_cron_file << contents
@@ -86,8 +86,8 @@ module Whenever
         exit(1)
       end
     end
-    
-    def updated_crontab   
+
+    def updated_crontab
       # Check for unopened or unclosed identifier blocks
       if read_crontab =~ Regexp.new("^#{comment_open}\s*$") && (read_crontab =~ Regexp.new("^#{comment_close}\s*$")).nil?
         warn "[fail] Unclosed indentifier; Your crontab file contains '#{comment_open}', but no '#{comment_close}'"
@@ -96,7 +96,7 @@ module Whenever
         warn "[fail] Unopened indentifier; Your crontab file contains '#{comment_close}', but no '#{comment_open}'"
         exit(1)
       end
-      
+
       # If an existing identier block is found, replace it with the new cron entries
       if read_crontab =~ Regexp.new("^#{comment_open}\s*$") && read_crontab =~ Regexp.new("^#{comment_close}\s*$")
         # If the existing crontab file contains backslashes they get lost going through gsub.
@@ -106,7 +106,7 @@ module Whenever
         [read_crontab, whenever_cron].join("\n\n")
       end.gsub(/\n{3,}/, "\n\n") # More than two newlines becomes just two.
     end
-    
+
     def prepare(contents)
       # Strip n lines from the top of the file as specified by the :cut option.
       # Use split with a -1 limit option to ensure the join is able to rebuild
@@ -114,19 +114,19 @@ module Whenever
       stripped_contents = contents.split($/,-1)[@options[:cut]..-1].join($/)
 
       # Some cron implementations require all non-comment lines to be newline-
-      # terminated. (issue #95) Strip all newlines and replace with the default 
+      # terminated. (issue #95) Strip all newlines and replace with the default
       # platform record seperator ($/)
       stripped_contents.gsub!(/\s+$/, $/)
     end
-    
+
     def comment_base
       "Whenever generated tasks for: #{@options[:identifier]}"
     end
-    
+
     def comment_open
       "# Begin #{comment_base}"
     end
-    
+
     def comment_close
       "# End #{comment_base}"
     end

data/lib/whenever/setup.rb

@@ -20,9 +20,16 @@ else
   job_type :script, "cd :path && :environment_variable=:environment script/:task :output"
 end
 
-# Create a runner job that's appropriate for the Rails version,
-if Whenever.rails3?
-  job_type :runner, "cd :path && script/rails runner -e :environment ':task' :output"
-else
-  job_type :runner, "cd :path && script/runner -e :environment ':task' :output"
+# Create a runner job that's appropriate for the Rails version
+def runner_for_app
+  case
+  when Whenever.bin_rails?
+    "bin/rails runner"
+  when Whenever.script_rails?
+    "script/rails runner"
+  else
+    "script/runner"
+  end
 end
+
+job_type :runner, "cd :path && #{runner_for_app} -e :environment ':task' :output"

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/test/functional/command_line_test.rb

@@ -161,6 +161,18 @@ NEW_CRON
     end
   end
 
+  context "A command line clear with no schedule file" do
+    setup do
+      File.expects(:exists?).with('config/schedule.rb').returns(false)
+      @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
+    end
+
+    should "run successfully" do
+      @command.expects(:write_crontab).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)

data/test/functional/output_default_defined_jobs_test.rb

@@ -107,10 +107,10 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
     end
   end
 
-  context "A runner for a Rails 3 app" do
+  context "A runner for an app with bin/rails" do
     setup do
       Whenever.expects(:path).at_least_once.returns('/my/path')
-      Whenever.expects(:rails3?).returns(true)
+      Whenever.expects(:bin_rails?).returns(true)
       @output = Whenever.cron \
       <<-file
         set :job_template, nil
@@ -120,7 +120,25 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
       file
     end
 
-    should "use the Rails 3 runner job by default" do
+    should "use a script/rails runner job by default" do
+      assert_match two_hours + %( cd /my/path && bin/rails runner -e production 'blahblah'), @output
+    end
+  end
+
+  context "A runner for an app with script/rails" do
+    setup do
+      Whenever.expects(:path).at_least_once.returns('/my/path')
+      Whenever.expects(:script_rails?).returns(true)
+      @output = Whenever.cron \
+      <<-file
+        set :job_template, nil
+        every 2.hours do
+          runner 'blahblah'
+        end
+      file
+    end
+
+    should "use a script/rails runner job by default" do
       assert_match two_hours + %( cd /my/path && script/rails runner -e production 'blahblah'), @output
     end
   end
@@ -288,4 +306,4 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/whenever.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Javan Makhmali"]
   s.email       = ["javan@javan.us"]
+  s.license     = "MIT"
   s.homepage    = ""
   s.summary     = %q{Cron jobs in ruby.}
   s.description = %q{Clean ruby syntax for writing and deploying cron jobs.}
@@ -17,9 +18,14 @@ 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-matchers", "2.0.0"
+  if RUBY_VERSION < "1.9"
+    s.add_dependency "activesupport", ">= 2.3.4", "< 4.0"
+  else
+    s.add_dependency "activesupport", ">= 2.3.4"
+  end
+
+  s.add_development_dependency "shoulda-matchers", "<= 2.0.0" if RUBY_VERSION < "1.9"
   s.add_development_dependency "shoulda", ">= 2.1.1"
   s.add_development_dependency "mocha", ">= 0.9.5"
   s.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.4
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +122,8 @@ files:
 - test/unit/job_test.rb
 - whenever.gemspec
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []