whenever 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7b1f246b22c910d7f50418153572714548f3a7
-  data.tar.gz: cc253c6228c7e36d7f07032d5272e442d2eb6b08
+  metadata.gz: a1b180d6b22aaf3199ec47903e36483b327aeafd
+  data.tar.gz: 91102f27ed51d7821ff1888ea73e92a65e402bb5
 SHA512:
-  metadata.gz: bccd024f09f270d95b331f2c7177dad4914865eaacb5f83392f12a30fd1272cdfb3179dfaa731d84d63796a1f12a00d38b612b220fd46373a06ed7d0eeb0c90b
-  data.tar.gz: 8cfcfb3ae75cf378878631528a397618f369743639e34e51a63a53b6ee0c59c919969cbb7152e59775a46478fb0b3232ec228a69c1b968668cb77a360a734106
+  metadata.gz: f7044dac57adb8271c293e67efca30307731b7107415daa144e7dbd86cd273631df06d4cfda5142a592b936c0c06dcb44b2902969be837a304a57d86e2bf4022
+  data.tar.gz: d8f94fb6114a737eb9b5d17c9884deba827057763b0c45af7e04e6ed5971101142f2df3bfc7bf37b75015f8d844e08f0ff3fd985f3214f61fc4e0d5748a1b929

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+script: bundle exec rake
 rvm:
   - 1.8.7
   - 1.9.2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.9.3 / October 5, 2014
+
+* Drop ActiveSupport dependency [James Healy, Javan Makhmali]
+
+* Drop shoulda for tests
+
+* Fix `whenever:clear_crontab` Cap 3 task [Javan Makhmali]
+
+* Avoid using tempfiles [ahoward]
+
+
 ### 0.9.2 / March 4, 2014
 
 * Fix issues generating arguments for `execute` in Capistrano 3 tasks. [Javan Makhmali]

data/Gemfile

@@ -2,8 +2,3 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in whenever.gemspec
 gemspec
-
-if RUBY_VERSION < "1.9.3"
-  gem "activesupport", "< 4.0.0"
-  gem "shoulda-matchers", "<= 2.0.0"
-end

data/README.md

@@ -139,7 +139,9 @@ In your "Capfile" file:
 require "whenever/capistrano"
 ```
 
-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.
+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:
 
 ```ruby
 set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }

data/lib/whenever.rb

@@ -1,20 +1,19 @@
-require 'thread'
-require 'active_support/all'
+require 'whenever/numeric_seconds'
+require 'whenever/job_list'
+require 'whenever/job'
+require 'whenever/command_line'
+require 'whenever/cron'
+require 'whenever/output_redirection'
 
 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

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

@@ -3,10 +3,10 @@ namespace :whenever do
     args = Array(fetch(:whenever_command)) + args
 
     on roles fetch(:whenever_roles) do |host|
-      host_args = Array(yield(host))
+      args = args + Array(yield(host)) if block_given?
       within release_path do
         with fetch(:whenever_command_environment_variables) do
-          execute *(args + host_args)
+          execute *args
         end
       end
     end

data/lib/whenever/command_line.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'tempfile'
 
 module Whenever
   class CommandLine
@@ -66,23 +65,24 @@ module Whenever
     end
 
     def write_crontab(contents)
-      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.path
+      command << "-"
+
+      IO.popen(command.join(' '), 'r+') do |crontab|
+        crontab.write(contents)
+        crontab.close_write
+      end
+
+      success = $?.exitstatus.zero?
 
-      if system(command.join(' '))
+      if success
         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

@@ -60,11 +60,11 @@ module Whenever
       def parse_symbol
         shortcut = case @time
           when *KEYWORDS then "@#{@time}" # :reboot => '@reboot'
-          when :year     then 12.months
-          when :day      then 1.day
-          when :month    then 1.month
-          when :week     then 1.week
-          when :hour     then 1.hour
+          when :year     then Whenever.seconds(12, :months)
+          when :day      then Whenever.seconds(1, :day)
+          when :month    then Whenever.seconds(1, :month)
+          when :week     then Whenever.seconds(1, :week)
+          when :hour     then Whenever.seconds(1, :hour)
         end
 
         if shortcut.is_a?(Numeric)
@@ -84,21 +84,21 @@ module Whenever
       def parse_time
         timing = Array.new(5, '*')
         case @time
-          when 0.seconds...1.minute
+          when Whenever.seconds(0, :seconds)...Whenever.seconds(1, :minute)
             raise ArgumentError, "Time must be in minutes or higher"
-          when 1.minute...1.hour
+          when Whenever.seconds(1, :minute)...Whenever.seconds(1, :hour)
             minute_frequency = @time / 60
             timing[0] = comma_separated_timing(minute_frequency, 59, @at || 0)
-          when 1.hour...1.day
+          when Whenever.seconds(1, :hour)...Whenever.seconds(1, :day)
             hour_frequency = (@time / 60 / 60).round
             timing[0] = @at.is_a?(Time) ? @at.min : @at
             timing[1] = comma_separated_timing(hour_frequency, 23)
-          when 1.day...1.month
+          when Whenever.seconds(1, :day)...Whenever.seconds(1, :month)
             day_frequency = (@time / 24 / 60 / 60).round
             timing[0] = @at.is_a?(Time) ? @at.min  : 0
             timing[1] = @at.is_a?(Time) ? @at.hour : @at
             timing[2] = comma_separated_timing(day_frequency, 31, 1)
-          when 1.month..12.months
+          when Whenever.seconds(1, :month)..Whenever.seconds(12, :months)
             month_frequency = (@time / 30  / 24 / 60 / 60).round
             timing[0] = @at.is_a?(Time) ? @at.min  : 0
             timing[1] = @at.is_a?(Time) ? @at.hour : 0
@@ -133,7 +133,7 @@ module Whenever
       end
 
       def comma_separated_timing(frequency, max, start = 0)
-        return start     if frequency.blank? || frequency.zero?
+        return start     if frequency.nil? || frequency == "" || frequency.zero?
         return '*'       if frequency == 1
         return frequency if frequency > (max * 0.5).ceil
 

data/lib/whenever/job.rb

@@ -9,7 +9,7 @@ module Whenever
       @at                               = options.delete(:at)
       @template                         = options.delete(:template)
       @job_template                     = options.delete(:job_template) || ":job"
-      @roles                            = Array.wrap(options.delete(:roles))
+      @roles                            = Array(options.delete(:roles))
       @options[:output]                 = options.has_key?(:output) ? Whenever::Output::Redirection.new(options[:output]).to_s : ''
       @options[:environment_variable] ||= "RAILS_ENV"
       @options[:environment]          ||= :production
@@ -40,7 +40,7 @@ module Whenever
         else
           option
         end
-      end.squish
+      end.gsub(/\s+/m, " ").strip
     end
 
     def escape_single_quotes(str)

data/lib/whenever/job_list.rb

@@ -21,8 +21,8 @@ module Whenever
         File.read(options[:file])
       end
 
-      instance_eval(setup, setup_file)
-      instance_eval(schedule, options[:file] || '<eval>')
+      instance_eval(Whenever::NumericSeconds.process_string(setup), setup_file)
+      instance_eval(Whenever::NumericSeconds.process_string(schedule), options[:file] || '<eval>')
     end
 
     def set(variable, value)
@@ -45,7 +45,7 @@ module Whenever
     end
 
     def job_type(name, template)
-      class_eval do
+      singleton_class_shim.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,19 +67,30 @@ 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_clas)
+        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.
     # 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 +103,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"
 
@@ -140,7 +151,7 @@ module Whenever
           Whenever::Output::Cron.output(time, job) do |cron|
             cron << "\n\n"
 
-            if cron.starts_with?("@")
+            if cron[0,1] == "@"
               shortcut_jobs << cron
             else
               regular_jobs << cron

data/lib/whenever/numeric_seconds.rb

@@ -0,0 +1,54 @@
+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
+
+    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/tasks/whenever.rake

@@ -3,10 +3,10 @@ namespace :whenever do
     args = Array(fetch(:whenever_command)) + args
 
     on roles fetch(:whenever_roles) do |host|
-      host_args = Array(yield(host))
+      args = args + Array(yield(host)) if block_given?
       within release_path do
         with fetch(:whenever_command_environment_variables) do
-          execute *(args + host_args)
+          execute *args
         end
       end
     end

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/test/functional/command_line_test.rb

@@ -1,44 +1,42 @@
-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)
-      @command = Whenever::CommandLine.new(:write => true, :identifier => 'My identifier')
-      @task = "#{two_hours} /my/command"
-      Whenever.expects(:cron).returns(@task)
-    end
+require 'test_helper'
+
+class CommandLineWriteTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).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)
+  end
 
-    should "output the cron job with identifier blocks" do
-      output = <<-EXPECTED
+  should "output the cron job with identifier blocks" do
+    output = <<-EXPECTED
 # Begin Whenever generated tasks for: My identifier
 #{@task}
 # End Whenever generated tasks for: My identifier
 EXPECTED
 
-      assert_equal output, @command.send(:whenever_cron)
-    end
+    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
+  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)
-      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
-      @task = "#{two_hours} /my/command"
-      Whenever.expects(:cron).returns(@task)
-    end
+class CommandLineUpdateTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).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)
+  end
 
-    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)
+  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
+    new_cron = <<-EXPECTED
 #{existing}
 
 # Begin Whenever generated tasks for: My identifier
@@ -46,14 +44,14 @@ EXPECTED
 # End Whenever generated tasks for: My identifier
 EXPECTED
 
-      assert_equal new_cron, @command.send(:updated_crontab)
+    assert_equal new_cron, @command.send(:updated_crontab)
 
-      @command.expects(:write_crontab).with(new_cron).returns(true)
-      assert @command.run
-    end
+    @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
+  should "replace an existing block if the identifier matches" do
+    existing = <<-EXISTING_CRON
 # Something
 
 # Begin Whenever generated tasks for: My identifier
@@ -65,7 +63,7 @@ This shouldn't get replaced
 # End Whenever generated tasks for: Other identifier
 EXISTING_CRON
 
-      new_cron = <<-NEW_CRON
+    new_cron = <<-NEW_CRON
 # Something
 
 # Begin Whenever generated tasks for: My identifier
@@ -77,62 +75,62 @@ 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(: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
+    @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
+class CommandLineUpdateWithBackslashesTest < Whenever::TestCase
+  setup do
+    @existing = <<-EXISTING_CRON
 # Begin Whenever generated tasks for: My identifier
 script/runner -e production 'puts '\\''hello'\\'''
 # End Whenever generated tasks for: My identifier
 EXISTING_CRON
-      File.expects(:exists?).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)
-    end
+    File.expects(:exists?).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)
+  end
 
-    should "replace the existing block with the backslashes in tact" do
-      assert_equal @existing, @command.send(:updated_crontab)
-    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
+class CommandLineUpdateToSimilarCrontabTest < Whenever::TestCase
+  setup do
+    @existing = <<-EXISTING_CRON
 # Begin Whenever generated tasks for: WheneverExisting
 # End Whenever generated tasks for: WheneverExisting
 EXISTING_CRON
-      @new = <<-NEW_CRON
+    @new = <<-NEW_CRON
 # Begin Whenever generated tasks for: Whenever
 # End Whenever generated tasks for: Whenever
 NEW_CRON
-      File.expects(:exists?).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)
-    end
-
-    should "append the similarly named command" do
-      assert_equal @existing + "\n" + @new, @command.send(:updated_crontab)
-    end
-  end
-
-  context "A command line clear" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-      @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
-      @task = "#{two_hours} /my/command"
-    end
-
-    should "clear an existing block if the identifier matches" do
-      existing = <<-EXISTING_CRON
+    File.expects(:exists?).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)
+  end
+
+  should "append the similarly named command" do
+    assert_equal @existing + "\n" + @new, @command.send(:updated_crontab)
+  end
+end
+
+class CommandLineClearTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
+    @task = "#{two_hours} /my/command"
+  end
+
+  should "clear an existing block if the identifier matches" do
+    existing = <<-EXISTING_CRON
 # Something
 
 # Begin Whenever generated tasks for: My identifier
@@ -144,9 +142,9 @@ This shouldn't get replaced
 # End Whenever generated tasks for: Other identifier
 EXISTING_CRON
 
-      @command.expects(:read_crontab).at_least_once.returns(existing)
+    @command.expects(:read_crontab).at_least_once.returns(existing)
 
-      new_cron = <<-NEW_CRON
+    new_cron = <<-NEW_CRON
 # Something
 
 # Begin Whenever generated tasks for: Other identifier
@@ -154,137 +152,138 @@ This shouldn't get replaced
 # End Whenever generated tasks for: Other identifier
 NEW_CRON
 
-      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 clear with no schedule file" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(false)
-      @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
-    end
-
-    should "run successfully" do
-      @command.expects(:write_crontab).returns(true)
-      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)
-      Whenever::CommandLine.any_instance.expects(:default_identifier).returns('DEFAULT')
-      @command = Whenever::CommandLine.new(:update => true, :file => @file)
-    end
-
-    should "use the default identifier" do
-      assert_equal "Whenever generated tasks for: DEFAULT", @command.send(:comment_base)
-    end
-  end
-
-  context "combined params" do
-    setup do
-      Whenever::CommandLine.any_instance.expects(:exit)
-      Whenever::CommandLine.any_instance.expects(:warn)
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-    end
-
-    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
-
-    should "exit with update and clear" do
-      @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 => \
-      <<-file
-        set :job_template, nil
-        set :environment, :silly
-        set :path, '/my/path'
-        every 2.hours do
-          runner "blahblah"
-        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 => \
-      <<-file
-        set :job_template, nil
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        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 => \
-      <<-file
-        set :job_template, nil
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        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 => \
-      <<-file
-        set :job_template, nil
-        set :environment, :silly
-        set :path, '/silly/path'
-        every 2.hours do
-          runner "blahblah"
-        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
-  end
-
-  context "prepare-ing the output" do
-    setup do
-      File.expects(:exists?).with('config/schedule.rb').returns(true)
-    end
-
-    should "not trim off the top lines of the file" do
-      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => 0)
-      existing = <<-EXISTING_CRON
+    assert_equal new_cron, @command.send(:updated_crontab)
+
+    @command.expects(:write_crontab).with(new_cron).returns(true)
+    assert @command.run
+  end
+end
+
+class CommandLineClearWithNoScheduleTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).with('config/schedule.rb').returns(false)
+    @command = Whenever::CommandLine.new(:clear => true, :identifier => 'My identifier')
+  end
+
+  should "run successfully" do
+    @command.expects(:write_crontab).returns(true)
+    assert @command.run
+  end
+end
+
+class CommandLineUpdateWithNoIdentifierTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).with('config/schedule.rb').returns(true)
+    Whenever::CommandLine.any_instance.expects(:default_identifier).returns('DEFAULT')
+    @command = Whenever::CommandLine.new(:update => true, :file => @file)
+  end
+
+  should "use the default identifier" do
+    assert_equal "Whenever generated tasks for: DEFAULT", @command.send(:comment_base)
+  end
+end
+
+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)
+  end
+
+  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
+
+  should "exit with update and clear" do
+    @command = Whenever::CommandLine.new(:update => true, :clear => true)
+  end
+end
+
+class RunnerOverwrittenWithSetOptionTest < Whenever::TestCase
+  setup do
+    @output = Whenever.cron :set => 'environment=serious', :string => \
+    <<-file
+      set :job_template, nil
+      set :environment, :silly
+      set :path, '/my/path'
+      every 2.hours do
+        runner "blahblah"
+      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
+
+
+class EnvironmentAndPathOverwrittenWithSetOptionTest < Whenever::TestCase
+  setup do
+    @output = Whenever.cron :set => 'environment=serious&path=/serious/path', :string => \
+    <<-file
+      set :job_template, nil
+      set :environment, :silly
+      set :path, '/silly/path'
+      every 2.hours do
+        runner "blahblah"
+      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
+
+class EnvironmentAndPathOverwrittenWithSetOptionWithSpacesTest < Whenever::TestCase
+  setup do
+    @output = Whenever.cron :set => ' environment = serious&  path =/serious/path', :string => \
+    <<-file
+      set :job_template, nil
+      set :environment, :silly
+      set :path, '/silly/path'
+      every 2.hours do
+        runner "blahblah"
+      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
+
+class EnvironmentOverwrittenWithoutValueTest < Whenever::TestCase
+  setup do
+    @output = Whenever.cron :set => ' environment=', :string => \
+    <<-file
+      set :job_template, nil
+      set :environment, :silly
+      set :path, '/silly/path'
+      every 2.hours do
+        runner "blahblah"
+      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
+end
+
+class PreparingOutputTest < Whenever::TestCase
+  setup do
+    File.expects(:exists?).with('config/schedule.rb').returns(true)
+  end
+
+  should "not trim off the top lines of the file" do
+    @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => 0)
+    existing = <<-EXISTING_CRON
 # Useless Comments
 # at the top of the file
 
@@ -293,12 +292,12 @@ My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 EXISTING_CRON
 
-      assert_equal existing, @command.send(:prepare, existing)
-    end
+    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
+  should "trim off the top lines of the file" do
+    @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier', :cut => '3')
+    existing = <<-EXISTING_CRON
 # Useless Comments
 # at the top of the file
 
@@ -307,18 +306,18 @@ My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 EXISTING_CRON
 
-      new_cron = <<-NEW_CRON
+    new_cron = <<-NEW_CRON
 # Begin Whenever generated tasks for: My identifier
 My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 NEW_CRON
 
-      assert_equal new_cron, @command.send(:prepare, existing)
-    end
+    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
+  should "preserve terminating newlines in files" do
+    @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
+    existing = <<-EXISTING_CRON
 # Begin Whenever generated tasks for: My identifier
 My whenever job that was already here
 # End Whenever generated tasks for: My identifier
@@ -327,8 +326,6 @@ My whenever job that was already here
 My non-whenever job that was already here
 EXISTING_CRON
 
-      assert_equal existing, @command.send(:prepare, existing)
-    end
+    assert_equal existing, @command.send(:prepare, existing)
   end
-
 end