clockwork 0.5.1 → 0.5.2

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'tzinfo', "~> 0.3.35"
+gem 'activesupport'
 
 group :development do
   gem 'jeweler'

data/Gemfile.lock

@@ -1,9 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
     contest (0.1.3)
     daemons (1.1.9)
     git (1.2.5)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -13,6 +17,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
+    multi_json (1.7.3)
     rake (10.0.3)
     rdoc (4.0.0)
       json (~> 1.4)
@@ -22,6 +27,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   contest
   daemons
   jeweler

data/README.md

@@ -41,6 +41,11 @@ it as the module (thanks to [hoverlover](https://github.com/hoverlover/clockwork
     require 'clockwork'
 
     module Clockwork
+
+      configure do |cofig|
+        config[:tz] = "America/Chicago"
+      end
+
       handler do |job|
         puts "Running #{job}"
       end
@@ -142,7 +147,7 @@ Run on every first day of month.
 
     Clockwork.every(1.day, 'myjob', :if => lambda { |t| t.day == 1 })
 
-The argument is an instance of `Time`.  If `:tz` option is set, it is local time.
+The argument is an instance of `ActiveSupport::TimeWithZone` if the `:tz` option is set. Otherwise, it's an instance of `Time`.
 
 This argument cannot be omitted.  Please use _ as placeholder if not needed.
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/bin/clockwork

@@ -2,7 +2,7 @@
 
 STDERR.sync = STDOUT.sync = true
 
-require File.expand_path('../../lib/clockwork', __FILE__)
+require 'clockwork'
 
 usage = "clockwork <clock.rb>"
 file = ARGV.shift or abort usage

data/bin/clockworkd

@@ -2,7 +2,7 @@
 
 STDERR.sync = STDOUT.sync = true
 
-require File.expand_path('../../lib/clockwork', __FILE__)
+require 'clockwork'
 require 'optparse'
 
 begin

data/lib/clockwork.rb

@@ -1,5 +1,5 @@
 require 'logger'
-require 'tzinfo'
+require 'active_support/time'
 
 module Clockwork
 
@@ -73,8 +73,7 @@ module Clockwork
         @thread = options[:thread]
       end
 
-      tz = options[:tz] || Clockwork.config[:tz]
-      @timezone = TZInfo::Timezone.get(tz) if tz
+      @timezone = options[:tz] || Clockwork.config[:tz]
     end
 
     def to_s
@@ -82,7 +81,7 @@ module Clockwork
     end
 
     def convert_timezone(t)
-      @timezone ? @timezone.utc_to_local(t.dup.utc) : t
+      @timezone ? t.in_time_zone(@timezone) : t
     end
 
     def time?(t)
@@ -139,7 +138,7 @@ module Clockwork
   def configure
     yield(config)
   end
-   
+
   def config
     @@configuration
   end

data/test/clockwork_test.rb

@@ -1,8 +1,9 @@
 require File.expand_path('../../lib/clockwork', __FILE__)
 require 'rubygems'
 require 'contest'
-require 'mocha'
+require 'mocha/setup'
 require 'time'
+require 'active_support/time'
 
 module Clockwork
   def log(msg)
@@ -244,6 +245,15 @@ class ClockworkTest < Test::Unit::TestCase
     assert_will_run 'feb 1 2010 16:20:00'
   end
 
+  test ":if it is compared to a time with zone" do
+    tz = "America/Chicago"
+    time = Time.utc(2012,5,25,10,00)
+    Clockwork.every(1.second, 'myjob', tz: tz, :if => lambda  { |t|(
+      ((time - 1.hour)..(time + 1.hour)).cover? t
+    )})
+    assert_will_run time
+  end
+
   test ":if is not callable then raise ArgumentError" do
     assert_raise(ArgumentError) do
       Clockwork.every(1.second, 'myjob', :if => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockwork
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.35
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -423339919
+      hash: 533309331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: