whenever 0.7.3 → 0.8.0

data/.travis.yml

@@ -1,5 +1,9 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
   - jruby
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 0.9.0 (unreleased)
+
+* Time zone support
+
+
+### 0.8.0 / November 8th, 2012
+
+* Separate Capistrano recipes to allow custom execution. [Bogdan Gusiev]
+
+* Execute `whenever:update_crontab` before `deploy:finalize_update`, not `deploy:restart`. [Michal Wrobel]
+
+* Added a new `script` job type. [Ján Suchal]
+
+* Use correct path in Cap task. [Alex Dean]
+
+* Fix that setup.rb and schedule.rb were eval'd together. [Niklas H]
+
+* New Capistrano roles feature. [Wes Morgan]
+
+* Stop clearing the crontab during a deploy. [Javan Makhmali]
+
+* Bump Chronic gem dependency. [rainchen]
+
+
 ### 0.7.3 / February 23rd, 2012
 
 * Make included Capistrano task compatible with both new and old versions of Cap. [Giacomo Macrì]

data/LICENSE

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

data/README.md

@@ -2,7 +2,7 @@ Whenever is a Ruby gem that provides a clear syntax for writing and deploying cr
 
 ### Installation
 
-```sh  
+```sh
 $ gem install whenever
 ```
 
@@ -11,7 +11,7 @@ Or with Bundler in your Gemfile.
 ```ruby
 gem 'whenever', :require => false
 ```
- 
+
 ### Getting started
 
 ```sh
@@ -23,14 +23,14 @@ This will create an initial `config/schedule.rb` file for you.
 
 ### Example schedule.rb file
 
-```ruby  
+```ruby
 every 3.hours do
-  runner "MyModel.some_process"       
-  rake "my:rake:task"                 
+  runner "MyModel.some_process"
+  rake "my:rake:task"
   command "/usr/bin/my_great_command"
 end
 
-every 1.day, :at => '4:30 am' do 
+every 1.day, :at => '4:30 am' do
   runner "MyModel.task_to_run_at_four_thirty_in_the_morning"
 end
 
@@ -38,13 +38,19 @@ every :hour do # Many shortcuts available: :hour, :day, :month, :year, :reboot
   runner "SomeModel.ladeeda"
 end
 
-every :sunday, :at => '12pm' do # Use any day of the week or :weekend, :weekday 
+every :sunday, :at => '12pm' do # Use any day of the week or :weekend, :weekday
   runner "Task.do_something_great"
 end
 
 every '0 0 27-31 * *' do
   command "echo 'you can use raw cron syntax too'"
 end
+
+# run this task only on servers with the :app role in Capistrano
+# see Capistrano roles section below
+every :day, :at => '12:20am', :roles => [:app] do
+  rake "app_server:task"
+end
 ```
 
 ### Define your own job types
@@ -60,7 +66,7 @@ every 2.hours do
   awesome "party", :fun_level => "extreme"
 end
 ```
-  
+
 Would run `/usr/local/bin/awesome party extreme` every two hours. `:task` is always replaced with the first argument, and any additional `:whatevers` are replaced with the options passed in or by variables that have been defined with `set`.
 
 The default job types that ship with Whenever are defined like so:
@@ -69,6 +75,7 @@ The default job types that ship with Whenever are defined like so:
 job_type :command, ":task :output"
 job_type :rake,    "cd :path && RAILS_ENV=:environment bundle exec rake :task --silent :output"
 job_type :runner,  "cd :path && script/rails runner -e :environment ':task' :output"
+job_type :script,  "cd :path && RAILS_ENV=:environment bundle exec script/:task :output"
 ```
 
 Pre-Rails 3 apps and apps that don't use Bundler will redefine the `rake` and `runner` jobs respectively to function correctly.
@@ -82,7 +89,7 @@ You can change this by setting your own `:job_template`.
 ```ruby
 set :job_template, "bash -l -c ':job'"
 ```
-  
+
 Or set the job_template to nil to have your jobs execute normally.
 
 ```ruby
@@ -99,7 +106,7 @@ In your "config/deploy.rb" file:
 require "whenever/capistrano"
 ```
 
-Take a look at the recipe for options you can set. <http://github.com/javan/whenever/blob/master/lib/whenever/capistrano.rb>
+Take a look at the recipe for options you can set. <http://github.com/javan/whenever/blob/master/lib/whenever/capistrano/recipes.rb>
 For example, if you're using bundler do this:
 
 ```ruby
@@ -124,6 +131,62 @@ set :whenever_identifier, defer { "#{application}_#{stage}" }
 require "whenever/capistrano"
 ```
 
+### Capistrano roles
+
+The first thing to know about the new roles support is that it is entirely
+optional and backwards-compatible. If you don't need different jobs running on
+different servers in your capistrano deployment, then you can safely stop reading
+now and everything should just work the same way it always has.
+
+When you define a job in your schedule.rb file, by default it will be deployed to
+all servers in the whenever_roles list (which defaults to [:db]).
+
+However, if you want to restrict certain jobs to only run on subset of servers,
+you can add a :roles => [...] argument to their definitions. **Make sure to add
+that role to the whenever_roles list in your deploy.rb.**
+
+When you run `cap deploy`, jobs with a :roles list specified will only be added to
+the crontabs on servers with one or more of the roles in that list.
+
+Jobs with no :roles argument will be deployed to all servers in the whenever_roles
+list. This is to maintain backward compatibility with previous releases of whenever.
+
+So, for example, with the default whenever_roles of [:db], a job like this would be
+deployed to all servers with the :db role:
+
+```ruby
+every :day, :at => '12:20am' do
+  rake 'foo:bar'
+end
+```
+
+If we set whenever_roles to [:db, :app] in deploy.rb, and have the following
+jobs in schedule.rb:
+
+```ruby
+every :day, :at => '1:37pm', :roles => [:app] do
+  rake 'app:task' # will only be added to crontabs of :app servers
+end
+
+every :hour, :roles => [:db] do
+  rake 'db:task' # will only be added to crontabs of :db servers
+end
+
+every :day, :at => '12:02am' do
+  command "run_this_everywhere" # will be deployed to :db and :app servers
+end
+```
+
+Here are the basic rules:
+
+  1. If a server's role isn't listed in whenever_roles, it will *never* have jobs
+     added to its crontab.
+  1. If a server's role is listed in the whenever_roles, then it will have all
+     jobs added to its crontab that either list that role in their :roles arg or
+     that don't have a :roles arg.
+  1. If a job has a :roles arg but that role isn't in the whenever_roles list,
+     that job *will not* be deployed to any server.
+
 ### RVM Integration
 
 If your production environment uses RVM (Ruby Version Manager) you will run into a gotcha that causes your cron jobs to hang.  This is not directly related to Whenever, and can be tricky to debug.  Your .rvmrc files must be trusted or else the cron jobs will hang waiting for the file to be trusted.  A solution is to disable the prompt by adding this line to your user rvm file in `~/.rvmrc`
@@ -138,7 +201,7 @@ This tells rvm to trust all rvmrc files, which is documented here: http://waynee
 $ 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. Run `whenever --help` for a complete list of options.
 
 ### Credit
@@ -158,8 +221,8 @@ It's a little bit dated now, but remains a good introduction.
 
 ----
 
-Compatible with Ruby 1.8.7-1.9.2, JRuby, and Rubinius. [![Build Status](https://secure.travis-ci.org/javan/whenever.png)](http://travis-ci.org/javan/whenever)
+Compatible with Ruby 1.8.7-1.9.3, JRuby, and Rubinius. [![Build Status](https://secure.travis-ci.org/javan/whenever.png)](http://travis-ci.org/javan/whenever)
 
 ----
 
-Copyright &copy; 2011 Javan Makhmali
+Copyright &copy; 2012 Javan Makhmali

data/bin/whenever

@@ -26,12 +26,15 @@ OptionParser.new do |opts|
   opts.on('-f', '--load-file [schedule file]', 'Default: config/schedule.rb') do |file|
     options[:file] = file if file
   end
-  opts.on('-u', '--user [user]', 'Default: current user') do |user| 
+  opts.on('-u', '--user [user]', 'Default: current user') do |user|
     options[:user] = user if user
   end
   opts.on('-k', '--cut [lines]', 'Cut lines from the top of the cronfile') do |lines|
     options[:cut] = lines.to_i if lines
   end
+  opts.on('-r', '--roles [role1,role2]', 'Comma-separated list of server roles to generate cron jobs for') do |roles|
+    options[:roles] = roles.split(',').map(&:to_sym) if roles
+  end
   opts.on('-v', '--version') { puts "Whenever v#{Whenever::VERSION}"; exit(0) }
 end.parse!
 

data/lib/whenever/capistrano.rb

@@ -1,64 +1,8 @@
-Capistrano::Configuration.instance(:must_exist).load do
-  _cset(:whenever_roles)        { :db }
-  _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_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}" }
+require "whenever/capistrano/recipes"
 
-  # Disable cron jobs at the begining of a deploy.
-  after "deploy:update_code", "whenever:clear_crontab"
+Capistrano::Configuration.instance(:must_exist).load do
   # Write the new cron jobs near the end.
-  before "deploy:restart", "whenever:update_crontab"
+  before "deploy:finalize_update", "whenever:update_crontab"
   # If anything goes wrong, undo.
   after "deploy:rollback", "whenever:update_crontab"
-
-  namespace :whenever do
-    desc <<-DESC
-      Update application's crontab entries using Whenever. You can configure \
-      the command used to invoke Whenever by setting the :whenever_command \
-      variable, which can be used with Bundler to set the command to \
-      "bundle exec whenever". You can configure the identifier used by setting \
-      the :whenever_identifier variable, which defaults to the same value configured \
-      for the :application variable. You can configure the environment by setting \
-      the :whenever_environment variable, which defaults to the same value \
-      configured for the :rails_env variable which itself defaults to "production". \
-      Finally, you can completely override all arguments to the Whenever command \
-      by setting the :whenever_update_flags variable. Additionally you can configure \
-      which servers the crontab is updated on by setting the :whenever_roles variable.
-    DESC
-    task :update_crontab do
-      options = fetch(:whenever_options)
-
-      if find_servers(options).any?
-        on_rollback do
-          if fetch :previous_release
-            run "cd #{fetch :previous_release} && #{fetch :whenever_command} #{fetch :whenever_update_flags}", options
-          else
-            run "cd #{fetch :release_path} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options
-          end
-        end
-
-        run "cd #{fetch :current_path} && #{fetch :whenever_command} #{fetch :whenever_update_flags}", options
-      end
-    end
-
-    desc <<-DESC
-      Clear application's crontab entries using Whenever. You can configure \
-      the command used to invoke Whenever by setting the :whenever_command \
-      variable, which can be used with Bundler to set the command to \
-      "bundle exec whenever". You can configure the identifier used by setting \
-      the :whenever_identifier variable, which defaults to the same value configured \
-      for the :application variable. Finally, you can completely override all \
-      arguments to the Whenever command by setting the :whenever_clear_flags variable. \
-      Additionally you can configure which servers the crontab is cleared on by setting \
-      the :whenever_roles variable.
-    DESC
-    task :clear_crontab do
-      options = fetch(:whenever_options)
-      run "cd #{fetch :latest_release} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options if find_servers(options).any?
-    end
-  end
 end

data/lib/whenever/capistrano/recipes.rb

@@ -0,0 +1,71 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  _cset(:whenever_roles)        { :db }
+  _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_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}" }
+
+  namespace :whenever do
+    desc <<-DESC
+      Update application's crontab entries using Whenever. You can configure \
+      the command used to invoke Whenever by setting the :whenever_command \
+      variable, which can be used with Bundler to set the command to \
+      "bundle exec whenever". You can configure the identifier used by setting \
+      the :whenever_identifier variable, which defaults to the same value configured \
+      for the :application variable. You can configure the environment by setting \
+      the :whenever_environment variable, which defaults to the same value \
+      configured for the :rails_env variable which itself defaults to "production". \
+      Finally, you can completely override all arguments to the Whenever command \
+      by setting the :whenever_update_flags variable. Additionally you can configure \
+      which servers the crontab is updated on by setting the :whenever_roles variable.
+    DESC
+    task :update_crontab do
+      options = fetch(:whenever_options)
+      roles = [options[:roles]].flatten if options[:roles]
+
+      if find_servers(options).any?
+        # make sure we go through the roles.each loop at least once
+        roles << :__none if roles.empty?
+
+        roles.each do |role|
+          if role == :__none
+            role_arg = ''
+          else
+            options[:roles] = role
+            role_arg = " --roles #{role}"
+          end
+
+          on_rollback do
+            if fetch :previous_release
+              run "cd #{fetch :previous_release} && #{fetch :whenever_command} #{fetch :whenever_update_flags}#{role_arg}", options
+            else
+              run "cd #{fetch :release_path} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options
+            end
+          end
+
+          run "cd #{fetch :latest_release} && #{fetch :whenever_command} #{fetch :whenever_update_flags}#{role_arg}", options
+        end
+      end
+    end
+
+    desc <<-DESC
+      Clear application's crontab entries using Whenever. You can configure \
+      the command used to invoke Whenever by setting the :whenever_command \
+      variable, which can be used with Bundler to set the command to \
+      "bundle exec whenever". You can configure the identifier used by setting \
+      the :whenever_identifier variable, which defaults to the same value configured \
+      for the :application variable. Finally, you can completely override all \
+      arguments to the Whenever command by setting the :whenever_clear_flags variable. \
+      Additionally you can configure which servers the crontab is cleared on by setting \
+      the :whenever_roles variable.
+    DESC
+
+    task :clear_crontab do
+      options = fetch(:whenever_options)
+      run "cd #{fetch :latest_release} && #{fetch :whenever_command} #{fetch :whenever_clear_flags}", options if find_servers(options).any?
+    end
+  end
+end

data/lib/whenever/job.rb

@@ -2,13 +2,14 @@ require 'shellwords'
 
 module Whenever
   class Job
-    attr_reader :at
+    attr_reader :at, :roles
 
     def initialize(options = {})
       @options = options
       @at                      = options.delete(:at)
       @template                = options.delete(:template)
       @job_template            = options.delete(:job_template) || ":job"
+      @roles                   = Array.wrap(options.delete(:roles))
       @options[:output]        = Whenever::Output::Redirection.new(options[:output]).to_s if options.has_key?(:output)
       @options[:environment] ||= :production
       @options[:path]          = Shellwords.shellescape(@options[:path] || Whenever.path)
@@ -23,6 +24,10 @@ module Whenever
       out.gsub(/%/, '\%')
     end
 
+    def has_role?(role)
+      roles.empty? || roles.include?(role)
+    end
+
   protected
 
     def process_template(template, options)

data/lib/whenever/job_list.rb

@@ -1,66 +1,72 @@
 module Whenever
   class JobList
+    attr_reader :roles
+
     def initialize(options)
       @jobs, @env, @set_variables, @pre_set_variables = {}, {}, {}, {}
-      
+
       if options.is_a? String
         options = { :string => options }
       end
 
       pre_set(options[:set])
-      
-      setup = File.read("#{File.expand_path(File.dirname(__FILE__))}/setup.rb")
+
+      @roles = options[:roles] || []
+
+      setup_file = File.expand_path('../setup.rb', __FILE__)
+      setup = File.read(setup_file)
       schedule = if options[:string]
         options[:string]
       elsif options[:file]
         File.read(options[:file])
       end
-      
-      instance_eval(setup + schedule, options[:file] || '<eval>')
+
+      instance_eval(setup, setup_file)
+      instance_eval(schedule, options[:file] || '<eval>')
     end
-    
+
     def set(variable, value)
       variable = variable.to_sym
       return if @pre_set_variables[variable]
-      
+
       instance_variable_set("@#{variable}".to_sym, value)
       self.class.send(:attr_reader, variable.to_sym)
       @set_variables[variable] = value
     end
-    
+
     def env(variable, value)
       @env[variable.to_s] = value
     end
-  
+
     def every(frequency, options = {})
       @current_time_scope = frequency
       @options = options
       yield
     end
-    
+
     def job_type(name, template)
       class_eval do
         define_method(name) do |task, *args|
           options = { :task => task, :template => template }
           options.merge!(args[0]) if args[0].is_a? Hash
-          
+
           # :cron_log was an old option for output redirection, it remains for backwards compatibility
           options[:output] = (options[:cron_log] || @cron_log) if defined?(@cron_log) || options.has_key?(:cron_log)
           # :output is the newer, more flexible option.
           options[:output] = @output if defined?(@output) && !options.has_key?(:output)
-          
+
           @jobs[@current_time_scope] ||= []
           @jobs[@current_time_scope] << Whenever::Job.new(@options.merge(@set_variables).merge(options))
         end
       end
     end
-  
-    def generate_cron_output      
+
+    def generate_cron_output
       [environment_variables, cron_jobs].compact.join
     end
-    
+
   private
-    
+
     #
     # 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.
@@ -68,7 +74,7 @@ module Whenever
     #
     def pre_set(variable_string = nil)
       return if variable_string.blank?
-      
+
       pairs = variable_string.split('&')
       pairs.each do |pair|
         next unless pair.index('=')
@@ -80,19 +86,19 @@ module Whenever
         end
       end
     end
-  
+
     def environment_variables
       return if @env.empty?
-      
+
       output = []
       @env.each do |key, val|
         output << "#{key}=#{val.blank? ? '""' : val}\n"
       end
       output << "\n"
-      
+
       output.join
     end
-    
+
     #
     # Takes the standard cron output that Whenever generates and finds
     # similar entries that can be combined. For example: If a job should run
@@ -121,15 +127,19 @@ module Whenever
 
     def cron_jobs
       return if @jobs.empty?
-      
+
       shortcut_jobs = []
       regular_jobs = []
-      
+
+      output_all = roles.empty?
       @jobs.each do |time, jobs|
         jobs.each do |job|
+          next unless output_all || roles.any? do |r|
+            job.has_role?(r)
+          end
           Whenever::Output::Cron.output(time, job) do |cron|
             cron << "\n\n"
-            
+
             if cron.starts_with?("@")
               shortcut_jobs << cron
             else

data/lib/whenever/setup.rb

@@ -12,8 +12,10 @@ job_type :command, ":task :output"
 # Run rake through bundler if possible
 if Whenever.bundler?
   job_type :rake, "cd :path && RAILS_ENV=:environment bundle exec rake :task --silent :output"
+  job_type :script, "cd :path && RAILS_ENV=:environment bundle exec script/:task :output"
 else
   job_type :rake, "cd :path && RAILS_ENV=:environment rake :task --silent :output"
+  job_type :script, "cd :path && RAILS_ENV=:environment script/:task :output"
 end
 
 # Create a runner job that's appropriate for the Rails version,

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

data/test/functional/output_default_defined_jobs_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
-  
+
   # command
-  
+
   context "A plain command with the job template set to nil" do
     setup do
       @output = Whenever.cron \
@@ -14,12 +14,12 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the command" do
       assert_match /^.+ .+ .+ .+ blahblah$/, @output
     end
   end
-  
+
   context "A plain command with no job template set" do
     setup do
       @output = Whenever.cron \
@@ -29,12 +29,12 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the command with the default job template" do
       assert_match /^.+ .+ .+ .+ \/bin\/bash -l -c 'blahblah'$/, @output
     end
   end
-  
+
   context "A plain command that overrides the job_template set" do
     setup do
       @output = Whenever.cron \
@@ -45,13 +45,13 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the command using that job_template" do
       assert_match /^.+ .+ .+ .+ \/bin\/sh -l -c 'blahblah'$/, @output
       assert_no_match /bash/, @output
     end
   end
-  
+
   context "A plain command that is conditional on default environent and path" do
     setup do
       Whenever.expects(:path).at_least_once.returns('/what/you/want')
@@ -65,14 +65,14 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         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 \
@@ -84,12 +84,12 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         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 \
@@ -101,12 +101,12 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         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 for a Rails 3 app" do
     setup do
       Whenever.expects(:path).at_least_once.returns('/my/path')
@@ -119,14 +119,14 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "use the Rails 3 runner job by default" do
       assert_match two_hours + %( cd /my/path && script/rails runner -e production 'blahblah'), @output
     end
   end
-  
+
   # rake
-  
+
   context "A rake command with path set" do
     setup do
       @output = Whenever.cron \
@@ -138,7 +138,7 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the rake command using that path" do
       assert_match two_hours + ' cd /my/path && RAILS_ENV=production bundle exec rake blahblah --silent', @output
     end
@@ -161,7 +161,7 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
       assert_match two_hours + ' cd /my/path && RAILS_ENV=production rake blahblah --silent', @output
     end
   end
-  
+
   context "A rake command that overrides the path set" do
     setup do
       @output = Whenever.cron \
@@ -173,10 +173,66 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the rake command using that path" do
       assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production bundle exec rake blahblah --silent', @output
     end
   end
-  
+
+
+    # script
+
+  context "A script command with path set" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :job_template, nil
+        set :path, '/my/path'
+        every 2.hours do
+          script "blahblah"
+        end
+      file
+    end
+
+    should "output the script command using that path" do
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=production bundle exec script/blahblah', @output
+    end
+  end
+
+  context "A script command for a non-bundler app" do
+    setup do
+      Whenever.expects(:path).at_least_once.returns('/my/path')
+      Whenever.expects(:bundler?).returns(false)
+      @output = Whenever.cron \
+      <<-file
+        set :job_template, nil
+        every 2.hours do
+          script 'blahblah'
+        end
+      file
+    end
+
+    should "not use invoke through bundler" do
+      assert_match two_hours + ' cd /my/path && RAILS_ENV=production script/blahblah', @output
+    end
+  end
+
+  context "A script command that uses output" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :job_template, nil
+        set :output, '/log/file'
+        set :path, '/my/path'
+        every 2.hours do
+          script "blahblah", :path => '/some/other/path'
+        end
+      file
+    end
+
+    should "output the script command using that path" do
+      assert_match two_hours + ' cd /some/other/path && RAILS_ENV=production bundle exec script/blahblah >> /log/file 2>&1', @output
+    end
+  end
+
 end

data/test/unit/job_test.rb

@@ -7,6 +7,15 @@ class JobTest < Test::Unit::TestCase
       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

data/whenever.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "chronic", "~> 0.6.3"
+  s.add_dependency "chronic", ">= 0.6.3"
   s.add_dependency "activesupport", ">= 2.3.4"
   
   s.add_development_dependency "shoulda", ">= 2.1.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70208049126040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70208049126040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70208049125280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70208049125280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70208049124660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *70208049124660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70208049124000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70208049124000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70208049123260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208049123260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70208049139120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208049139120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Clean ruby syntax for writing and deploying cron jobs.
 email:
 - javan@javan.us
@@ -97,6 +127,7 @@ files:
 - bin/wheneverize
 - lib/whenever.rb
 - lib/whenever/capistrano.rb
+- lib/whenever/capistrano/recipes.rb
 - lib/whenever/command_line.rb
 - lib/whenever/cron.rb
 - lib/whenever/job.rb
@@ -134,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cron jobs in ruby.