whenever 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 * Time zone support
 
 
+### 0.8.1 / December 22nd, 2012
+
+* Fix multiserver roles bug. [Wes Morgan]
+
+* Refactor Cap recipes and add tests for them. [Wes Morgan]
+
+* Fix file not found error when running under JRuby. [Wes Morgan]
+
+* Stop interpolating template attributes with no corresponding value. [Vincent Boisard]
+
+* Support for raw cron separated by tabs. [Étienne Barrié]
+
+
 ### 0.8.0 / November 8th, 2012
 
 * Separate Capistrano recipes to allow custom execution. [Bogdan Gusiev]

data/lib/whenever.rb

@@ -2,19 +2,19 @@ require 'thread'
 require 'active_support/all'
 
 module Whenever
-  autoload :JobList,     'whenever/job_list'
-  autoload :Job,         'whenever/job'
-  autoload :CommandLine, 'whenever/command_line'
-  
+  autoload :JobList,           'whenever/job_list'
+  autoload :Job,               'whenever/job'
+  autoload :CommandLine,       'whenever/command_line'
+
   module Output
     autoload :Cron,        'whenever/cron'
     autoload :Redirection, 'whenever/output_redirection'
   end
-  
+
   def self.cron(options)
     Whenever::JobList.new(options).generate_cron_output
   end
-  
+
   def self.path
     Dir.pwd
   end

data/lib/whenever/capistrano/recipes.rb

@@ -1,4 +1,8 @@
+require 'whenever/capistrano/support'
+
 Capistrano::Configuration.instance(:must_exist).load do
+  Whenever::CapistranoSupport.load_into(self)
+
   _cset(:whenever_roles)        { :db }
   _cset(:whenever_options)      { {:roles => fetch(:whenever_roles)} }
   _cset(:whenever_command)      { "whenever" }
@@ -9,63 +13,42 @@ Capistrano::Configuration.instance(:must_exist).load do
   _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
+    desc "Update application's crontab entries using Whenever"
     task :update_crontab do
-      options = fetch(:whenever_options)
-      roles = [options[:roles]].flatten if options[:roles]
+      args = {
+        :command => fetch(:whenever_command),
+        :flags   => fetch(:whenever_update_flags),
+        :path    => fetch(:release_path)
+      }
 
-      if find_servers(options).any?
-        # make sure we go through the roles.each loop at least once
-        roles << :__none if roles.empty?
+      if whenever_servers.any?
+        whenever_run_commands(args)
 
-        roles.each do |role|
-          if role == :__none
-            role_arg = ''
+        on_rollback do
+          if fetch(:previous_release)
+            # rollback to the previous release's crontab
+            args[:path] = fetch(:previous_release)
           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
+            # clear the crontab if no previous release
+            args[:flags] = fetch(:whenever_clear_flags)
           end
 
-          run "cd #{fetch :latest_release} && #{fetch :whenever_command} #{fetch :whenever_update_flags}#{role_arg}", options
+          whenever_run_commands(args)
         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
-
+    desc "Clear application's crontab entries using Whenever"
     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?
+      if whenever_servers.any?
+        args = {
+          :command => fetch(:whenever_command),
+          :flags   => fetch(:whenever_clear_flags),
+          :path    => fetch(:latest_release)
+        }
+
+        whenever_run_commands(args)
+      end
     end
   end
 end

data/lib/whenever/capistrano/support.rb

@@ -0,0 +1,41 @@
+module Whenever
+  module CapistranoSupport
+    def self.load_into(capistrano_configuration)
+      capistrano_configuration.load do
+
+        def whenever_options
+          fetch(:whenever_options)
+        end
+
+        def whenever_roles
+          Array(whenever_options[:roles])
+        end
+
+        def whenever_servers
+          find_servers(whenever_options)
+        end
+
+        def whenever_server_roles
+          whenever_servers.inject({}) do |map, server|
+            map[server] = role_names_for_host(server) & whenever_roles
+            map
+          end
+        end
+
+        def whenever_run_commands(args)
+          unless [:command, :path, :flags].all? { |a| args.include?(a) }
+            raise ArgumentError, ":command, :path, & :flags are required"
+          end
+
+          whenever_server_roles.each do |server, roles|
+            roles_arg = roles.empty? ? "" : " --roles #{roles.join(',')}"
+
+            command = "cd #{args[:path]} && #{args[:command]} #{args[:flags]}#{roles_arg}"
+            run command, whenever_options.merge(:hosts => server.host)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/whenever/command_line.rb

