loops 2.0.7 → 2.0.8

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+
+notifications:
+  recipients:
+    - alexey@kovyrin.net
+    - kpumuk@kpumuk.info

data/Gemfile

@@ -1,2 +1,6 @@
 source "http://rubygems.org"
+
 gemspec
+
+gem 'rake'
+gem 'active_support'

data/README.rdoc

@@ -76,11 +76,12 @@ Here is a simple loop scaffold for you to start from (put this file to
     end
 
 When you have your loop ready to use, add the following lines to your (maybe empty yet)
-<tt>config/loops.yml</tt> file:
+<tt>config/loops.yml</tt> file +loops+ section:
 
-    hello_world:
-      type: simple
-      sleep_period: 10
+    loops:
+      hello_world:
+        type: simple
+        sleep_period: 10
 
 This is it! To manage your loop, just run one of the following commands:
 
@@ -116,10 +117,11 @@ could use instead of your <tt>./script/loops<tt> binary:
 If you want to have more than one copy of your worker running, that is as simple as adding one
 option to your loop configuration:
 
-    hello_world:
-      type: simple
-      sleep_period: 10
-      workers_number: 1
+    loops:
+      hello_world:
+        type: simple
+        sleep_period: 10
+        workers_number: 1
 
 This <tt>workers_number</tt> option would tell loops manager to spawn more than one copy of
 your loop and run them in parallel. The only thing you'd need to do is to remember about
@@ -133,15 +135,16 @@ memcache-based locks.
 You can run the same loop class with different configuration parameters by explicitly identifying
 the loop class to execute:
 
-    hello:
-      type: simple
-      loop_name: some_module/my_worker
-      language: English
+    loops:
+      hello:
+        type: simple
+        loop_name: some_module/my_worker
+        language: English
 
-    salut:
-      type: simple
-      loop_name: some_module/my_worker
-      language: French
+      salut:
+        type: simple
+        loop_name: some_module/my_worker
+        language: French
 
 Now two independent sets of loops are using the same class <tt>SomeModule::MyWorkerLoop</tt>
 customized by the language parameter.
@@ -199,12 +202,13 @@ code and as the result, you can create a loops like this:
 
 With configs like this:
 
-    # An example of a STOMP queue-based loop
-    my_queue:
-      type: queue
-      host: 127.0.0.1
-      port: 61613
-      queue_name: blah
+    loops:
+      # An example of a STOMP queue-based loop
+      my_queue:
+        type: queue
+        host: 127.0.0.1
+        port: 61613
+        queue_name: blah
 
 Of course, this solution scales perfectly and to make your queue processing faster you just
 need to add more workers (by adding <tt>workers_number: N</tt> option).
@@ -228,10 +232,12 @@ The default engine is <tt>fork</tt>.
 
 == What Ruby implementations does it work for?
 
-We've tested and used the plugin on MRI 1.8.6/1.8.7 and on JRuby 1.4.0. At this point we do
-not support demonization in JRuby and never tested the code on Ruby 1.9. Obviously because
-of JVM limitations you won't be able to use <tt>fork</tt> workers engine in JRuby, but
-threaded workers do pretty well.
+We've tested and used the plugin on MRI 1.8.6/1.8.7/1.9.3 and on JRuby 1.4.0. At this point we do
+not support demonization in JRuby. Obviously because of JVM limitations you won't be able to
+use <tt>fork</tt> workers engine in JRuby, but threaded workers do pretty well.
+
+We have a continuous integration server configured for the project: 
+{<img src="https://secure.travis-ci.org/kovyrin/loops.png?branch=master" alt="Build Status" />}[http://travis-ci.org/kovyrin/loops]
 
 Recommended version of ruby ro run loops is Ruby Enterprise Edition. This is because we
 have a support for their Copy-On-Write friendly garbage collector that makes your loops
@@ -270,6 +276,6 @@ Use <tt>loops help</tt> to get help.
 == Who are the authors?
 
 This plugin has been created in Scribd.com for our internal use and then the sources were opened
-for other people to use. All the code in this package has been developed by Alexey Kovyrin,
+for other people to use. All the code in this package has been developed by Oleksiy Kovyrin,
 Dmytro Shteflyuk and Alexey Verkhovsky for Scribd.com and is released under the MIT license.
 For more details, see LICENSE file.

data/lib/loops/base.rb

@@ -142,7 +142,7 @@ class Loops::Base
     raise ArgumentError, "No block given!" unless block_given?
     loop do
       yield
-      sleep(seconds)
+      sleep(seconds.to_i)
     end
   end
 end

data/lib/loops/logger.rb

@@ -129,6 +129,10 @@ class Loops::Logger < ::Delegator
     @implementation or raise "Logger implementation not initialized"
   end
 
+  def __setobj__(obj)
+    @implementation = obj
+  end
+
   # @private
   # Delegator's method_missing ignores the &block argument (!!!?)
   def method_missing(m, *args, &block)

data/lib/loops/version.rb

@@ -1,8 +1,15 @@
 # Contains information about currently used Loops version.
 #
 # @example
-#   puts "Loops #{Loops::VERSION}"
+#   puts "Loops #{Loops::Version::STRING}"
 #
 module Loops
-  VERSION = '2.0.7'
+  module Version
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 8
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
 end

data/loops.gemspec

@@ -4,9 +4,9 @@ require 'loops/version'
 
 Gem::Specification.new do |s|
   s.name         = 'loops'
-  s.version      = Loops::VERSION
+  s.version      = Loops::Version::STRING
   s.platform     = Gem::Platform::RUBY
-  s.authors      = ['Alexey Kovyrin', 'Dmytro Shteflyuk']
+  s.authors      = [ 'Oleksiy Kovyrin', 'Dmytro Shteflyuk' ]
   s.email        = %q{alexey@kovyrin.net}
   s.homepage     = %q{http://github.com/kovyrin/loops}
   s.summary      = %q{Simple background loops framework for ruby}

data/spec/loop_lock_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe LoopLock do
   before :each do

data/spec/loops/base/with_lock_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Loops::Base, '#with_lock' do
+  before :each do
+    @logger = mock('Logger').as_null_object
+    @loop = Loops::Base.new(@logger, 'simple', {})
+  end
+
+  context 'when an entity is not locked' do
+    it 'should create lock on an item' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do
+        called = true
+        LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
+      end
+      called.should be_true
+    end
+
+    it 'should release lock on an item' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do
+        called = true
+      end
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
+      called.should be_true
+    end
+
+    it 'should release lock on an item in case of error' do
+      called = false
+      expect {
+        @loop.with_lock(1, 'rspec', 60) do
+          called = true
+          raise 'ouch'
+        end
+      }.to raise_error('ouch')
+      called.should be_true
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
+    end
+
+    it 'should pass the lock timeout' do
+      called = false
+      @loop.with_lock(1, 'rspec', 0.2) do
+        called = true
+        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_false
+        sleep(0.2)
+        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_true
+      end
+      called.should be_true
+    end
+
+    it 'should release the lock on an item' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do
+        called = true
+      end
+      called.should be_true
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
+    end
+
+    it 'should yield with entity_id value if block accepts the argument' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do |entity_id|
+        called = true
+        entity_id.should == 1
+      end
+      called.should be_true
+    end
+  end
+
+  context 'when an entity is already locked' do
+    before :each do
+      LoopLock.lock(:loop => 'rspec', :entity_id => 1)
+    end
+
+    it 'should should not yield' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do
+        called = true
+      end
+      called.should be_false
+    end
+
+    it 'should should not touch the lock object' do
+      called = false
+      @loop.with_lock(1, 'rspec', 60) do
+        called = true
+      end
+      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
+      called.should be_false
+    end
+  end
+end

data/spec/loops/base_spec.rb

@@ -1,92 +1,22 @@
-require 'spec/spec_helper'
+require 'spec_helper'
+require 'active_support/core_ext/numeric/time'
 
-describe Loops::Base, '#with_lock' do
+describe Loops::Base do
   before :each do
     @logger = mock('Logger').as_null_object
     @loop = Loops::Base.new(@logger, 'simple', {})
   end
-  
-  context 'when an entity is not locked' do
-    it 'should create lock on an item' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do
-        called = true
-        LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
-      end
-      called.should be_true
-    end
-
-    it 'should release lock on an item' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do
-        called = true
-      end
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
-      called.should be_true
-    end
 
-    it 'should release lock on an item in case of error' do
-      called = false
-      expect {
-        @loop.with_lock(1, 'rspec', 60) do
-          called = true
-          raise 'ouch'
+  context "in #with_period_of method" do
+    it "should coerce parameters to integer before passing them to sleep" do
+      [ 1, 1.seconds, "1" ].each do |period|
+        @test_iterations = 0
+        @loop.with_period_of(period) do
+          break if @test_iterations > 0
+          @test_iterations += 1
         end
-      }.to raise_error('ouch')
-      called.should be_true
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
-    end
-
-    it 'should pass the lock timeout' do
-      called = false
-      @loop.with_lock(1, 'rspec', 0.2) do
-        called = true
-        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_false
-        sleep(0.2)
-        LoopLock.lock(:loop => 'rspec', :entity_id => 1).should be_true
-      end
-      called.should be_true
-    end
-
-    it 'should release the lock on an item' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do
-        called = true
       end
-      called.should be_true
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_false
-    end
-    
-    it 'should yield with entity_id value if block accepts the argument' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do |entity_id|
-        called = true
-        entity_id.should == 1
-      end
-      called.should be_true
     end
   end
 
-  context 'when an entity is already locked' do
-    before :each do
-      LoopLock.lock(:loop => 'rspec', :entity_id => 1)
-    end
-
-    it 'should should not yield' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do
-        called = true
-      end
-      called.should be_false
-    end
-
-    it 'should should not touch the lock object' do
-      called = false
-      @loop.with_lock(1, 'rspec', 60) do
-        called = true
-      end
-      LoopLock.locked?(:loop => 'rspec', :entity_id => 1).should be_true
-      called.should be_false
-    end
-  end
 end

data/spec/loops/cli_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Loops::CLI do
   before :each do

data/spec/loops_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Loops do
   describe '.load_config' do
@@ -6,7 +6,7 @@ describe Loops do
       Loops.root = RAILS_ROOT
       @engine = Loops::Engine.new
     end
-    
+
     it 'should load and parse Loops configuration file' do
       @engine.config.should be_an_instance_of(Hash)
       @engine.global_config.should be_an_instance_of(Hash)

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: loops
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
-- Alexey Kovyrin
+- Oleksiy Kovyrin
 - Dmytro Shteflyuk
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 Z
+date: 2012-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -59,6 +59,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -95,6 +96,7 @@ files:
 - lib/loops/worker_pool.rb
 - loops.gemspec
 - spec/loop_lock_spec.rb
+- spec/loops/base/with_lock_spec.rb
 - spec/loops/base_spec.rb
 - spec/loops/cli_spec.rb
 - spec/loops_spec.rb
@@ -136,12 +138,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple background loops framework for ruby
 test_files: 
 - spec/loop_lock_spec.rb
+- spec/loops/base/with_lock_spec.rb
 - spec/loops/base_spec.rb
 - spec/loops/cli_spec.rb
 - spec/loops_spec.rb
@@ -154,3 +157,4 @@ test_files:
 - spec/rails/config/init.rb
 - spec/rails/config/loops.yml
 - spec/spec_helper.rb
+has_rdoc: