cwninja-whenever 0.1.5.2 → 0.1.5.3

data/bin/whenever

@@ -16,6 +16,7 @@ OptionParser.new do |opts|
   opts.on('-w', '--write-crontab') { options[:write] = true }
   opts.on('-p', '--update-crontab') { options[:update] = true }
   opts.on('-m', '--marker [a specific string token]') { |token| options[:marker] = token }
+  opts.on('-l', '--cron_log [logfile for cron output]') { |token| options[:cron_log] = token }
   opts.on('-f', '--load-file [schedule file]', 'default: config/schedule.rb') do |file|
     options[:file] = file if file
   end
@@ -38,6 +39,6 @@ if options[:write]
 elsif options[:update]
   command_line.update!
 else
-  puts Whenever.cron(:file => options[:file])
+  puts Whenever.cron(options)
   exit
 end

data/lib/command_line.rb

@@ -1,30 +1,30 @@
 class CommandLine
   START_MARKER = "### BEGIN whenever generated crontab ###"
   END_MARKER =   "### END   whenever generated crontab ###"
-  
+
   attr_reader :options
-  
+
   def start_marker
     "### BEGIN #{@marker} ###"
   end
-  
+
   def end_marker
     "### END   #{@marker} ###"
   end
-  
+
   def initialize(options = {})
     @options = options
     @marker = options[:marker] || "whenever generated crontab"
   end
 
   def write!
-    cron_output = Whenever.cron(:file => options[:file])
+    cron_output = Whenever.cron(options)
     write_crontab(cron_output)
   end
 
   def update!
     before, after = strip_whenever_crontab(read_crontab)
-    whenever_cron = Whenever.cron(:file => options[:file])
+    whenever_cron = Whenever.cron(options)
     write_crontab((before + [start_marker, whenever_cron, end_marker] + after).compact.join("\n"))
   end
 

data/lib/job_list.rb

@@ -8,6 +8,8 @@ module Whenever
       config = case options
         when String then options
         when Hash
+          @cron_log = options[:cron_log] if options.has_key? :cron_log
+          
           if options[:string]
             options[:string]
           elsif options[:file]

data/lib/version.rb

@@ -3,7 +3,7 @@ module Whenever
     MAJOR = 0
     MINOR = 1
     TINY  = 5
-    FORK  = 2
+    FORK  = 3
 
     STRING = [MAJOR, MINOR, TINY, FORK].join('.')
   end

data/test/output_command_test.rb

@@ -67,4 +67,22 @@ class OutputCommandTest < Test::Unit::TestCase
     end
   end
   
+  context "A command when the cron_log is not set and the command line sets it instead" do
+    setup do
+      @output = Whenever.cron(
+        :cron_log => "otherlog.log",
+        :string => %%
+            every 2.hours do
+              command "blahblah"
+            end
+        %
+      )
+    end
+    
+    should "output the command with the log syntax appended" do
+      assert_no_match /.+ .+ .+ .+ blahblah >> logfile.log 2>&1/, @output
+      assert_match /^.+ .+ .+ .+ blahblah >> otherlog.log 2>&1$/, @output
+    end
+  end
+  
 end

data/whenever.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.1.5.2"
+  s.version = "0.1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javan Makhmali"]
-  s.date = %q{2009-02-23}
+  s.date = %q{2009-02-25}
   s.description = %q{Provides clean ruby syntax for defining messy cron jobs and running them Whenever.}
   s.email = %q{javan@javan.us}
   s.executables = ["whenever", "wheneverize"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwninja-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.1.5.2
+  version: 0.1.5.3
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency