whenever 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57fab9163bf16e91c0bd53c2a07a42ff6d27808c
-  data.tar.gz: a2391734b582cffc7ca2d1b03a4dd8302c84f7ca
+  metadata.gz: 0615f43fa1b0a98f86c01020d35ae339a2767917
+  data.tar.gz: cb5c35a7f4703864be41ef4d5692092a190a8cd2
 SHA512:
-  metadata.gz: 923b43401e3f57f83c1a6095a58c127157bf884433939cf64c8deb766cb48873526c91faf009774358b965b9c3768a159fbb9cafde83ed3d68c1a38f68cae954
-  data.tar.gz: 185ac668deaa57c7cfdd4b192b8d19b0bf5bc70e68fe5d5b54454ef6ecd6b30dba0889af0da219095bb4f50327158bf8be0342d17737adb60e9613c5ac5b0bb4
+  metadata.gz: 3aefffaf5046d3501ff117d470281dad9eb079b11a979e2b810adf707f69d5dbdaffc2aac56aaed8b3125637742506e5e29129af5fc0163463e6eab42bacb416
+  data.tar.gz: f1e06eb27177312e775da44615de0fd79a9cb8ba331f7d525cb82c28d158a0731edf5981660339a4651712667dfd9dba4dc16e04bcb2be2b90a5826dc1dbed71

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ree
   - jruby
   - jruby-18mode

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.9.1 / March 2, 2014
+
+* Pass `--roles` option to `whenever` in Capistrano 3 tasks. [betesh, Javan Makhmali]
+
+* Allow setting `:whenever_command` for Capistrano 3. [Javan Makhmali]
+
+* Allow `:whenever` command to be mapped in SSHKit. [Javan Makhmali]
+
+
 ### 0.9.0 / December 17, 2013
 
 * Capistrano V3 support. [Philip Hallstrom]

data/LICENSE

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

data/README.md

@@ -106,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/recipes.rb>
+Take a look at the recipe for options you can set. <https://github.com/javan/whenever/blob/master/lib/whenever/capistrano/v2/recipes.rb>
 For example, if you're using bundler do this:
 
 ```ruby
@@ -139,14 +139,6 @@ In your "Capfile" file:
 require "whenever/capistrano"
 ```
 
