retriable 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 03ab323e10afdc5d56ba1cb8dafe474b384ebab4
+  data.tar.gz: b8018f10039fd5add022bd21bc89e3df94c742bf
+SHA512:
+  metadata.gz: eb6d13ae6aef5945c071c28d122b2018c6faadc8a4567542a3b687e12905cd335c7542627b3be8d3d4b386189d31f9c0af0d3d214dc8d87047e0708d4606327b
+  data.tar.gz: 3446c5920eb959cb60bd7a5cf4de8ace6df8480fbe80b82b526676557f5e0316780544b8986fb022a44a6d679a7a515931c236e67805d335fbf47938bf831735

data/.travis.yml

@@ -1,11 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
-  - ree
+  - rbx-19mode

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.4.1
+* Fixes non kernel mode bug. Remove DSL class, move `#retriable` into Retriable module. Thanks @mkrogemann.
+
 ## 1.4.0
 * By default, retriable doesn't monkey patch `Kernel`. If you want this functionality,
 you can `require 'retriable/core_ext/kernel'.

data/lib/retriable.rb

@@ -1,5 +1,17 @@
 require 'retriable/retry'
-require 'retriable/dsl'
 
 module Retriable
+  extend self
+
+  def retriable(opts = {}, &block)
+    raise LocalJumpError unless block_given?
+
+    Retry.new do |r|
+      r.tries    = opts[:tries] if opts[:tries]
+      r.on       = opts[:on] if opts[:on]
+      r.interval = opts[:interval] if opts[:interval]
+      r.timeout  = opts[:timeout] if opts[:timeout]
+      r.on_retry = opts[:on_retry] if opts[:on_retry]
+    end.perform(&block)
+  end
 end

data/lib/retriable/core_ext/kernel.rb

@@ -1,6 +1,6 @@
 require 'retriable'
 
 module Kernel
-  include Retriable::DSL
+  include Retriable
   private :retriable
 end

data/lib/retriable/version.rb

@@ -1,3 +1,3 @@
 module Retriable
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/retriable.gemspec

@@ -1,6 +1,6 @@
-# encoding: utf-8
-
-$:.push File.expand_path("../lib", __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "retriable/version"
 
 Gem::Specification.new do |s|
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', '>= 5.0'
 end

data/test/retriable_test.rb

@@ -1,34 +1,33 @@
 require 'retriable'
-require 'retriable/core_ext/kernel'
 require 'minitest/autorun'
 
 class RetriableTest < Minitest::Test
   def test_raise_no_block
     assert_raises LocalJumpError do
-      retriable :on => StandardError
+      Retriable.retriable :on => StandardError
     end
   end
 
   def test_without_arguments
     i = 0
 
-    retriable do
+    Retriable.retriable do
       i += 1
       raise StandardError.new
     end
-  rescue StandardError
+    rescue StandardError
     assert_equal 3, i
   end
 
   def test_with_one_exception_and_two_tries
     i = 0
 
-    retriable :on => EOFError, :tries => 2 do
+    Retriable.retriable :on => EOFError, :tries => 2 do
       i += 1
       raise EOFError.new
     end
 
-  rescue EOFError
+    rescue EOFError
     assert_equal i, 2
   end
 
@@ -40,7 +39,7 @@ class RetriableTest < Minitest::Test
       assert_equal i, tries
     end
 
-    retriable :on => [EOFError, ArgumentError], :on_retry => on_retry, :tries => 5, :sleep => 0.2 do |h|
+    Retriable.retriable :on => [EOFError, ArgumentError], :on_retry => on_retry, :tries => 5, :sleep => 0.2 do |h|
       i += 1
       raise ArgumentError.new
     end
@@ -57,10 +56,29 @@ class RetriableTest < Minitest::Test
       attempts
     end
 
-    retriable :on => EOFError, :interval => sleeper do |h|
+    Retriable.retriable :on => EOFError, :interval => sleeper do |h|
       raise EOFError.new
     end
-  rescue
+    rescue
     assert_equal was_called, true
   end
+
+  def test_kernel_ext
+    assert_raises NoMethodError do
+      retriable do
+        puts 'should raise NoMethodError'
+      end
+    end
+
+    require 'retriable/core_ext/kernel'
+    i = 0
+
+    retriable do
+      i += 1
+      raise StandardError.new
+    end
+
+    rescue StandardError
+    assert_equal 3, i
+  end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: retriable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Jack Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Retriable is an simple DSL to retry a code block if an exception should
   be raised. This is especially useful when interacting external api/services or file
   system calls.
@@ -61,7 +56,6 @@ files:
 - Rakefile
 - lib/retriable.rb
 - lib/retriable/core_ext/kernel.rb
-- lib/retriable/dsl.rb
 - lib/retriable/retry.rb
 - lib/retriable/version.rb
 - retriable.gemspec
@@ -69,33 +63,26 @@ files:
 homepage: http://github.com/kamui/retriable
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2391393966112040014
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2391393966112040014
 requirements: []
 rubyforge_project: retriable
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Retriable is an simple DSL to retry a code block if an exception should be
   raised.
 test_files:

data/lib/retriable/dsl.rb

@@ -1,17 +0,0 @@
-require 'retriable/retry'
-
-module Retriable
-  module DSL
-    def retriable(opts = {}, &block)
-      raise LocalJumpError unless block_given?
-
-      Retry.new do |r|
-        r.tries    = opts[:tries] if opts[:tries]
-        r.on       = opts[:on] if opts[:on]
-        r.interval = opts[:interval] if opts[:interval]
-        r.timeout  = opts[:timeout] if opts[:timeout]
-        r.on_retry = opts[:on_retry] if opts[:on_retry]
-      end.perform(&block)
-    end
-  end
-end