whenever 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45d31ad9d0535d3e5b79e9420714c159a44266b8
-  data.tar.gz: e9e99760aca30abb3ae2b7a7569d77166d11e205
+  metadata.gz: 90a239b0bdc14e0d2f4bd9a8c843d57a35ce5c29
+  data.tar.gz: 457745a241466428c7494fa0c935afbd1352b66b
 SHA512:
-  metadata.gz: b3f29312f580f5b9a934fa690a1de8f968ae0f7c6219205ac4a8e5fcaf787a6ea1e50a1495ba5f2c82bd4ab4da3d28804344c61228c651221f6c5ee235aee623
-  data.tar.gz: 03570878c3907abc60ccac4ccd744449e7899db91bef4790b03b3313e5188cb1d04352533597d7c0939de11bd95ffe26e071821e1e020eb99b650f7fb7db71f0
+  metadata.gz: 216ead8ef6df7db0003c1b5b56d0de0bdebd148a5e64d77d10945af9e2a5109302f94f0422cacd4170228936dcc24fa23681e55feeec983f69b299d588cd612b
+  data.tar.gz: 43a7f84ad7b6f4bcc770d68ebbe02587eb69b42963a58389a9d36fac0bcfe10a8ab9b8611384739fad5eb2415d9f8437f183ce1460b9f3dae8669cd3f05e1272

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 doc
 .*.sw[a-z]
 Gemfile.lock
+gemfiles/*.lock

data/.travis.yml

@@ -1,12 +1,18 @@
 language: ruby
 script: bundle exec rake
+
+before_install:
+  - gem install bundler
+
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - ree
+  - 2.2.0
+  - 2.3.0
   - jruby
-  - jruby-18mode
-  - jruby-19mode
+
+gemfile:
+  - Gemfile
+  - gemfiles/activesupport4.1.gemfile
+  - gemfiles/activesupport4.2.gemfile

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+### develop
+
+### 0.9.5 / June 12, 2016
+
+* Improve documentation [Ben Langfeld, Spencer Fry]
+
+* Properly support Solaris / SmartOS [Steven Williamson]
+
+* Drop support for Ruby < 1.9.3. Test newer Ruby versions. [Javan Makhmali, Bartłomiej Kozal]
+
+* Suport Ruby 2.3.0 and Rails 4 [Vincent Boisard]
+
+* Set `RAILS_ENV` correctly in schedule when writing crontab from Capistrano [Ben Langfeld, Lorenzo Manacorda]
+
+* Minor refactoring, avoidance of Ruby warnings, etc [Ben Langfeld, DV Dasari]
+
+* Correctly pass through date expressions (e.g. `1.day`) inside job definitions [Rafael Sales]
+
+* Prevent writing invalid cron strings [Danny Fallon, Ben Langfeld]
+
+* Execute runner with `bundle exec` to ensure presence of app dependencies [Judith Roth]
+
+
 ### 0.9.4 / October 24, 2014
 
 * Fix duplicated command line arguments when deploying to multiple servers with Cap 3. [betesh]

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Javan Makhmali
+Copyright (c) 2016 Javan Makhmali
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -21,6 +21,23 @@ $ wheneverize .
 
 This will create an initial `config/schedule.rb` file for you.
 
+### The `whenever` command
+
+```sh
+$ cd /apps/my-great-project
+$ whenever
+```
+
+This will simply show you your `schedule.rb` file converted to cron syntax. It does not read or write your crontab file; you'll need to do this in order for your jobs to execute:
+
+```sh
+$ whenever --update-crontab
+```
+
+You can list installed cron jobs using `crontab -l`.
+
+Run `whenever --help` for a complete list of options for selecting the schedule to use, setting variables in the schedule, selecting a user as which to install the crontab, etc.
+
 ### Example schedule.rb file
 
 ```ruby
@@ -74,7 +91,7 @@ The default job types that ship with Whenever are defined like so:
 ```ruby
 job_type :command, ":task :output"
 job_type :rake,    "cd :path && :environment_variable=:environment bundle exec rake :task --silent :output"
-job_type :runner,  "cd :path && script/rails runner -e :environment ':task' :output"
+job_type :runner,  "cd :path && bin/rails runner -e :environment ':task' :output"
 job_type :script,  "cd :path && :environment_variable=:environment bundle exec script/:task :output"
 ```
 
@@ -139,14 +156,14 @@ In your "Capfile" file:
 require "whenever/capistrano"
 ```
 
-Take a look at the load:defaults (bottom of file) task for options you can set. <https://github.com/javan/whenever/blob/master/lib/whenever/capistrano/v3/tasks/whenever.rake>. For example, to namespace the crontab entries by application and stage do this.
-
-In your  in "config/deploy.rb" file:
+Take a look at the [load:defaults task](https://github.com/javan/whenever/blob/master/lib/whenever/capistrano/v3/tasks/whenever.rake) (bottom of file) for options you can set. For example, to namespace the crontab entries by application and stage do this in your "config/deploy.rb" file:
 
 ```ruby
 set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }
 ```
 
+The Capistrano integration by default expects the `:application` variable to be set in order to scope jobs in the crontab.
+
 ### Capistrano roles
 
 The first thing to know about the new roles support is that it is entirely
@@ -211,14 +228,13 @@ If your production environment uses RVM (Ruby Version Manager) you will run into
 
 This tells rvm to trust all rvmrc files.
 
-### The `whenever` command
+### Heroku?
 
-```sh
-$ cd /apps/my-great-project
-$ whenever
-```
+No. Heroku does not support cron, instead providing [Heroku Scheduler](https://devcenter.heroku.com/articles/scheduler). If you deploy to Heroku, you should use that rather than Whenever.
+
+### Testing
 
-This will simply show you your `schedule.rb` file converted to cron syntax. It does not read or write your crontab file. Run `whenever --help` for a complete list of options.
+[whenever-test](https://github.com/heartbits/whenever-test) is an extension to Whenever for testing a Whenever schedule.
 
 ### Credit
 
@@ -237,8 +253,8 @@ It's a little bit dated now, but remains a good introduction.
 
 ----
 
-Compatible with Ruby 1.8.7-2.1.0, JRuby, and Rubinius. [![Build Status](https://secure.travis-ci.org/javan/whenever.png)](http://travis-ci.org/javan/whenever)
+[![Build Status](https://secure.travis-ci.org/javan/whenever.png)](http://travis-ci.org/javan/whenever)
 
 ----
 
-Copyright &copy; 2014 Javan Makhmali
+Copyright &copy; 2016 Javan Makhmali

data/Rakefile

@@ -1,17 +1,10 @@
-begin
-  require 'bundler'
-rescue LoadError => e
-  warn("warning: Could not load bundler: #{e}")
-  warn("         Some rake tasks will not be defined")
-else
-  Bundler::GemHelper.install_tasks
-end
-
+require 'bundler/gem_tasks'
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |test|
   test.libs      << 'lib' << 'test'
   test.pattern   = 'test/{functional,unit}/**/*_test.rb'
   test.verbose   = true
 end
 
-task :default => :test
+task :default => :test

data/bin/wheneverize

@@ -18,7 +18,7 @@ OptionParser.new do |opts|
 end
 
 unless ARGV.empty?
-  if !File.exists?(ARGV.first)
+  if !File.exist?(ARGV.first)
     abort "`#{ARGV.first}' does not exist."
   elsif !File.directory?(ARGV.first)
     abort "`#{ARGV.first}' is not a directory."
@@ -54,11 +54,11 @@ file = 'config/schedule.rb'
 base = ARGV.empty? ? '.' : ARGV.shift
 
 file = File.join(base, file)
-if File.exists?(file)
+if File.exist?(file)
   warn "[skip] `#{file}' already exists"
-elsif File.exists?(file.downcase)
+elsif File.exist?(file.downcase)
   warn "[skip] `#{file.downcase}' exists, which could conflict with `#{file}'"
-elsif !File.exists?(File.dirname(file))
+elsif !File.exist?(File.dirname(file))
   warn "[skip] directory `#{File.dirname(file)}' does not exist"
 else
   puts "[add] writing `#{file}'"

data/gemfiles/activesupport4.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1.0"
+
+gemspec path: "../"

data/gemfiles/activesupport4.2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0"
+
+gemspec path: "../"

data/lib/whenever.rb

@@ -1,9 +1,11 @@
+require 'whenever/numeric'
 require 'whenever/numeric_seconds'
 require 'whenever/job_list'
 require 'whenever/job'
 require 'whenever/command_line'
 require 'whenever/cron'
 require 'whenever/output_redirection'
+require 'whenever/os'
 
 module Whenever
   def self.cron(options)
@@ -19,14 +21,14 @@ module Whenever
   end
 
   def self.bin_rails?
-    File.exists?(File.join(path, 'bin', 'rails'))
+    File.exist?(File.join(path, 'bin', 'rails'))
   end
 
   def self.script_rails?
-    File.exists?(File.join(path, 'script', 'rails'))
+    File.exist?(File.join(path, 'script', 'rails'))
   end
 
   def self.bundler?
-    File.exists?(File.join(path, 'Gemfile'))
+    File.exist?(File.join(path, 'Gemfile'))
   end
 end

data/lib/whenever/capistrano/v2/recipes.rb

@@ -7,7 +7,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset(:whenever_options)      { {:roles => fetch(:whenever_roles)} }
   _cset(:whenever_command)      { "whenever" }
   _cset(:whenever_identifier)   { fetch :application }
-  _cset(:whenever_environment)  { fetch :rails_env, "production" }
+  _cset(:whenever_environment)  { fetch :rails_env, fetch(:stage, "production") }
   _cset(:whenever_variables)    { "environment=#{fetch :whenever_environment}" }
   _cset(:whenever_update_flags) { "--update-crontab #{fetch :whenever_identifier} --set #{fetch :whenever_variables}" }
   _cset(:whenever_clear_flags)  { "--clear-crontab #{fetch :whenever_identifier}" }

data/lib/whenever/capistrano/v3/tasks/whenever.rake

@@ -5,8 +5,10 @@ namespace :whenever do
     on roles fetch(:whenever_roles) do |host|
       args_for_host = block_given? ? args + Array(yield(host)) : args
       within release_path do
-        with fetch(:whenever_command_environment_variables) do
-          execute *args_for_host
+        with rails_env: fetch(:whenever_environment) do
+          with fetch(:whenever_command_environment_variables) do
+            execute *args_for_host
+          end
         end
       end
     end

data/lib/whenever/command_line.rb

@@ -13,7 +13,7 @@ module Whenever
       @options[:cut]        ||= 0
       @options[:identifier] ||= default_identifier
 
-      if !File.exists?(@options[:file]) && @options[:clear].nil?
+      if !File.exist?(@options[:file]) && @options[:clear].nil?
         warn("[fail] Can't find file: #{@options[:file]}")
         exit(1)
       end
@@ -67,7 +67,8 @@ module Whenever
     def write_crontab(contents)
       command = ['crontab']
       command << "-u #{@options[:user]}" if @options[:user]
-      command << "-"
+      # Solaris/SmartOS cron does not support the - option to read from stdin.
+      command << "-" unless OS.solaris?
 
       IO.popen(command.join(' '), 'r+') do |crontab|
         crontab.write(contents)

data/lib/whenever/cron.rb

@@ -4,7 +4,7 @@ module Whenever
   module Output
     class Cron
       KEYWORDS = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly]
-      REGEX = /^(@(#{KEYWORDS.join '|'})|.+\s+.+\s+.+\s+.+\s+.+.?)$/
+      REGEX = /^(@(#{KEYWORDS.join '|'})|((\*?[\d\/,\-]*)\s*){5})$/
 
       attr_accessor :time, :task
 
@@ -43,8 +43,9 @@ module Whenever
       end
 
       def time_in_cron_syntax
+        @time = @time.to_i if @time.is_a?(Numeric) # Compatibility with `1.day` format using ruby 2.3 and activesupport
         case @time
-          when REGEX  then @time # raw cron sytax given
+          when REGEX  then @time # raw cron syntax given
           when Symbol then parse_symbol
           when String then parse_as_string
           else parse_time

data/lib/whenever/job_list.rb

@@ -21,8 +21,8 @@ module Whenever
         File.read(options[:file])
       end
 
-      instance_eval(Whenever::NumericSeconds.process_string(setup), setup_file)
-      instance_eval(Whenever::NumericSeconds.process_string(schedule), options[:file] || '<eval>')
+      instance_eval(setup, setup_file)
+      instance_eval(schedule, options[:file] || '<eval>')
     end
 
     def set(variable, value)
@@ -45,7 +45,7 @@ module Whenever
     end
 
     def job_type(name, template)
-      singleton_class_shim.class_eval do
+      singleton_class.class_eval do
         define_method(name) do |task, *args|
           options = { :task => task, :template => template }
           options.merge!(args[0]) if args[0].is_a? Hash
@@ -67,17 +67,6 @@ module Whenever
 
   private
 
-    # The Object#singleton_class method only became available in MRI 1.9.2, so
-    # we need this to maintain 1.8 compatibility. Once 1.8 support is dropped,
-    # this can be removed
-    def singleton_class_shim
-      if self.respond_to?(:singleton_class)
-        singleton_class
-      else
-        class << self; self; end
-      end
-    end
-
     #
     # Takes a string like: "variable1=something&variable2=somethingelse"
     # and breaks it into variable/value pairs. Used for setting variables at runtime from the command line.

data/lib/whenever/numeric.rb

@@ -0,0 +1,13 @@
+class Numeric
+  def respond_to?(method, include_private = false)
+    super || Whenever::NumericSeconds.public_method_defined?(method)
+  end
+
+  def method_missing(method, *args, &block)
+    if Whenever::NumericSeconds.public_method_defined?(method)
+      Whenever::NumericSeconds.new(self).send(method)
+    else
+      super
+    end
+  end
+end

data/lib/whenever/numeric_seconds.rb

@@ -1,17 +1,11 @@
 module Whenever
   class NumericSeconds
-    PATTERN = /(\d+)\.(seconds?|minutes?|hours?|days?|weeks?|months?|years?)/
-
     attr_reader :number
 
     def self.seconds(number, units)
       new(number).send(units)
     end
 
-    def self.process_string(string)
-      string.gsub(PATTERN) { Whenever.seconds($1, $2) }
-    end
-
     def initialize(number)
       @number = number.to_i
     end

data/lib/whenever/os.rb

@@ -0,0 +1,7 @@
+module Whenever
+  module OS
+    def self.solaris?
+      (/solaris/ =~ RUBY_PLATFORM)
+    end
+  end
+end

data/lib/whenever/setup.rb

@@ -23,4 +23,4 @@ set :bundle_command, Whenever.bundler? ? "bundle exec" : ""
 job_type :command, ":task :output"
 job_type :rake,    "cd :path && :environment_variable=:environment :bundle_command rake :task --silent :output"
 job_type :script,  "cd :path && :environment_variable=:environment :bundle_command script/:task :output"
-job_type :runner,  "cd :path && :runner_command -e :environment ':task' :output"
+job_type :runner,  "cd :path && :bundle_command :runner_command -e :environment ':task' :output"

data/lib/whenever/tasks/whenever.rake

@@ -0,0 +1 @@
+../capistrano/v3/tasks/whenever.rake

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/test/functional/command_line_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class CommandLineWriteTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).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)
@@ -26,7 +26,7 @@ end
 
 class CommandLineUpdateTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).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)
@@ -90,7 +90,7 @@ class CommandLineUpdateWithBackslashesTest < Whenever::TestCase
 script/runner -e production 'puts '\\''hello'\\'''
 # End Whenever generated tasks for: My identifier
 EXISTING_CRON
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
     @command.expects(:read_crontab).at_least_once.returns(@existing)
     @command.expects(:whenever_cron).returns(@existing)
@@ -111,7 +111,7 @@ EXISTING_CRON
 # Begin Whenever generated tasks for: Whenever
 # End Whenever generated tasks for: Whenever
 NEW_CRON
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:update => true, :identifier => 'Whenever')
     @command.expects(:read_crontab).at_least_once.returns(@existing)
     @command.expects(:whenever_cron).returns(@new)
@@ -124,7 +124,7 @@ end
 
 class CommandLineClearTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
     @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
     @task = "#{two_hours} /my/command"
   end
@@ -161,7 +161,7 @@ end
 
 class CommandLineClearWithNoScheduleTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(false)
+    File.expects(:exist?).with('config/schedule.rb').returns(false)
     @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
   end
 
@@ -173,7 +173,7 @@ end
 
 class CommandLineUpdateWithNoIdentifierTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
     Whenever::CommandLine.any_instance.expects(:default_identifier).returns('DEFAULT')
     @command = Whenever::CommandLine.new(:update => true, :file => @file)
   end
@@ -187,7 +187,7 @@ class CombinedParamsTest < Whenever::TestCase
   setup do
     Whenever::CommandLine.any_instance.expects(:exit)
     Whenever::CommandLine.any_instance.expects(:warn)
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
   end
 
   should "exit with write and clear" do
@@ -217,7 +217,7 @@ class RunnerOverwrittenWithSetOptionTest < Whenever::TestCase
   end
 
   should "output the runner using the override environment" do
-    assert_match two_hours + %( cd /my/path && script/runner -e serious 'blahblah'), @output
+    assert_match two_hours + %( cd /my/path && bundle exec script/runner -e serious 'blahblah'), @output
   end
 end
 
@@ -236,7 +236,7 @@ class EnvironmentAndPathOverwrittenWithSetOptionTest < Whenever::TestCase
   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
+    assert_match two_hours + %( cd /serious/path && bundle exec script/runner -e serious 'blahblah'), @output
   end
 end
 
@@ -254,7 +254,7 @@ class EnvironmentAndPathOverwrittenWithSetOptionWithSpacesTest < Whenever::TestC
   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
+    assert_match two_hours + %( cd /serious/path && bundle exec script/runner -e serious 'blahblah'), @output
   end
 end
 
@@ -272,13 +272,13 @@ class EnvironmentOverwrittenWithoutValueTest < Whenever::TestCase
   end
 
   should "output the runner using the original environmnet" do
-    assert_match two_hours + %( cd /silly/path && script/runner -e silly 'blahblah'), @output
+    assert_match two_hours + %( cd /silly/path && bundle exec script/runner -e silly 'blahblah'), @output
   end
 end
 
 class PreparingOutputTest < Whenever::TestCase
   setup do
-    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    File.expects(:exist?).with('config/schedule.rb').returns(true)
   end
 
   should "not trim off the top lines of the file" do

data/test/functional/output_at_test.rb

@@ -69,11 +69,11 @@ class OutputAtTest < Whenever::TestCase
       set :job_template, nil
       set :path, '/your/path'
       every "mon,wed,fri", :at => '5:02am, 3:02pm' do
-        runner "blahblah"
+        runner "Worker.perform_async(1.day.ago)"
       end
     file
 
-    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 && bundle exec script/runner -e production 'Worker.perform_async(1.day.ago)'), output
   end
 
   test "various days at a various aligned times using a rake task" do
@@ -138,9 +138,9 @@ class OutputAtTest < Whenever::TestCase
     file
 
     assert_match '@daily cd /your/path && RAILS_ENV=production bundle exec rake blah:blah --silent', output
-    assert_match %(@daily cd /your/path && script/runner -e production 'runner_1'), output
+    assert_match %(@daily cd /your/path && bundle exec 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 && bundle exec script/runner -e production 'runner_2'), output
     assert_match '@daily command_2', output
   end
 

data/test/functional/output_default_defined_jobs_test.rb

@@ -13,7 +13,7 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah$/, output)
   end
 
   test "A plain command with no job template set" do
@@ -24,7 +24,7 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ \/bin\/bash -l -c 'blahblah'$/, output
+    assert_match(/^.+ .+ .+ .+ \/bin\/bash -l -c 'blahblah'$/, output)
   end
 
   test "A plain command with a job_template using a normal parameter" do
@@ -37,7 +37,7 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ \/bin\/bash -l -c 'cd \/tmp \&\& blahblah'$/, output
+    assert_match(/^.+ .+ .+ .+ \/bin\/bash -l -c 'cd \/tmp \&\& blahblah'$/, output)
   end
 
   test "A plain command that overrides the job_template set" do
@@ -50,8 +50,8 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
     file
 
 
-    assert_match /^.+ .+ .+ .+ \/bin\/sh -l -c 'blahblah'$/, output
-    assert_no_match /bash/, output
+    assert_match(/^.+ .+ .+ .+ \/bin\/sh -l -c 'blahblah'$/, output)
+    assert_no_match(/bash/, output)
   end
 
   test "A plain command that overrides the job_template set using a parameter" do
@@ -65,8 +65,8 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
     file
 
 
-    assert_match /^.+ .+ .+ .+ \/bin\/sh -l -c 'cd \/tmp && blahblah'$/, output
-    assert_no_match /bash/, output
+    assert_match(/^.+ .+ .+ .+ \/bin\/sh -l -c 'cd \/tmp && blahblah'$/, output)
+    assert_no_match(/bash/, output)
   end
 
   test "A plain command that is conditional on default environent and path" do
@@ -81,7 +81,7 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match /blahblah/, output
+    assert_match(/blahblah/, output)
   end
 
   # runner
@@ -96,7 +96,7 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match two_hours + %( cd /my/path && script/runner -e production 'blahblah'), output
+    assert_match two_hours + %( cd /my/path && bundle exec script/runner -e production 'blahblah'), output
   end
 
   test "A runner that overrides the path set" do
@@ -109,7 +109,21 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
       end
     file
 
-    assert_match two_hours + %( cd /some/other/path && script/runner -e production 'blahblah'), output
+    assert_match two_hours + %( cd /some/other/path && bundle exec script/runner -e production 'blahblah'), output
+  end
+
+  test "A runner for a non-bundler app" do
+    Whenever.expects(:bundler?).returns(false)
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :path, '/my/path'
+      every 2.hours do
+        runner 'blahblah'
+      end
+    file
+
+    assert_match two_hours + %( cd /my/path && script/runner -e production 'blahblah'), output
   end
 
   test "A runner for an app with bin/rails" do
@@ -155,6 +169,19 @@ class OutputDefaultDefinedJobsTest < Whenever::TestCase
     assert_match two_hours + ' cd /my/path && RAILS_ENV=production bundle exec rake blahblah --silent', output
   end
 
+  test "A rake command with arguments" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :path, '/my/path'
+      every 2.hours do
+        rake "blahblah[foobar]"
+      end
+    file
+
+    assert_match two_hours + ' cd /my/path && RAILS_ENV=production bundle exec rake blahblah[foobar] --silent', output
+  end
+
   test "A rake for a non-bundler app" do
     Whenever.expects(:path).at_least_once.returns('/my/path')
     Whenever.expects(:bundler?).returns(false)

data/test/functional/output_defined_job_test.rb

@@ -11,7 +11,7 @@ class OutputDefinedJobTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ before during after$/, output
+    assert_match(/^.+ .+ .+ .+ before during after$/, output)
   end
 
   test "defined job with a :task and some options" do
@@ -24,7 +24,7 @@ class OutputDefinedJobTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ before during after happy birthday$/, output
+    assert_match(/^.+ .+ .+ .+ before during after happy birthday$/, output)
   end
 
   test "defined job with a :task and an option where the option is set globally" do
@@ -38,7 +38,7 @@ class OutputDefinedJobTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ before during after happy$/, output
+    assert_match(/^.+ .+ .+ .+ before during after happy$/, output)
   end
 
   test "defined job with a :task and an option where the option is set globally and locally" do
@@ -52,7 +52,7 @@ class OutputDefinedJobTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ before during after local$/, output
+    assert_match(/^.+ .+ .+ .+ before during after local$/, output)
   end
 
   test "defined job with a :task and an option that is not set" do
@@ -65,7 +65,7 @@ class OutputDefinedJobTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ before during after :option1$/, output
+    assert_match(/^.+ .+ .+ .+ before during after :option1$/, output)
   end
 
   test "defined job that uses a :path where none is explicitly set" do

data/test/functional/output_redirection_test.rb

@@ -11,7 +11,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, output)
   end
 
 
