whenever 0.8.2 → 1.0.0

data/lib/whenever/job_list.rb

@@ -30,10 +30,17 @@ module Whenever
       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 method_missing(name, *args, &block)
+      @set_variables.has_key?(name) ? @set_variables[name] : super
+    end
+
+    def self.respond_to?(name, include_private = false)
+      @set_variables.has_key?(name) || super
+    end
+
     def env(variable, value)
       @env[variable.to_s] = value
     end
@@ -45,18 +52,21 @@ module Whenever
     end
 
     def job_type(name, template)
-      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
 
+          options[:mailto] ||= @options.fetch(:mailto, :default_mailto)
+
           # :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))
+          @jobs[options.fetch(:mailto)] ||= {}
+          @jobs[options.fetch(:mailto)][@current_time_scope] ||= []
+          @jobs[options.fetch(:mailto)][@current_time_scope] << Whenever::Job.new(@options.merge(@set_variables).merge(options))
         end
       end
     end
@@ -73,13 +83,13 @@ module Whenever
     # Only works for setting values as strings.
     #
     def pre_set(variable_string = nil)
-      return if variable_string.blank?
+      return if variable_string.nil? || variable_string == ""
 
       pairs = variable_string.split('&')
       pairs.each do |pair|
         next unless pair.index('=')
         variable, value = *pair.split('=')
-        unless variable.blank? || value.blank?
+        unless variable.nil? || variable == "" || value.nil? || value == ""
           variable = variable.strip.to_sym
           set(variable, value.strip)
           @pre_set_variables[variable] = value
@@ -92,7 +102,7 @@ module Whenever
 
       output = []
       @env.each do |key, val|
-        output << "#{key}=#{val.blank? ? '""' : val}\n"
+        output << "#{key}=#{val.nil? || val == "" ? '""' : val}\n"
       end
       output << "\n"
 
@@ -125,31 +135,51 @@ module Whenever
       entries.map { |entry| entry.join(' ') }
     end
 
+    def cron_jobs_of_time(time, jobs)
+      shortcut_jobs, regular_jobs = [], []
+
+      jobs.each do |job|
+        next unless roles.empty? || roles.any? do |r|
+          job.has_role?(r)
+        end
+        Whenever::Output::Cron.output(time, job, :chronic_options => @chronic_options) do |cron|
+          cron << "\n\n"
+
+          if cron[0,1] == "@"
+            shortcut_jobs << cron
+          else
+            regular_jobs << cron
+          end
+        end
+      end
+
+      shortcut_jobs.join + combine(regular_jobs).join
+    end
+
     def cron_jobs
       return if @jobs.empty?
 
-      shortcut_jobs = []
-      regular_jobs = []
+      output = []
 
-      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"
+      # jobs with default mailto's must be output before the ones with non-default mailto's.
+      @jobs.delete(:default_mailto) { Hash.new }.each do |time, jobs|
+        output << cron_jobs_of_time(time, jobs)
+      end
 
-            if cron.starts_with?("@")
-              shortcut_jobs << cron
-            else
-              regular_jobs << cron
-            end
-          end
+      @jobs.each do |mailto, time_and_jobs|
+        output_jobs = []
+
+        time_and_jobs.each do |time, jobs|
+          output_jobs << cron_jobs_of_time(time, jobs)
         end
+
+        output_jobs.reject! { |output_job| output_job.empty? }
+
+        output << "MAILTO=#{mailto}\n\n" unless output_jobs.empty?
+        output << output_jobs
       end
 
-      shortcut_jobs.join + combine(regular_jobs).join
+      output.join
     end
   end
 end

data/lib/whenever/numeric.rb

@@ -0,0 +1,13 @@
+Numeric.class_eval do
+  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

@@ -0,0 +1,48 @@
+module Whenever
+  class NumericSeconds
+    attr_reader :number
+
+    def self.seconds(number, units)
+      new(number).send(units)
+    end
+
+    def initialize(number)
+      @number = number.to_i
+    end
+
+    def seconds
+      number
+    end
+    alias :second :seconds
+
+    def minutes
+      number * 60
+    end
+    alias :minute :minutes
+
+    def hours
+      number * 3_600
+    end
+    alias :hour :hours
+
+    def days
+      number * 86_400
+    end
+    alias :day :days
+
+    def weeks
+      number * 604_800
+    end
+    alias :week :weeks
+
+    def months
+      number * 2_592_000
+    end
+    alias :month :months
+
+    def years
+      number * 31_557_600
+    end
+    alias :year :years
+  end
+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/output_redirection.rb

@@ -11,6 +11,7 @@ module Whenever
           when String   then redirect_from_string
           when Hash     then redirect_from_hash
           when NilClass then ">> /dev/null 2>&1"
+          when Proc     then @output.call
           else ''
         end 
       end

data/lib/whenever/setup.rb

@@ -1,26 +1,30 @@
+# Environment variable defaults to RAILS_ENV
+set :environment_variable, "RAILS_ENV"
 # Environment defaults to production
 set :environment, "production"
 # Path defaults to the directory `whenever` was run from
 set :path, Whenever.path
 
+# Custom Chronic configuration for time parsing, empty by default
+# Full list of options at: https://github.com/mojombo/chronic/blob/master/lib/chronic/parser.rb
+set :chronic_options, {}
+
 # All jobs are wrapped in this template.
 # 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"
+set :runner_command, case
+  when Whenever.bin_rails?
+    "bin/rails runner"
+  when Whenever.script_rails?
+    "script/rails runner"
+  else
+    "script/runner"
+  end
 
-# 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
+set :bundle_command, Whenever.bundler? ? "bundle exec" : ""
 
-# Create a runner job that's appropriate for the Rails version,
-if Whenever.rails3?
-  job_type :runner, "cd :path && script/rails runner -e :environment ':task' :output"
-else
-  job_type :runner, "cd :path && script/runner -e :environment ':task' :output"
-end
+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 && :bundle_command :runner_command -e :environment ':task' :output"

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.8.2'
-end
+  VERSION = '1.0.0'
+end

data/lib/whenever.rb

@@ -1,29 +1,34 @@
-require 'thread'
-require 'active_support/all'
+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
-  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.seconds(number, units)
+    Whenever::NumericSeconds.seconds(number, units)
+  end
+
   def self.path
     Dir.pwd
   end
 
-  def self.rails3?
-    File.exists?(File.join(path, 'script', 'rails'))
+  def self.bin_rails?
+    File.exist?(File.join(path, 'bin', 'rails'))
+  end
+
+  def self.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