whenever 0.8.2 → 1.0.0

data/test/functional/output_redirection_test.rb

@@ -1,307 +1,248 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
-class OutputRedirectionTest < Test::Unit::TestCase
-
-  context "A command when the output is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, nil
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-  
-    should "output the command with the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, @output
-    end
-  end
-
+require 'test_helper'
+
+class OutputRedirectionTest < Whenever::TestCase
+  test "command when the output is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, nil
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> \/dev\/null 2>&1$/, output)
+  end
+
+
+  test "command when the output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, output)
+  end
+
+  test "command when the error and standard output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => 'dev_null', :error => 'dev_err'}
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
+  end
+
+  test "command when the output is set and the comand overrides it" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => 'otherlog.log'
+      end
+    file
+
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, output)
+  end
+
+  test "command when the output is set and the comand overrides with standard and error" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => {:error => 'dev_err', :standard => 'dev_null' }
+      end
+    file
+
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
+  end
+
+  test "command when the output is set and the comand rejects it" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah", :output => false
+      end
+    file
+
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah$/, output)
+  end
+
+  test "command when the output is set and is overridden by the :set option" do
+    output = Whenever.cron :set => 'output=otherlog.log', :string => \
+    <<-file
+      set :job_template, nil
+      set :output, 'logfile.log'
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_no_match(/.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, output)
+    assert_match(/^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, output)
+  end
+
+  test "command when the error and standard output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:error => 'dev_err', :standard => 'dev_null' }
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, output)
+  end
+
+  test "command when error output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:error => 'dev_null'}
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah 2>> dev_null$/, output)
+  end
+
+  test "command when the standard output is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, {:standard => 'dev_out'}
+      every 2.hours do
+        command "blahblah"
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_out$/, output)
+  end
+
+  test "command when error output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => 'dev_err'}
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah 2>> dev_err$/, output)
+  end
+
+  test "command when standard output is set by the command" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => 'dev_out'}
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah >> dev_out$/, output)
+  end
+
+  test "command when standard output is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:standard => nil}
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah > \/dev\/null$/, output)
+  end
+
+  test "command when standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil}
+      end
+    file
+
+    assert_match(/^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, output)
+  end
+
+  test "command when standard output and standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil, :standard => nil}
+      end
+    file
 
-  context "A command when the output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-  
-    should "output the command with the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> logfile.log 2>&1$/, @output
-    end
+    assert_match(/^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, output)
   end
 
-  context "A command when the error and standard output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => 'dev_null', :error => 'dev_err'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
-  end
+  test "command when standard output is set and standard error is set to nil" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => nil, :standard => 'my.log'}
+      end
+    file
 
-  context "A command when the output is set and the comand overrides it" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => 'otherlog.log'
-        end
-      file
-    end
-  
-    should "output the command with the command syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, @output
-    end
+    assert_match(/^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, output)
   end
 
-  context "A command when the output is set and the comand overrides with standard and error" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => {:error => 'dev_err', :standard => 'dev_null' }
-        end
-      file
-    end
-  
-    should "output the command with the overridden redirection syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
-  end
+  test "command when standard output is nil and standard error is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      every 2.hours do
+        command "blahblah", :output => {:error => 'my_error.log', :standard => nil}
+      end
+    file
 
-  context "A command when the output is set and the comand rejects it" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah", :output => false
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah$/, @output
-    end
+    assert_match(/^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, output)
   end
 
-  context "A command when the output is set and is overridden by the :set option" do
-    setup do
-      @output = Whenever.cron :set => 'output=otherlog.log', :string => \
-      <<-file
-        set :job_template, nil
-        set :output, 'logfile.log'
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the otherlog.log as the log file" do
-      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
-      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1/, @output
-    end
-  end
+  test "command when the deprecated :cron_log is set" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :cron_log, "cron.log"
+      every 2.hours do
+        command "blahblah"
+      end
+    file
 
-  context "A command when the error and standard output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:error => 'dev_err', :standard => 'dev_null' }
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command without the redirection syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_null 2>> dev_err$/, @output
-    end
+    assert_match(/^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, output)
   end
 
-  context "A command when error output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:error => 'dev_null'}
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command without the standard error syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_null$/, @output
-    end
-  end
 
-  context "A command when the standard output is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :output, {:standard => 'dev_out'}
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command with standard output syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, @output
-    end
-  end
-
-  context "A command when error output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => 'dev_err'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah 2>> dev_err$/, @output
-    end
-  end
-
-  context "A command when standard output is set by the command" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => 'dev_out'}
-        end
-      file
-    end
-
-    should "output the command without the log syntax appended" do
-      assert_match /^.+ .+ .+ .+ blahblah >> dev_out$/, @output
-    end
-  end
-
-  context "A command when standard output is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stdout directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null$/, @output
-    end
-  end
-
-  context "A command when standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah 2> \/dev\/null$/, @output
-    end
-  end
-
-  context "A command when standard output and standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil, :standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah > \/dev\/null 2>&1$/, @output
-    end
-  end
-
-  context "A command when standard output is set and standard error is set to nil" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => nil, :standard => 'my.log'}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> my.log 2> \/dev\/null$/, @output
-    end
-  end
-
-  context "A command when standard output is nil and standard error is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        every 2.hours do
-          command "blahblah", :output => {:error => 'my_error.log', :standard => nil}
-        end
-      file
-    end
-
-    should "output the command with stderr directed to /dev/null" do
-      assert_match /^.+ .+ .+ .+ blahblah >> \/dev\/null 2>> my_error.log$/, @output
-    end
-  end
+  test "a command when the standard output is set to a lambda" do
+    output = Whenever.cron \
+    <<-file
+      set :job_template, nil
+      set :output, lambda { "2>&1 | logger -t whenever_cron" }
+      every 2.hours do
+        command "blahblah"
+      end
+    file
 
-  context "A command when the deprecated :cron_log is set" do
-    setup do
-      @output = Whenever.cron \
-      <<-file
-        set :job_template, nil
-        set :cron_log, "cron.log"
-        every 2.hours do
-          command "blahblah"
-        end
-      file
-    end
-
-    should "output the command with with the stdout and stderr going to the log" do
-      assert_match /^.+ .+ .+ .+ blahblah >> cron.log 2>&1$/, @output
-    end
+    assert_match(/^.+ .+ .+ .+ blahblah 2>&1 | logger -t whenever_cron$/, output)
   end
 end

data/test/test_case.rb

@@ -0,0 +1,32 @@
+module Whenever
+  require 'minitest/autorun'
+  begin
+    # 2.0.0
+    class TestCase < MiniTest::Test; end
+  rescue NameError
+    # 1.9.3
+    class TestCase < MiniTest::Unit::TestCase; end
+  end
+
+
+  class TestCase
+    class << self
+      def setup(&block)
+        define_method(:setup) do
+          super()
+          instance_eval(&block)
+        end
+      end
+
+      def test(name, &block)
+        define_method("test_#{name}".to_sym, &block)
+      end
+      alias should test
+    end
+
+    def assert_no_match(regexp, string)
+      message = "<#{regexp}> expected to not match\n<#{string}>"
+      assert regexp !~ string, message
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,18 +1,47 @@
-# Want to test the files here, in lib, not in an installed version of the gem.
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'whenever'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-
-module TestExtensions
-  
-  def two_hours
-    "0 0,2,4,6,8,10,12,14,16,18,20,22 * * *"
-  end
-  
+require 'test_case'
+require 'mocha/setup'
+
+module Whenever::TestHelpers
+  protected
+    def new_job(options={})
+      Whenever::Job.new(options)
+    end
+
+    def parse_time(time = nil, task = nil, at = nil, options = {})
+      Whenever::Output::Cron.new(time, task, at, options).time_in_cron_syntax
+    end
+
+    def two_hours
+      "0 0,2,4,6,8,10,12,14,16,18,20,22 * * *"
+    end
+
+    def assert_months_and_days_and_hours_and_minutes_equals(expected, time, options = {})
+      cron = parse_time(Whenever.seconds(1, :year), 'some task', time, options)
+      minutes, hours, days, months = cron.split(' ')
+      assert_equal expected, [months, days, hours, minutes]
+    end
+
+    def assert_days_and_hours_and_minutes_equals(expected, time, options = {})
+      cron = parse_time(Whenever.seconds(2, :months), 'some task', time, options)
+      minutes, hours, days, _ = cron.split(' ')
+      assert_equal expected, [days, hours, minutes]
+    end
+
+    def assert_hours_and_minutes_equals(expected, time, options = {})
+      cron = parse_time(Whenever.seconds(2, :days), 'some task', time, options)
+      minutes, hours, _ = cron.split(' ')
+      assert_equal expected, [hours, minutes]
+    end
+
+    def assert_minutes_equals(expected, time, options = {})
+      cron = parse_time(Whenever.seconds(2, :hours), 'some task', time, options)
+      assert_equal expected, cron.split(' ')[0]
+    end
+
+    def lines_without_empty_line(lines)
+      lines.map { |line| line.chomp }.reject { |line| line.empty? }
+    end
 end
 
-class Test::Unit::TestCase
-  include TestExtensions
-end
+Whenever::TestCase.send(:include, Whenever::TestHelpers)