@@ -25,7 +25,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, output)
   end
 
   test "command when the error and standard output is set by the command" do
@@ -37,7 +37,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
   end
 
   test "command when the output is set and the comand overrides it" do
@@ -50,8 +50,8 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
-    assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, output
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, output)
   end
 
   test "command when the output is set and the comand overrides with standard and error" do
@@ -64,8 +64,8 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
-    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
   end
 
   test "command when the output is set and the comand rejects it" do
@@ -78,8 +78,8 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
-    assert_match /^.+ .+ .+ .+ blahblah$/, output
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah$/, output)
   end
 
   test "command when the output is set and is overridden by the :set option" do
@@ -92,8 +92,8 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output
-    assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, output
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, output)
   end
 
   test "command when the error and standard output is set" do
@@ -106,7 +106,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
   end
 
   test "command when error output is set" do
@@ -119,7 +119,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah 2>> dev_null$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah 2>> dev_null$/, output)
   end
 
   test "command when the standard output is set" do
@@ -132,7 +132,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_out$/, output)
   end
 
   test "command when error output is set by the command" do
@@ -144,7 +144,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah 2>> dev_err$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah 2>> dev_err$/, output)
   end
 
   test "command when standard output is set by the command" do
@@ -156,7 +156,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_out$/, output)
   end
 
   test "command when standard output is set to nil" do
@@ -168,7 +168,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah > \/dev\/null$/, output)
   end
 
   test "command when standard error is set to nil" do
@@ -180,7 +180,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, output)
   end
 
   test "command when standard output and standard error is set to nil" do
@@ -192,7 +192,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, output)
   end
 
   test "command when standard output is set and standard error is set to nil" do
@@ -204,7 +204,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, output)
   end
 
   test "command when standard output is nil and standard error is set" do
@@ -216,7 +216,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, output)
   end
 
   test "command when the deprecated :cron_log is set" do
@@ -229,7 +229,7 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, output)
   end
 
 
@@ -243,6 +243,6 @@ class OutputRedirectionTest < Whenever::TestCase
       end
     file
 
-    assert_match /^.+ .+ .+ .+ blahblah 2>&1 | logger -t whenever_cron$/, output
+    assert_match(/^.+ .+ .+ .+ blahblah 2>&1 | logger -t whenever_cron$/, output)
   end
 end

data/test/test_case.rb

@@ -1,21 +1,14 @@
 module Whenever
+  require 'minitest/autorun'
   begin
-    require 'minitest/autorun'
-    begin
-      # 2.0.0
-      class TestCase < MiniTest::Test; end
-    rescue NameError
-      # 1.9.3
-      class TestCase < MiniTest::Unit::TestCase; end
-    end
-  rescue LoadError
-    # 1.8.7
-    require 'test/unit'
-    class TestCase < Test::Unit::TestCase
-      def default_test; end
-    end
+    # 2.0.0
+    class TestCase < MiniTest::Test; end
+  rescue NameError
+    # 1.9.3
+    class TestCase < MiniTest::Unit::TestCase; end
   end
 
+
   class TestCase
     class << self
       def setup(&block)

data/test/test_helper.rb

@@ -18,13 +18,13 @@ module Whenever::TestHelpers
 
     def assert_days_and_hours_and_minutes_equals(expected, time)
       cron = parse_time(Whenever.seconds(2, :months), 'some task', time)
-      minutes, hours, days, *garbage = cron.split(' ')
+      minutes, hours, days, _ = cron.split(' ')
       assert_equal expected, [days, hours, minutes]
     end
 
     def assert_hours_and_minutes_equals(expected, time)
       cron = parse_time(Whenever.seconds(2, :days), 'some task', time)
-      minutes, hours, *garbage = cron.split(' ')
+      minutes, hours, _ = cron.split(' ')
       assert_equal expected, [hours, minutes]
     end
 

data/test/unit/cron_test.rb

@@ -11,7 +11,7 @@ class CronTest < Whenever::TestCase
     end
   end
 
-  # For santity, do some tests on straight String
+  # For sanity, do some tests on straight cron-syntax strings
   should "parse correctly" do
     assert_equal '* * * * *', parse_time(Whenever.seconds(1, :minute))
     assert_equal '0,5,10,15,20,25,30,35,40,45,50,55 * * * *', parse_time(Whenever.seconds(5, :minutes))
@@ -213,9 +213,27 @@ class CronParseShortcutsTest < Whenever::TestCase
   end
 end
 
+class CronParseRubyTimeTest < Whenever::TestCase
+  should "process things like `1.day` correctly" do
+    assert_equal "0 0 * * *", parse_time(1.day)
+  end
+end
+
 class CronParseRawTest < Whenever::TestCase
+  should "raise if cron-syntax string is too long" do
+    assert_raises ArgumentError do
+      parse_time('* * * * * *')
+    end
+  end
+
+  should "raise if cron-syntax string is invalid" do
+    assert_raises ArgumentError do
+      parse_time('** * * * *')
+    end
+  end
+
   should "return the same cron sytax" do
-    crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *',
+    crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *', '*/5 6-23 * * *',
              "*\t*\t*\t*\t*",
              '@reboot', '@yearly', '@annually', '@monthly', '@weekly',
              '@daily', '@midnight', '@hourly']

data/whenever.gemspec

@@ -16,9 +16,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- test/{functional,unit}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.required_ruby_version = ">= 1.9.3"
 
   s.add_dependency "chronic", ">= 0.6.3"
 
-  s.add_development_dependency "mocha", ">= 0.9.5"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
+  s.add_development_dependency "mocha", ">= 0.9.5"
+  s.add_development_dependency "minitest"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,6 +98,8 @@ files:
 - Rakefile
 - bin/whenever
 - bin/wheneverize
+- gemfiles/activesupport4.1.gemfile
+- gemfiles/activesupport4.2.gemfile
 - lib/whenever.rb
 - lib/whenever/capistrano.rb
 - lib/whenever/capistrano/v2/hooks.rb
@@ -80,7 +110,9 @@ files:
 - lib/whenever/cron.rb
 - lib/whenever/job.rb
 - lib/whenever/job_list.rb
+- lib/whenever/numeric.rb
 - lib/whenever/numeric_seconds.rb
+- lib/whenever/os.rb
 - lib/whenever/output_redirection.rb
 - lib/whenever/setup.rb
 - lib/whenever/tasks/whenever.rake
@@ -110,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -118,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Cron jobs in ruby.

data/lib/whenever/tasks/whenever.rake

@@ -1,43 +0,0 @@
-namespace :whenever do
-  def setup_whenever_task(*args, &block)
-    args = Array(fetch(:whenever_command)) + args
-
-    on roles fetch(:whenever_roles) do |host|
-      args_for_host = block_given? ? args + Array(yield(host)) : args
-      within release_path do
-        with fetch(:whenever_command_environment_variables) do
-          execute *args_for_host
-        end
-      end
-    end
-  end
-
-  desc "Update application's crontab entries using Whenever"
-  task :update_crontab do
-    setup_whenever_task do |host|
-      roles = host.roles_array.join(",")
-      [fetch(:whenever_update_flags),  "--roles=#{roles}"]
-    end
-  end
-
-  desc "Clear application's crontab entries using Whenever"
-  task :clear_crontab do
-    setup_whenever_task(fetch(:whenever_clear_flags))
-  end
-
-  after "deploy:updated",  "whenever:update_crontab"
-  after "deploy:reverted", "whenever:update_crontab"
-end
-
-namespace :load do
-  task :defaults do
-    set :whenever_roles,        ->{ :db }
-    set :whenever_command,      ->{ [:bundle, :exec, :whenever] }
-    set :whenever_command_environment_variables, ->{ {} }
-    set :whenever_identifier,   ->{ fetch :application }
-    set :whenever_environment,  ->{ fetch :rails_env, fetch(:stage, "production") }
-    set :whenever_variables,    ->{ "environment=#{fetch :whenever_environment}" }
-    set :whenever_update_flags, ->{ "--update-crontab #{fetch :whenever_identifier} --set #{fetch :whenever_variables}" }
-    set :whenever_clear_flags,  ->{ "--clear-crontab #{fetch :whenever_identifier}" }
-  end
-end