-If you're using bundler do this.  **DO NOT** set ':whenever_command' to 'bundle exec whenever'.  It will **NOT** work.
-Be default, 'bundle exec whenever' will be called.  If you need something different and the command contains a space
-you will need to map it via the following method.  This is an issue with SSHKit.
-
-```ruby
-SSHKit.config.command_map[:whenever] = "bundle exec whenever"
-```
-
 Take a look at the load:defaults (bottom of file) task for options you can set. <http://github.com/javan/whenever/blob/master/lib/whenever/tasks/whenever.rake>. For example, to namespace the crontab entries by application and stage do this.
 
 ```ruby
@@ -215,7 +207,7 @@ If your production environment uses RVM (Ruby Version Manager) you will run into
 
 `rvm_trust_rvmrcs_flag=1`
 
-This tells rvm to trust all rvmrc files, which is documented here: http://wayneeseguin.beginrescueend.com/2010/08/22/ruby-environment-version-manager-rvm-1-0-0/
+This tells rvm to trust all rvmrc files.
 
 ### The `whenever` command
 
@@ -243,8 +235,8 @@ It's a little bit dated now, but remains a good introduction.
 
 ----
 
-Compatible with Ruby 1.8.7-2.0.0, 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-2.1.0, JRuby, and Rubinius. [![Build Status](https://secure.travis-ci.org/javan/whenever.png)](http://travis-ci.org/javan/whenever)
 
 ----
 
-Copyright &copy; 2013 Javan Makhmali
+Copyright &copy; 2014 Javan Makhmali

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

@@ -1,40 +1,39 @@
 namespace :whenever do
-  desc "Update application's crontab entries using Whenever"
-  task :update_crontab do
-    on roles fetch(:whenever_roles) do
+  def setup_whenever_task(*args, &block)
+    SSHKit.config.command_map[:whenever] = fetch(:whenever_command)
+
+    on roles fetch(:whenever_roles) do |host|
+      args = args + Array(yield(host)) if block_given?
       within release_path do
-        if fetch(:whenever_command)
-          execute fetch(:whenever_command), fetch(:whenever_update_flags)
-        else
-          execute :bundle, :exec, :whenever, fetch(:whenever_update_flags)
+        with fetch(:whenever_command_environment_variables) do
+          execute :whenever, *args
         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
-    on roles fetch(:whenever_roles) do
-      within release_path do
-        if fetch(:whenever_command)
-          execute %{#{fetch(:whenever_command)} #{fetch(:whenever_clear_flags)}}
-        else
-          execute :bundle, :exec, :whenever, fetch(:whenever_clear_flags)
-        end
-      end
-    end
+    setup_whenever_task(fetch(:whenever_clear_flags))
   end
 
-  after 'deploy:updated', 'whenever:update_crontab'
-  after 'deploy:reverted', 'whenever:update_crontab'
-  
+  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_options,      ->{ {:roles => fetch(:whenever_roles)} }
-    set :whenever_command,      ->{  }
+    set :whenever_command,      ->{ "bundle exec whenever" }
+    set :whenever_command_environment_variables, ->{ {} }
     set :whenever_identifier,   ->{ fetch :application }
     set :whenever_environment,  ->{ fetch :rails_env, "production" }
     set :whenever_variables,    ->{ "environment=#{fetch :whenever_environment}" }

data/lib/whenever/job.rb

@@ -17,11 +17,8 @@ module Whenever
     end
 
     def output
-      job = process_template(@template, @options).strip
-      out = process_template(@job_template, @options.merge(:job => job)).strip
-      if out =~ /\n/
-        raise ArgumentError, "Task contains newline"
-      end
+      job = process_template(@template, @options)
+      out = process_template(@job_template, @options.merge(:job => job))
       out.gsub(/%/, '\%')
     end
 
@@ -43,7 +40,7 @@ module Whenever
         else
           option
         end
-      end
+      end.squish
     end
 
     def escape_single_quotes(str)

data/lib/whenever/setup.rb

@@ -9,20 +9,7 @@ set :path, Whenever.path
 # http://blog.scoutapp.com/articles/2010/09/07/rvm-and-cron-in-production
 set :job_template, "/bin/bash -l -c ':job'"
 
-job_type :command, ":task :output"
-
-# Run rake through bundler if possible
-if Whenever.bundler?
-  job_type :rake, "cd :path && :environment_variable=:environment bundle exec rake :task --silent :output"
-  job_type :script, "cd :path && :environment_variable=:environment bundle exec script/:task :output"
-else
-  job_type :rake, "cd :path && :environment_variable=:environment rake :task --silent :output"
-  job_type :script, "cd :path && :environment_variable=:environment script/:task :output"
-end
-
-# Create a runner job that's appropriate for the Rails version
-def runner_for_app
-  case
+set :runner_command, case
   when Whenever.bin_rails?
     "bin/rails runner"
   when Whenever.script_rails?
@@ -30,6 +17,10 @@ def runner_for_app
   else
     "script/runner"
   end
-end
 
-job_type :runner, "cd :path && #{runner_for_app} -e :environment ':task' :output"
+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"

data/lib/whenever/tasks/whenever.rake

@@ -1,40 +1,39 @@
 namespace :whenever do
-  desc "Update application's crontab entries using Whenever"
-  task :update_crontab do
-    on roles fetch(:whenever_roles) do
+  def setup_whenever_task(*args, &block)
+    SSHKit.config.command_map[:whenever] = fetch(:whenever_command)
+
+    on roles fetch(:whenever_roles) do |host|
+      args = args + Array(yield(host)) if block_given?
       within release_path do
-        if fetch(:whenever_command)
-          execute fetch(:whenever_command), fetch(:whenever_update_flags)
-        else
-          execute :bundle, :exec, :whenever, fetch(:whenever_update_flags)
+        with fetch(:whenever_command_environment_variables) do
+          execute :whenever, *args
         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
-    on roles fetch(:whenever_roles) do
-      within release_path do
-        if fetch(:whenever_command)
-          execute %{#{fetch(:whenever_command)} #{fetch(:whenever_clear_flags)}}
-        else
-          execute :bundle, :exec, :whenever, fetch(:whenever_clear_flags)
-        end
-      end
-    end
+    setup_whenever_task(fetch(:whenever_clear_flags))
   end
 
-  after 'deploy:updated', 'whenever:update_crontab'
-  after 'deploy:reverted', 'whenever:update_crontab'
-  
+  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_options,      ->{ {:roles => fetch(:whenever_roles)} }
-    set :whenever_command,      ->{  }
+    set :whenever_command,      ->{ "bundle exec whenever" }
+    set :whenever_command_environment_variables, ->{ {} }
     set :whenever_identifier,   ->{ fetch :application }
     set :whenever_environment,  ->{ fetch :rails_env, "production" }
     set :whenever_variables,    ->{ "environment=#{fetch :whenever_environment}" }

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/test/unit/job_test.rb

@@ -54,14 +54,13 @@ class JobTest < Test::Unit::TestCase
       assert_equal %q(before percent preceded by a backslash -> \\\% <- after), job.output
     end
 
-    should "reject newlines" do
+    should "squish spaces and newlines" do
       job = new_job(
         :template => "before :foo after",
-        :foo => "newline -> \n <- newline"
+        :foo => "newline -> \n <- newline space ->     <- space"
       )
-      assert_raise ArgumentError do
-        job.output
-      end
+
+      assert_equal "before newline -> <- newline space -> <- space after", job.output
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whenever
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Cron jobs in ruby.