gaspar 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c12c3ef6f672a4e636b5e9f5db8f41c04d442673
+  data.tar.gz: d72ecff4e60ee556faad42471b09a7d033ce1284
+SHA512:
+  metadata.gz: 3454c89c6923e2951f3a9d4b17c3ba9ff4fb240d6a0d40bdfd4885d26298563a19c871e8beb68d050a4ec30679ff39bfd785f1a73e573f2f5a3fcde09d99cb0d
+  data.tar.gz: c90eea4803ba83482ea61394ea3e12de0af3156607112a042696168f9064c11e8d88452fe55dfb7ac2512c27377bf3bf7de7e23001d4132758677f3e71234419

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+gemfile:
+  - Gemfile
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+  - jruby-19mode
+notifications:
+  email: false
+services: redis-server

data/Gemfile

@@ -4,8 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'colorize'
-gem 'rspec'
 gem 'redis'
-gem 'active_support'
-gem 'timecop'
+gem 'activesupport'
 gem 'rake'

data/README.md

@@ -1,3 +1,5 @@
+{<img src="https://travis-ci.org/mashable/gaspar.svg" alt="Build Status" />}[https://travis-ci.org/mashable/gaspar]
+
 # Gaspar
 <img src="http://cdn.wikimg.net/strategywiki/images/0/04/Chrono_Trigger_Sprites_Gaspar.png" align="right" style="margin: 0 0 20px 20px" />
 

data/gaspar.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency('rufus-scheduler')
+  gem.add_dependency('rufus-scheduler', "~> 2.0")
   gem.add_dependency('redis', '>= 2.2.0')
   gem.add_dependency('colorize')
   gem.add_dependency('activesupport')
-  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rspec', "~> 2.0")
   gem.add_development_dependency('timecop')
 end

data/lib/gaspar.rb

@@ -92,9 +92,11 @@ class Gaspar
 
   def cron(timing, *args, &block)
     options = args.extract_options!
-    next_fire = Rufus::CronLine.new(timing).next_time
+    cron = Rufus::CronLine.new(timing)
+    next_fire = cron.next_time
+    next_next_fire = cron.next_time(next_fire + 0.001)
 
-    options[:period] = next_fire.to_i - Time.now.to_i
+    options[:period] = next_next_fire.to_i - next_fire.to_i
     schedule :cron, timing, args, options, &block
   end
 
@@ -147,7 +149,7 @@ class Gaspar
         lock { @running_jobs += 1 }
         @redis.expire key, expiry.to_i
         # ...and then run the job
-        run_callbacks(:run) { block.call }
+        run_callbacks(:run, &block)
         lock { @running_jobs -= 1 }
       end
     end

data/lib/gaspar/version.rb

@@ -1,3 +1,3 @@
 class Gaspar
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/gaspar/gaspar_spec.rb

@@ -48,11 +48,11 @@ describe Gaspar do
         Gaspar.configure do
           before_each { callbacks.push "before" }
           after_each  { callbacks.push "after" }
-          around_each {|&block| callbacks.push "around"; block.call }
+          around_each {|gaspar, blk| callbacks.push "around"; blk.call }
 
-          every("0.35s", "run callbacks") { callbacks.push "inside" }
+          every("1s", "run callbacks") { callbacks.push "inside" }
         end.start!(redis)
-        sleep(0.4)
+        sleep(1.5)
 
         callbacks.should == %w(before around inside after)
       end
@@ -66,7 +66,7 @@ describe Gaspar do
       end
 
       it "should enqueue a job" do
-        Time.stub!(:now).and_return Time.at(1351061802)
+        Time.stub(:now).and_return Time.at(1351061802)
         Gaspar.any_instance.stub(:drift).and_return(0)
         Gaspar.configure do
           every "5m", :Foobar
@@ -84,8 +84,15 @@ describe Gaspar do
         end.start!(redis)
       end
 
+      it "should properly calculate the period for a #cron invocation" do
+        Gaspar.any_instance.should_receive(:schedule).with(:cron, "59 * * * *", [], {period: 3600})
+        Gaspar.configure do
+          cron("59 * * * *") { puts "Doing stuff" }
+        end.start!(redis)
+      end
+
       it "should quantitize #every to the next timeslice" do
-        Time.stub!(:now).and_return Time.at(1351061802)
+        Time.stub(:now).and_return Time.at(1351061802)
         Gaspar.any_instance.stub(:drift).and_return(0)
         Gaspar.any_instance.should_receive(:schedule).with(:every, "5m", [], {:first_at => Time.at(1351062000), :period => 300.0})
         Gaspar.configure do
@@ -114,13 +121,14 @@ describe Gaspar do
       it "should process jobs" do
         value = 0
         sleep 0.4
-        Gaspar.configure do
+        g = Gaspar.configure do
           every "0.35s", "update variable" do
             value += 1
           end
-        end.start!(redis)
+        end
         value.should == 0
-        sleep(0.4)
+        g.start!(redis)
+        sleep(1.5)
         value.should > 0
       end
 
@@ -128,12 +136,12 @@ describe Gaspar do
         value = 0
         sleep 0.4
         Gaspar.configure do
-          every("0.35s", "update variable with lock") { value += 1 }
-          every("0.35s", "update variable with lock") { value += 1 }
-          every("0.35s", "update variable with lock") { value += 1 }
+          every("1s", "update variable with lock") { value += 1 }
+          every("1s", "update variable with lock") { value += 1 }
+          every("1s", "update variable with lock") { value += 1 }
         end.start!(redis)
         value.should == 0
-        sleep(0.4)
+        sleep(1.5)
         value.should == 1
       end
 
@@ -184,7 +192,7 @@ describe Gaspar do
     context "instance methods" do
       describe "#sync_watches" do
         it "should compute drift" do
-          Time.stub!(:now).and_return(150)
+          Time.stub(:now).and_return(150)
           redis = double :redis, :setnx => false, :get => "100", :ttl => (3.2e8.to_i - 25)
           instance = Gaspar.send(:new)
           instance.instance_variable_set(:@redis, redis)

metadata

@@ -1,114 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: gaspar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Chris Heald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :runtime
   name: rufus-scheduler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
-    none: false
+        version: '2.0'
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
   name: redis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 2.2.0
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
   name: colorize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
   name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '2.0'
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
   name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
-description: Gaspar is an in-process recurring job manager. It is intended to be used
-  in place of cron when you don't want a separate daemon.
+  type: :development
+description: Gaspar is an in-process recurring job manager. It is intended to be used in place of cron when you don't want a separate daemon.
 email:
 - cheald@mashable.com
 executables: []
@@ -116,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,33 +114,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/mashable/gaspar
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: -546882929324832144
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: -546882929324832144
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
 summary: Gaspar is an in-process recurring job manager.
 test_files:
 - spec/gaspar/gaspar_spec.rb