sidetiq 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d833d80ba92d8c2ab671eaf83018b756a6a610f
-  data.tar.gz: db7174cfce2e6e2f1f2f915973d20aae2d8b0b29
+  metadata.gz: fe87e48535b00a33d15395b564b62fce3a4ed68d
+  data.tar.gz: 1cb3287fdd6312b1792c11d46561b495cba27114
 SHA512:
-  metadata.gz: 81e03ae40d22adf557accb0bb171737889b4a929b47632c58051a7285d016de6edb8cd0ae7771c0e6ba245b17a73e937c2189d2c37234844a6b64ab74eb87be4
-  data.tar.gz: e52280dc91517a904e3746d63ed25199eb0e27b02bf8ae3301bb599b03823d1454286b7c0969e317f459f9a79a829bf5b4faecd051e54c6dd021d9c4e08a50e7
+  metadata.gz: 040024621688bf956b27cee9f85235d348886e09d315cd07ada3c85faa991f02068a3e37b705307aac499aef0b7dc0f6cbaef498271149dab602a50e04a2a9e5
+  data.tar.gz: 6de537a1815d7cf3a1e3830efd36883b84a79ff034f54012d7c63ca809eddac5ec7e8315c0b291889cade9b63e4d73aa604606553c10116045c60cc79e9f65f2

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
-before_script:
-  - bundle exec rake compile
 rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
   - jruby-19mode
   - rbx-19mode
 matrix:
   allow_failures:
     - rvm: 1.9.2
-    - rvm: jruby-19mode

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.3.2
+-----
+
+- Fix tests to work with changes to Sidekiq::Client.
+  #push_old seems to expect 'at' instead of 'enqueued_at' now
+- Switch from MIT to 3-clause BSD license.
+- Remove C extension.
+- Bump Sidekiq dependency to ~> 2.13.0.
+- Ensure redis locks get unlocked in Clock#synchronize_clockworks.
+
 0.3.1
 -----
 

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'rake'
-  gem 'rake-compiler'
   gem 'sinatra', require: false
   gem 'slim', require: false
 end

data/LICENSE

@@ -1,20 +1,24 @@
-Copyright (C) 2012 by Tobias Svensson <tobias@musicglue.com>
+Copyright (c) 2012-2013, Tobias Svensson <tobias@musicglue.com>
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Tobias Svensson nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL TOBIAS SVENSSON BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -32,9 +32,6 @@ Sidetiq provides a simple API for defining recurring workers for Sidekiq.
 
 - Flexible DSL based on [ice_cube](http://seejohnrun.github.com/ice_cube/)
 
-- High-resolution timer using `clock_gettime(3)` (or `mach_absolute_time()` on
-  Apple Mac OS X), allowing for accurate sub-second clock ticks.
-
 - Sidetiq uses a locking mechanism (based on `setnx` and `pexpire`) internally
   so Sidetiq clocks can run in each Sidekiq process without interfering with
   each other (tested with sub-second polling of scheduled jobs by Sidekiq and
@@ -343,7 +340,7 @@ your changes merged back into core is as follows:
 License
 -------
 
-Sidetiq is released under the MIT License. See LICENSE for further details.
+Sidetiq is released under the 3-clause BSD. See LICENSE for further details.
 
 <a name='section_Author'></a>
 Author

data/Rakefile

@@ -1,8 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rake/extensiontask'
-
-Rake::ExtensionTask.new('sidetiq_ext')
 
 Rake::TestTask.new do |t|
   t.pattern = 'test/**/test_*.rb'

data/lib/sidetiq/clock.rb

@@ -67,9 +67,6 @@ module Sidetiq
 
     # Public: Returns the current time used by the clock.
     #
-    # Sidetiq::Clock uses `clock_gettime()` on UNIX systems and
-    # `mach_absolute_time()` on Mac OS X.
-    #
     # Examples
     #
     #   gettime
@@ -77,7 +74,7 @@ module Sidetiq
     #
     # Returns a Time instance.
     def gettime
-      Sidetiq.config.utc ? clock_gettime.utc : clock_gettime
+      Sidetiq.config.utc ? Time.now.utc : Time.now
     end
 
     # Public: Starts the clock unless it is already running.
@@ -156,11 +153,13 @@ module Sidetiq
         if redis.setnx(lock, 1)
           Sidetiq.logger.debug "Sidetiq::Clock lock #{lock}"
 
-          redis.pexpire(lock, Sidetiq.config.lock_expire)
-          yield redis
-          redis.del(lock)
-
-          Sidetiq.logger.debug "Sidetiq::Clock unlock #{lock}"
+          begin
+            redis.pexpire(lock, Sidetiq.config.lock_expire)
+            yield redis
+          ensure
+            redis.del(lock)
+            Sidetiq.logger.debug "Sidetiq::Clock unlock #{lock}"
+          end
         end
       end
     end

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 3
 
     # Public: Sidetiq patch level.
-    PATCH = 1
+    PATCH = 2
 
     # Public: String representation of the current Sidetiq version.
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/sidetiq.rb

@@ -7,9 +7,6 @@ require 'singleton'
 require 'ice_cube'
 require 'sidekiq'
 
-# c extensions
-require 'sidetiq_ext'
-
 # internal
 require 'sidetiq/config'
 require 'sidetiq/clock'

data/sidetiq.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |gem|
   gem.description   = "Recurring jobs for Sidekiq"
   gem.summary       = gem.description
   gem.homepage      = "http://github.com/tobiassvn/sidetiq"
-  gem.license       = "MIT"
+  gem.license       = "3-clause BSD"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.extensions    = ['ext/sidetiq_ext/extconf.rb']
+  gem.extensions    = []
 
-  gem.add_dependency 'sidekiq',  '~> 2.12.0'
+  gem.add_dependency 'sidekiq',  '~> 2.13.0'
   gem.add_dependency 'ice_cube', '~> 0.11.0'
 end

data/test/test_sidetiq.rb

@@ -23,7 +23,8 @@ class TestSidetiq < Sidetiq::TestCase
 
   def test_scheduled
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
-    Sidekiq::Client.push_old(SimpleWorker.jobs.first)
+    hash = SimpleWorker.jobs.first
+    Sidekiq::Client.push_old(hash.merge("at" => hash["enqueued_at"]))
 
     scheduled = Sidetiq.scheduled
 
@@ -38,7 +39,8 @@ class TestSidetiq < Sidetiq::TestCase
 
   def test_scheduled_given_arguments
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
-    Sidekiq::Client.push_old(SimpleWorker.jobs.first)
+    hash = SimpleWorker.jobs.first
+    Sidekiq::Client.push_old(hash.merge("at" => hash["enqueued_at"]))
 
     assert_equal 1, Sidetiq.scheduled(SimpleWorker).length
     assert_equal 0, Sidetiq.scheduled(ScheduledWorker).length
@@ -49,10 +51,12 @@ class TestSidetiq < Sidetiq::TestCase
 
   def test_scheduled_yields_each_job
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
-    Sidekiq::Client.push_old(SimpleWorker.jobs.first)
+    hash = SimpleWorker.jobs.first
+    Sidekiq::Client.push_old(hash.merge("at" => hash["enqueued_at"]))
 
     ScheduledWorker.perform_at(Time.local(2011, 1, 1, 1))
-    Sidekiq::Client.push_old(ScheduledWorker.jobs.first)
+    hash = ScheduledWorker.jobs.first
+    Sidekiq::Client.push_old(hash.merge("at" => hash["enqueued_at"]))
 
     jobs = []
     Sidetiq.scheduled { |job| jobs << job }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -42,8 +42,7 @@ description: Recurring jobs for Sidekiq
 email:
 - tob@tobiassvensson.co.uk
 executables: []
-extensions:
-- ext/sidetiq_ext/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -54,9 +53,6 @@ files:
 - README.md
 - Rakefile
 - examples/simple.rb
-- ext/sidetiq_ext/extconf.rb
-- ext/sidetiq_ext/sidetiq_ext.c
-- ext/sidetiq_ext/sidetiq_ext.h
 - lib/sidetiq.rb
 - lib/sidetiq/clock.rb
 - lib/sidetiq/config.rb
@@ -77,7 +73,6 @@ files:
 - test/helper.rb
 - test/test_clock.rb
 - test/test_config.rb
-- test/test_errors.rb
 - test/test_middleware.rb
 - test/test_schedule.rb
 - test/test_sidetiq.rb
@@ -86,7 +81,7 @@ files:
 - test/test_worker.rb
 homepage: http://github.com/tobiassvn/sidetiq
 licenses:
-- MIT
+- 3-clause BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -104,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Recurring jobs for Sidekiq
@@ -118,7 +113,6 @@ test_files:
 - test/helper.rb
 - test/test_clock.rb
 - test/test_config.rb
-- test/test_errors.rb
 - test/test_middleware.rb
 - test/test_schedule.rb
 - test/test_sidetiq.rb

data/ext/sidetiq_ext/extconf.rb

@@ -1,4 +0,0 @@
-require 'rbconfig'
-require 'mkmf'
-create_makefile('sidetiq_ext')
-

data/ext/sidetiq_ext/sidetiq_ext.c

@@ -1,97 +0,0 @@
-#include <ruby.h>
-#include <assert.h>
-#include "sidetiq_ext.h"
-
-#ifdef __APPLE__
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <mach/mach.h>
-#include <mach/clock.h>
-#include <mach/mach_time.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#else
-#include <time.h>
-#endif
-
-VALUE msidetiq;
-VALUE esidetiq_error;
-VALUE csidetiq_clock;
-
-#ifdef __APPLE__
-static mach_timebase_info_data_t clock_gettime_inf;
-
-typedef enum {
-        CLOCK_REALTIME,
-        CLOCK_MONOTONIC,
-        CLOCK_PROCESS_CPUTIME_ID,
-        CLOCK_THREAD_CPUTIME_ID
-} clockid_t;
-
-int clock_gettime(clockid_t clk_id, struct timespec *tp)
-{
-        kern_return_t ret;
-        clock_serv_t clk;
-        clock_id_t clk_serv_id;
-        mach_timespec_t tm;
-        uint64_t start, end, delta, nano;
-        int retval = -1;
-
-        switch (clk_id) {
-                case CLOCK_REALTIME:
-                case CLOCK_MONOTONIC:
-                        clk_serv_id = clk_id == CLOCK_REALTIME ? CALENDAR_CLOCK : SYSTEM_CLOCK;
-                        if (KERN_SUCCESS == (ret = host_get_clock_service(mach_host_self(), clk_serv_id, &clk))) {
-                                if (KERN_SUCCESS == (ret = clock_get_time(clk, &tm))) {
-                                        tp->tv_sec  = tm.tv_sec;
-                                        tp->tv_nsec = tm.tv_nsec;
-                                        retval = 0;
-                                }
-                        }
-                        if (KERN_SUCCESS != ret) {
-                                errno = EINVAL;
-                                retval = -1;
-                        }
-                break;
-                case CLOCK_PROCESS_CPUTIME_ID:
-                case CLOCK_THREAD_CPUTIME_ID:
-                        start = mach_absolute_time();
-                        if (clk_id == CLOCK_PROCESS_CPUTIME_ID) {
-                                getpid();
-                        } else {
-                                sched_yield();
-                        }
-                        end = mach_absolute_time();
-                        delta = end - start;
-                        if (0 == clock_gettime_inf.denom) {
-                                mach_timebase_info(&clock_gettime_inf);
-                        }
-                        nano = delta * clock_gettime_inf.numer / clock_gettime_inf.denom;
-                        tp->tv_sec = nano * 1e-9;
-                        tp->tv_nsec = nano - (tp->tv_sec * 1e9);
-                        retval = 0;
-                break;
-                default:
-                        errno = EINVAL;
-                        retval = -1;
-        }
-        return retval;
-}
-#endif
-
-static VALUE sidetiq_gettime(VALUE self)
-{
-        struct timespec time;
-        assert(clock_gettime(CLOCK_REALTIME, &time) == 0);
-        return rb_time_nano_new(time.tv_sec, time.tv_nsec);
-}
-
-void Init_sidetiq_ext()
-{
-        msidetiq = rb_define_module("Sidetiq");
-        esidetiq_error = rb_define_class_under(msidetiq, "Error", rb_eStandardError);
-        csidetiq_clock = rb_define_class_under(msidetiq, "Clock", rb_cObject);
-        rb_define_private_method(csidetiq_clock, "clock_gettime", sidetiq_gettime, 0);
-}
-

data/ext/sidetiq_ext/sidetiq_ext.h

@@ -1,17 +0,0 @@
-#ifndef __SIDETIQ_EXT_H__
-#define __SIDETIQ_EXT_H__
-#include <ruby.h>
-
-void Init_sidetiq_ext();
-static VALUE sidetiq_gettime(VALUE self);
-
-/* module Sidetiq */
-extern VALUE msidetiq;
-
-/* class Sidetiq::Error < StandardError */
-extern VALUE esidetiq_error;
-
-/* class Sidetiq::Clock */
-extern VALUE csidetiq_clock;
-
-#endif

data/test/test_errors.rb

@@ -1,7 +0,0 @@
-require_relative 'helper'
-
-class TestErrors < Sidetiq::TestCase
-  def test_error_superclass
-    assert_equal StandardError, Sidetiq::Error.superclass
-  end
-end