@@ -66,22 +66,23 @@ module Whenever
     end
     
     def write_crontab(contents)
-      tmp_cron_file = Tempfile.new('whenever_tmp_cron').path
-      File.open(tmp_cron_file, File::WRONLY | File::APPEND) do |file|
-        file << contents
-      end
+      tmp_cron_file = Tempfile.open('whenever_tmp_cron')
+      tmp_cron_file << contents
+      tmp_cron_file.fsync
 
       command = ['crontab']
       command << "-u #{@options[:user]}" if @options[:user]
-      command << tmp_cron_file
+      command << tmp_cron_file.path
 
       if system(command.join(' '))
         action = 'written' if @options[:write]
         action = 'updated' if @options[:update]
         puts "[write] crontab file #{action}"
+        tmp_cron_file.close!
         exit(0)
       else
         warn "[fail] Couldn't write crontab; try running `whenever' with no options to ensure your schedule file is valid."
+        tmp_cron_file.close!
         exit(1)
       end
     end

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 '|'})|.+ .+ .+ .+ .+.?)$/
+      REGEX = /^(@(#{KEYWORDS.join '|'})|.+\s+.+\s+.+\s+.+\s+.+.?)$/
 
       attr_accessor :time, :task
 

data/lib/whenever/job.rb

@@ -10,7 +10,7 @@ module Whenever
       @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[:output]        = options.has_key?(:output) ? Whenever::Output::Redirection.new(options[:output]).to_s : ''
       @options[:environment] ||= :production
       @options[:path]          = Shellwords.shellescape(@options[:path] || Whenever.path)
     end
@@ -33,7 +33,7 @@ module Whenever
     def process_template(template, options)
       template.gsub(/:\w+/) do |key|
         before_and_after = [$`[-1..-1], $'[0..0]]
-        option = options[key.sub(':', '').to_sym]
+        option = options[key.sub(':', '').to_sym] || key
 
         if before_and_after.all? { |c| c == "'" }
           escape_single_quotes(option)

data/lib/whenever/version.rb

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

data/test/functional/command_line_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 class CommandLineTest < Test::Unit::TestCase
-  
+
   context "A command line write" do
     setup do
       File.expects(:exists?).with('config/schedule.rb').returns(true)
@@ -16,16 +16,16 @@ class CommandLineTest < Test::Unit::TestCase
 #{@task}
 # End Whenever generated tasks for: My identifier
 EXPECTED
-      
+
       assert_equal output, @command.send(:whenever_cron)
     end
-    
+
     should "write the crontab when run" do
       @command.expects(:write_crontab).returns(true)
       assert @command.run
     end
   end
-  
+
   context "A command line update" do
     setup do
       File.expects(:exists?).with('config/schedule.rb').returns(true)
@@ -37,7 +37,7 @@ EXPECTED
     should "add the cron to the end of the file if there is no existing identifier block" do
       existing = '# Existing crontab'
       @command.expects(:read_crontab).at_least_once.returns(existing)
-      
+
       new_cron = <<-EXPECTED
 #{existing}
 
@@ -45,13 +45,13 @@ EXPECTED
 #{@task}
 # End Whenever generated tasks for: My identifier
 EXPECTED
-      
+
       assert_equal new_cron, @command.send(:updated_crontab)
-      
+
       @command.expects(:write_crontab).with(new_cron).returns(true)
       assert @command.run
     end
-    
+
     should "replace an existing block if the identifier matches" do
       existing = <<-EXISTING_CRON
 # Something
@@ -76,15 +76,15 @@ EXISTING_CRON
 This shouldn't get replaced
 # End Whenever generated tasks for: Other identifier
 NEW_CRON
-      
+
       @command.expects(:read_crontab).at_least_once.returns(existing)
       assert_equal new_cron, @command.send(:updated_crontab)
-      
+
       @command.expects(:write_crontab).with(new_cron).returns(true)
       assert @command.run
     end
   end
-  
+
   context "A command line update that contains backslashes" do
     setup do
       @existing = <<-EXISTING_CRON
@@ -97,12 +97,12 @@ EXISTING_CRON
       @command.expects(:read_crontab).at_least_once.returns(@existing)
       @command.expects(:whenever_cron).returns(@existing)
     end
-    
+
     should "replace the existing block with the backslashes in tact" do
       assert_equal @existing, @command.send(:updated_crontab)
     end
   end
-  
+
   context "A command line update with an identifier similar to an existing one in the crontab already" do
     setup do
       @existing = <<-EXISTING_CRON
@@ -118,7 +118,7 @@ NEW_CRON
       @command.expects(:read_crontab).at_least_once.returns(@existing)
       @command.expects(:whenever_cron).returns(@new)
     end
-    
+
     should "append the similarly named command" do
       assert_equal @existing + "\n" + @new, @command.send(:updated_crontab)
     end
@@ -160,7 +160,7 @@ NEW_CRON
       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)
@@ -183,7 +183,7 @@ NEW_CRON
     should "exit with write and clear" do
       @command = Whenever::CommandLine.new(:write => true, :clear => true)
     end
-    
+
     should "exit with write and update" do
       @command = Whenever::CommandLine.new(:write => true, :update => true)
     end
@@ -192,7 +192,7 @@ NEW_CRON
       @command = Whenever::CommandLine.new(:update => true, :clear => true)
     end
   end
-  
+
   context "A runner where the environment is overridden using the :set option" do
     setup do
       @output = Whenever.cron :set => 'environment=serious', :string => \
@@ -205,12 +205,12 @@ NEW_CRON
         end
       file
     end
-    
+
     should "output the runner using the override environment" do
       assert_match two_hours + %( cd /my/path && script/runner -e serious 'blahblah'), @output
     end
   end
-  
+
   context "A runner where the environment and path are overridden using the :set option" do
     setup do
       @output = Whenever.cron :set => 'environment=serious&path=/serious/path', :string => \
@@ -223,12 +223,12 @@ NEW_CRON
         end
       file
     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
     end
   end
-  
+
   context "A runner where the environment and path are overridden using the :set option with spaces in the string" do
     setup do
       @output = Whenever.cron :set => ' environment = serious&  path =/serious/path', :string => \
@@ -241,12 +241,12 @@ NEW_CRON
         end
       file
     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
     end
   end
-  
+
   context "A runner where the environment is overridden using the :set option but no value is given" do
     setup do
       @output = Whenever.cron :set => ' environment=', :string => \
@@ -259,7 +259,7 @@ NEW_CRON
         end
       file
     end
-    
+
     should "output the runner using the original environmnet" do
       assert_match two_hours + %( cd /silly/path && script/runner -e silly 'blahblah'), @output
     end
@@ -283,7 +283,7 @@ EXISTING_CRON
 
       assert_equal existing, @command.send(:prepare, existing)
     end
-    
+
     should "trim off the top lines of the file" do
       @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => '3')
       existing = <<-EXISTING_CRON
@@ -303,7 +303,7 @@ NEW_CRON
 
       assert_equal new_cron, @command.send(:prepare, existing)
     end
-    
+
     should "preserve terminating newlines in files" do
       @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
       existing = <<-EXISTING_CRON

data/test/functional/output_defined_job_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
 
 class OutputDefinedJobTest < Test::Unit::TestCase
-  
+
   context "A defined job with a :task" do
     setup do
       @output = Whenever.cron \
@@ -13,12 +13,12 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the defined job with the task" do
       assert_match /^.+ .+ .+ .+ before during after$/, @output
     end
   end
-  
+
   context "A defined job with a :task and some options" do
     setup do
       @output = Whenever.cron \
@@ -30,12 +30,12 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the defined job with the task and options" do
       assert_match /^.+ .+ .+ .+ before during after happy birthday$/, @output
     end
   end
-  
+
   context "A defined job with a :task and an option where the option is set globally" do
     setup do
       @output = Whenever.cron \
@@ -48,12 +48,12 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the defined job with the task and options" do
       assert_match /^.+ .+ .+ .+ before during after happy$/, @output
     end
   end
-  
+
   context "A defined job with a :task and an option where the option is set globally and locally" do
     setup do
       @output = Whenever.cron \
@@ -66,12 +66,12 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "output the defined job using the local option" do
       assert_match /^.+ .+ .+ .+ before during after local$/, @output
     end
   end
-  
+
   context "A defined job with a :task and an option that is not set" do
     setup do
       @output = Whenever.cron \
@@ -83,16 +83,16 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
-    should "output the defined job with that option removed" do
-      assert_match /^.+ .+ .+ .+ before during after$/, @output
+
+    should "output the defined job with that option left untouched" do
+      assert_match /^.+ .+ .+ .+ before during after :option1$/, @output
     end
   end
-  
+
   context "A defined job that uses a :path where none is explicitly set" do
     setup do
       Whenever.stubs(:path).returns('/my/path')
-      
+
       @output = Whenever.cron \
       <<-file
         set :job_template, nil
@@ -102,10 +102,10 @@ class OutputDefinedJobTest < Test::Unit::TestCase
         end
       file
     end
-    
+
     should "default to using the Whenever.path" do
       assert_match two_hours + %( cd /my/path && blahblah), @output
     end
   end
 
-end
+end

data/test/functional/output_jobs_for_roles_test.rb

@@ -0,0 +1,84 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+
+class OutputJobsForRolesTest < Test::Unit::TestCase
+  context "with one role requested and specified on the job" do
+    setup do
+      @output = Whenever.cron :roles => [:role1], :string => \
+      <<-file
+        every 2.hours, :roles => [:role1] do
+          command "blahblah"
+        end
+      file
+    end
+
+    should "output the cron job" do
+      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
+    end
+  end
+
+  context "with one role requested but none specified on the job" do
+    setup do
+      @output = Whenever.cron :roles => [:role1], :string => \
+      <<-file
+        every 2.hours do
+          command "blahblah"
+        end
+      file
+    end
+
+    # this should output the job because not specifying a role means "all roles"
+    should "output the cron job" do
+      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
+    end
+  end
+
+  context "with no roles requested but one specified on the job" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        every 2.hours, :roles => [:role1] do
+          command "blahblah"
+        end
+      file
+    end
+
+    # this should output the job because not requesting roles means "all roles"
+    should "output the cron job" do
+      assert_equal two_hours + " /bin/bash -l -c 'blahblah'\n\n", @output
+    end
+  end
+
+  context "with a different role requested than the one specified on the job" do
+    setup do
+      @output = Whenever.cron :roles => [:role1], :string => \
+      <<-file
+        every 2.hours, :roles => [:role2] do
+          command "blahblah"
+        end
+      file
+    end
+
+    should "not output the cron job" do
+      assert_equal "", @output
+    end
+  end
+
+  context "with 2 roles requested and a job defined for each" do
+    setup do
+      @output = Whenever.cron :roles => [:role1, :role2], :string => \
+      <<-file
+        every 2.hours, :roles => [:role1] do
+          command "role1_cmd"
+        end
+
+        every :hour, :roles => [:role2] do
+          command "role2_cmd"
+        end
+      file
+    end
+
+    should "output both jobs" do
+      assert_equal two_hours + " /bin/bash -l -c 'role1_cmd'\n\n0 * * * * /bin/bash -l -c 'role2_cmd'\n\n", @output
+    end
+  end
+end

data/test/unit/capistrano_support_test.rb

@@ -0,0 +1,138 @@
+require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/whenever/capistrano/support")
+
+class CapistranoSupportTestSubject
+  include Whenever::CapistranoSupport
+end
+
+class CapistranoSupportTest < Test::Unit::TestCase
+  context "when using capistrano support module" do
+    setup do
+      @capistrano = CapistranoSupportTestSubject.new
+      configuration = mock
+      configuration.stubs(:load).yields(@capistrano)
+      Whenever::CapistranoSupport.load_into(configuration)
+    end
+
+    context "#whenever_options" do
+      should "return fetch(:whenever_options)" do
+        @capistrano.expects(:fetch).with(:whenever_options)
+        @capistrano.whenever_options
+      end
+    end
+
+    context "#whenever_roles with one role" do
+      setup do
+        @capistrano.stubs(:whenever_options).returns({:roles => :role1})
+      end
+
+      should "return whenever_options[:roles] as an array" do
+        assert_equal [:role1], @capistrano.whenever_roles
+      end
+    end
+
+    context "#whenever_roles with no defined roles" do
+      setup do
+        @capistrano.stubs(:whenever_options).returns({})
+      end
+
+      should "return an empty array" do
+        assert_equal [], @capistrano.whenever_roles
+      end
+    end
+
+    context "#whenever_servers" do
+      should "return the list of servers returned by find_servers" do
+        @capistrano.stubs(:whenever_options).returns({})
+        @capistrano.stubs(:find_servers).returns([:server1, :server2])
+
+        assert_equal [:server1, :server2], @capistrano.whenever_servers
+      end
+    end
+
+    context "#whenever_server_roles" do
+      setup do
+        @mock_servers = ["foo", "bar"]
+        @capistrano.stubs(:whenever_servers).returns(@mock_servers)
+      end
+
+      should "return a map of servers to their role(s)" do
+        @capistrano.stubs(:whenever_roles).returns([:role1, :role2])
+        @capistrano.stubs(:role_names_for_host).with("foo").returns([:role1])
+        @capistrano.stubs(:role_names_for_host).with("bar").returns([:role2])
+        assert_equal({"foo" => [:role1], "bar" => [:role2]}, @capistrano.whenever_server_roles)
+      end
+
+      should "exclude non-requested roles" do
+        @capistrano.stubs(:whenever_roles).returns([:role1, :role2])
+        @capistrano.stubs(:role_names_for_host).with("foo").returns([:role1, :role3])
+        @capistrano.stubs(:role_names_for_host).with("bar").returns([:role2])
+        assert_equal({"foo" => [:role1], "bar" => [:role2]}, @capistrano.whenever_server_roles)
+      end
+
+      should "include all roles for servers w/ >1 when they're requested" do
+        @capistrano.stubs(:whenever_roles).returns([:role1, :role2, :role3])
+        @capistrano.stubs(:role_names_for_host).with("foo").returns([:role1, :role3])
+        @capistrano.stubs(:role_names_for_host).with("bar").returns([:role2])
+        assert_equal({"foo" => [:role1, :role3], "bar" => [:role2]}, @capistrano.whenever_server_roles)
+      end
+    end
+
+    context "#whenever_run_commands" do
+      should "require :command arg" do
+        assert_raise ArgumentError do
+          @capistrano.whenever_run_commands(:options => {}, :path => {}, :flags => {})
+        end
+      end
+
+      should "require :path arg" do
+        assert_raise ArgumentError do
+          @capistrano.whenever_run_commands(:options => {}, :command => {}, :flags => {})
+        end
+      end
+
+      should "require :flags arg" do
+        assert_raise ArgumentError do
+          @capistrano.whenever_run_commands(:options => {}, :path => {}, :command => {})
+        end
+      end
+
+      context "with some servers defined" do
+        setup do
+          @mock_server1, @mock_server2 = mock(), mock()
+          @mock_server1.stubs(:host).returns("server1.foo.com")
+          @mock_server2.stubs(:host).returns("server2.foo.com")
+          @mock_servers = [@mock_server1, @mock_server2]
+        end
+
+        should "call run for each host w/ appropriate role args" do
+          @capistrano.stubs(:role_names_for_host).with(@mock_server1).returns([:role1])
+          @capistrano.stubs(:role_names_for_host).with(@mock_server2).returns([:role2])
+          @capistrano.stubs(:whenever_servers).returns(@mock_servers)
+          roles = [:role1, :role2]
+          @capistrano.stubs(:whenever_options).returns({:roles => roles})
+
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1', {:roles => [:role1, :role2], :hosts => 'server1.foo.com'})
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role2', {:roles => [:role1, :role2], :hosts => 'server2.foo.com'})
+
+          @capistrano.whenever_run_commands(:command => "whenever",
+                                            :path => "/foo/bar",
+                                            :flags => "--flag1 --flag2")
+        end
+
+        should "call run w/ all role args for servers w/ >1 role" do
+          @capistrano.stubs(:role_names_for_host).with(@mock_server1).returns([:role1, :role3])
+          @capistrano.stubs(:whenever_servers).returns([@mock_servers.first])
+          roles = [:role1, :role2, :role3]
+          @capistrano.stubs(:whenever_options).returns({:roles => roles})
+
+          @capistrano.expects(:run).once.with('cd /foo/bar && whenever --flag1 --flag2 --roles role1,role3', {:roles => [:role1, :role2, :role3], :hosts => 'server1.foo.com'})
+
+          @capistrano.whenever_run_commands(:command => "whenever",
+                                            :path => "/foo/bar",
+                                            :flags => "--flag1 --flag2")
+        end
+      end
+    end
+  end
+end

data/test/unit/cron_test.rb

@@ -218,6 +218,7 @@ class CronTest < Test::Unit::TestCase
   context "When given raw cron sytax" do
     should "return the same cron sytax" do
       crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *',
+               "*\t*\t*\t*\t*",
                '@reboot', '@yearly', '@annually', '@monthly', '@weekly',
                '@daily', '@midnight', '@hourly']
       crons.each do |cron|

data/test/unit/job_test.rb

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

data/whenever.gemspec

@@ -15,17 +15,11 @@ 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.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"
-  
-  # I'm not sure why this isn't installed along with activesupport,
-  # but for whatever reason running `bundle install` doesn't install
-  # i18n so I'm adding it here for now.
-  # https://github.com/rails/rails/blob/master/activesupport/activesupport.gemspec#L19 ?
-  s.add_development_dependency "i18n"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  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
@@ -128,6 +112,7 @@ files:
 - lib/whenever.rb
 - lib/whenever/capistrano.rb
 - lib/whenever/capistrano/recipes.rb
+- lib/whenever/capistrano/support.rb
 - lib/whenever/command_line.rb
 - lib/whenever/cron.rb
 - lib/whenever/job.rb
@@ -140,8 +125,10 @@ files:
 - test/functional/output_default_defined_jobs_test.rb
 - test/functional/output_defined_job_test.rb
 - test/functional/output_env_test.rb
+- test/functional/output_jobs_for_roles_test.rb
 - test/functional/output_redirection_test.rb
 - test/test_helper.rb
+- test/unit/capistrano_support_test.rb
 - test/unit/cron_test.rb
 - test/unit/job_test.rb
 - whenever.gemspec
@@ -175,6 +162,8 @@ test_files:
 - test/functional/output_default_defined_jobs_test.rb
 - test/functional/output_defined_job_test.rb
 - test/functional/output_env_test.rb
+- test/functional/output_jobs_for_roles_test.rb
 - test/functional/output_redirection_test.rb
+- test/unit/capistrano_support_test.rb
 - test/unit/cron_test.rb
 - test/unit/job_test.rb