insrc-whenever 0.5.0 → 0.5.1

data/lib/whenever/job.rb

@@ -1,7 +1,7 @@
 module Whenever
   class Job
     
-    attr_accessor :at, :output_redirection
+    attr_accessor :at, :output_redirection, :raw_syntex
   
     def initialize(options = {})
       @options = options
@@ -10,6 +10,7 @@ module Whenever
       @output_redirection      = options.has_key?(:output) ? options[:output] : :not_set
       @options[:environment] ||= :production
       @options[:path]        ||= Whenever.path
+      @raw_syntex         = options[:raw_syntex] || false
     end
   
     def output

data/lib/whenever/job_list.rb

@@ -42,6 +42,12 @@ module Whenever
       yield
     end
     
+    def cron(frequency, options = {})
+      @current_time_scope = frequency
+      @options = options.merge(:raw_syntex => true)
+      yield
+    end    
+    
     def job_type(name, template)
       class_eval do
         define_method(name) do |task, *args|

data/lib/whenever/outputs/cron.rb

@@ -5,11 +5,12 @@ module Whenever
 
       attr_accessor :time, :task
 
-      def initialize(time = nil, task = nil, at = nil, output_redirection = nil)
+      def initialize(time = nil, task = nil, at = nil, output_redirection = nil, raw_syntex = false)
         @time = time
         @task = task
         @at   = at.is_a?(String) ? (Chronic.parse(at) || 0) : (at || 0)
         @output_redirection = output_redirection
+        @raw_syntex = raw_syntex
       end
 
       def self.enumerate(item)
@@ -25,7 +26,7 @@ module Whenever
       def self.output(times, job)
         enumerate(times).each do |time|
           enumerate(job.at).each do |at|
-            yield new(time, job.output, at, job.output_redirection).output
+            yield new(time, job.output, at, job.output_redirection, job.raw_syntex).output
           end
         end
       end
@@ -35,10 +36,14 @@ module Whenever
       end
 
       def time_in_cron_syntax
-        case @time
-          when Symbol then parse_symbol
-          when String then parse_as_string
-          else parse_time
+        if @raw_syntex
+          @time
+        else
+          case @time
+            when Symbol then parse_symbol
+            when String then parse_as_string
+            else parse_time
+          end
         end
       end
       

data/test/cron_test.rb

@@ -199,6 +199,12 @@ class CronTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "When parsing time using raw syntex" do
+    should "return a raw syntex cron format" do
+      assert_equal '*/2 9-15 * * 1-5',   parse_time("*/2 9-15 * * 1-5", nil, nil, true)
+    end    
+  end
 
 private
 
@@ -219,8 +225,8 @@ private
     assert_equal expected, cron.split(' ')[0]
   end
 
-  def parse_time(time = nil, task = nil, at = nil)
-    Whenever::Output::Cron.new(time, task, at).time_in_cron_syntax
+  def parse_time(time = nil, task = nil, at = nil, raw_syntex = false)
+    Whenever::Output::Cron.new(time, task, at, nil, raw_syntex).time_in_cron_syntax
   end
 
 end

data/test/output_at_test.rb

@@ -234,4 +234,19 @@ class OutputAtTest < Test::Unit::TestCase
       assert_match '27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59 * * * * blahblah', @output
     end
   end
+  
+  context "cron raw syntext" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        cron "*/2 9-15 * * 1-5" do
+          command "blahblah"
+        end
+      file
+    end
+    
+    should "output the command using that time" do
+      assert_match '*/2 9-15 * * 1-5 blahblah', @output
+    end
+  end
 end

data/whenever.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{insrc-whenever}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["IN SRC Studio"]
-  s.date = %q{2010-06-28}
-  s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs.}
+  s.authors = ["IN-SRC Studio"]
+  s.date = %q{2010-07-30}
+  s.description = %q{Clean ruby syntax for defining and deploying messy cron jobs. Support cron raw syntex.}
   s.email = %q{elanmeng@in-src.com}
   s.executables = ["whenever", "wheneverize"]
   s.extra_rdoc_files = [
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "whenever.gemspec"
   ]
-  s.homepage = %q{http://github.com/javan/whenever}
+  s.homepage = %q{http://github.com/dreamwords/whenever}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: insrc-whenever
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
-- IN SRC Studio
+- IN-SRC Studio
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +08:00
+date: 2010-07-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 0.2.3
   type: :runtime
   version_requirements: *id001
-description: Clean ruby syntax for defining and deploying messy cron jobs.
+description: Clean ruby syntax for defining and deploying messy cron jobs. Support cron raw syntex.
 email: elanmeng@in-src.com
 executables: 
 - whenever
@@ -71,7 +71,7 @@ files:
 - test/test_helper.rb
 - whenever.gemspec
 has_rdoc: true
-homepage: http://github.com/javan/whenever
+homepage: http://github.com/dreamwords/whenever
 licenses: []
 
 post_install_message: