in_threads 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 55a72b765291c267b859530ea8413d70201e45fc
-  data.tar.gz: 2227981ac7e0ed5c3e4b3a438a6087acfe427504
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mzk1MDRlMTMzNjc1OTBjMzIyYzA3ZTEyNTdlODk4NmM1ZjAzOTkzNA==
+  data.tar.gz: !binary |-
+    ZGM4ZTQ3N2YxM2M4NTgxODNiNWUzMTc1NWE5MjJlYWQ0MjE2NTY5Yw==
 SHA512:
-  metadata.gz: 6eb1d9590ba97d801053e963772bdf69411e7b08c44c11c31f149ca71d2b0919b64bf07c7c73bda2748e17a99faa9abb3853bea7b161013c84c9b81336d466ba
-  data.tar.gz: dd1fa2f4e0d304a9f4f6a0ea33379fad3a28937f8d9e008e40e2e954a8d36ce613f3102d0259fd69154b4016045ac9cfed140f006235d5166d6b329bcc892e98
+  metadata.gz: !binary |-
+    MGQwMjZiZjU1NmE2NTVkYzdjOTU1OWMzNDA0MDkxNjFkNzQwOTNkZDAwYmQy
+    OWRkODZkMWE0ZTFmZjU0YjNhY2YyNjQyNmI2MDFkOGE2Y2FlOTIxNzU1ZWUx
+    Zjc1ZDE0NGI5Mjg1MjcxNTgyMmI4NWVkM2UyMTg4NDhjZDExMDc=
+  data.tar.gz: !binary |-
+    OGFmODBhMDljYzNjZDdmYmI5YjBhNmI0NzA4NzgxYTk4OTUwODM5YThhNmQ0
+    MDAzMGU2ZTIwNGU4ZjlmNGZjNDBjNjgxNTZhMTA2NzAwZWJhODQyNDFlODlj
+    YzYyZWIwYjUyOGUzM2ExMGNhOTIwZmI5NWEzODBlN2E2YWU2OTY=

data/.rubocop.yml

@@ -5,6 +5,9 @@ AllCops:
 Lint/EndAlignment:
   AlignWith: variable
 
+Metrics/AbcSize:
+  Max: 25
+
 Metrics/ClassLength:
   Max: 150
 

data/.travis.yml

@@ -3,18 +3,20 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - ruby-head
+  - '2.0'
+  - '2.1'
+  - '2.2'
   - jruby-18mode
   - jruby-19mode
-  - jruby-head
   - ree
 script:
-  - bundle exec rspec
-  - '! bundle show rubocop || bundle exec rubocop' # run rubocop only if bundled
+  if [ -z "$RUBOCOP" ]; then
+    bundle exec rspec
+  ; else
+    bundle exec rubocop
+  ; fi
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
+  include:
+    - env: RUBOCOP=true
+      rvm: default

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Ivan Kuchin
+Copyright (c) 2010-2015 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -38,4 +38,4 @@ You can use any Enumerable method, but some of them can not use threads (`inject
 
 ## Copyright
 
-Copyright (c) 2010-2014 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2015 Ivan Kuchin. See LICENSE.txt for details.

data/in_threads.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'in_threads'
-  s.version     = '1.3.0'
+  s.version     = '1.3.1'
   s.summary     = %q{Execute ruby code in parallel}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-retry', '~> 0.3'
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
-    s.add_development_dependency 'rubocop', '~> 0.26.0'
+    s.add_development_dependency 'rubocop', '~> 0.26'
   end
 end

data/lib/in_threads.rb

@@ -179,16 +179,17 @@ class InThreads < SimpleDelegator
     collect map group_by max_by min_by minmax_by sort_by
     flat_map collect_concat
   ], :ignore_undefined => true
-  use :run_without_threads, :for => %w[
+
+  INCOMPATIBLE_METHODS = %w[
     inject reduce
     max min minmax sort
-    entries to_a to_set
+    entries to_a to_set to_h
     drop take
     first
     include? member?
     each_with_object
-    chunk slice_before
-  ], :ignore_undefined => true
+    chunk slice_before slice_after slice_when
+  ].map(&:to_sym)
 
   # Special case method, works by applying `run_in_threads_consecutive` with
   # map on enumerable returned by blockless run
@@ -249,9 +250,4 @@ protected
       enumerable.send(method, *args)
     end
   end
-
-  # Use for methods which don't use blocks or can not use threads
-  def run_without_threads(method, *args, &block)
-    enumerable.send(method, *args, &block)
-  end
 end

data/spec/in_threads_spec.rb

@@ -67,16 +67,6 @@ class RandItem < ValueItem
   end
 end
 
-# Create custom Enumerables
-module CustomEnum
-  def self.new(&block)
-    Class.new do
-      include Enumerable
-      define_method :each, &block
-    end.new
-  end
-end
-
 class TestException < StandardError; end
 
 def describe_enum_method(method, &block)
@@ -172,11 +162,7 @@ describe 'in_threads' do
     describe 'underlying enumerable usage' do
       %w[each map all?].each do |method|
         it "should call underlying enumerable.each only once for #{method}" do
-          enum = CustomEnum.new do |&block|
-            100.times.each do |i|
-              block[ValueItem.new(i, i < 50)]
-            end
-          end
+          enum = 100.times.map{ |i| ValueItem.new(i, i < 50) }
 
           expect(enum).to receive(:each).once.and_call_original
           enum.in_threads(13).send(method, &:check?)
@@ -184,8 +170,9 @@ describe 'in_threads' do
       end
 
       it 'should not yield all elements when not needed' do
-        enum = CustomEnum.new do |&block|
-          100.times{ block[1] }
+        enum = []
+        def enum.each
+          100.times{ yield 1 }
           fail
         end
 
@@ -195,9 +182,9 @@ describe 'in_threads' do
   end
 
   describe 'methods' do
-    enumerable_methods = Enumerable.instance_methods
-    in_threads_methods = 10.times.in_threads.class.instance_methods
-    (enumerable_methods - in_threads_methods).each do |method|
+    missing_methods =
+      (Enumerable.instance_methods - InThreads.instance_methods).map(&:to_sym)
+    (missing_methods - InThreads::INCOMPATIBLE_METHODS).each do |method|
       pending method
     end
 
@@ -216,12 +203,12 @@ describe 'in_threads' do
         enum.in_threads.each(&:touch_n_value)
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.each(&:value) }).
           to be < measure{ enum.each(&:value) } * speed_coef
       end
 
-      it 'should run faster with more threads' do
+      it 'should run faster with more threads', :retry => 3 do
         expect(measure{ enum.in_threads(10).each(&:value) }).
           to be < measure{ enum.in_threads(2).each(&:value) } * speed_coef
       end
@@ -251,7 +238,7 @@ describe 'in_threads' do
           enum.in_threads.send(method){ |o, i| o.touch_n_value(i) }
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           expect(measure{ enum.in_threads.send(method, &runner) }).
             to be < measure{ enum.send(method, &runner) } * speed_coef
         end
@@ -288,7 +275,7 @@ describe 'in_threads' do
         end
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.reverse_each(&:value) }).
           to be < measure{ enum.reverse_each(&:value) } * speed_coef
       end
@@ -334,7 +321,7 @@ describe 'in_threads' do
           expect(@a.length).to be <= enum.length * 0.5
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           boolean = %w[all? drop_while take_while].include?(method)
           enum = 30.times.map{ |i| ValueItem.new(i, boolean) }
           expect(measure{ enum.in_threads.send(method, &:check?) }).
@@ -361,7 +348,7 @@ describe 'in_threads' do
           enum.in_threads.send(method, &:touch_n_check?)
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           expect(measure{ enum.in_threads.send(method, &:check?) }).
             to be < measure{ enum.send(method, &:check?) } * speed_coef
         end
@@ -386,7 +373,7 @@ describe 'in_threads' do
           enum.in_threads.send(method, &:touch_n_value)
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           expect(measure{ enum.in_threads.send(method, &:value) }).
             to be < measure{ enum.send(method, &:value) } * speed_coef
         end
@@ -415,7 +402,7 @@ describe 'in_threads' do
             to eq(enum.send(method, 3, &runner))
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           expect(measure{ enum.in_threads.send(method, 3, &runner) }).
             to be < measure{ enum.send(method, 3, &runner) } * speed_coef
         end
@@ -451,7 +438,7 @@ describe 'in_threads' do
           to eq(enum.zip(enum, enum, &runner))
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.zip(enum, enum, &runner) }).
           to be < measure{ enum.zip(enum, enum, &runner) } * speed_coef
       end
@@ -473,7 +460,7 @@ describe 'in_threads' do
         enum.in_threads.cycle(3, &:touch_n_value)
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.cycle(3, &:value) }).
           to be < measure{ enum.cycle(3, &:value) } * speed_coef
       end
@@ -504,7 +491,7 @@ describe 'in_threads' do
           to eq(enum.grep(matcher, &:value))
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.grep(matcher, &:value) }).
           to be < measure{ enum.grep(matcher, &:value) } * speed_coef
       end
@@ -522,10 +509,12 @@ describe 'in_threads' do
 
     describe_enum_method 'each_entry' do
       let(:enum) do
-        CustomEnum.new do |&block|
-          10.times{ block[1] }
-          10.times{ block[2, 3] }
-          10.times{ block[4, 5, 6] }
+        [].tap do |enum|
+          def enum.each
+            10.times{ yield 1 }
+            10.times{ yield 2, 3 }
+            10.times{ yield 4, 5, 6 }
+          end
         end
       end
       let(:runner){ proc{ |o| ValueItem.new(0, o).value } }
@@ -547,7 +536,7 @@ describe 'in_threads' do
         end
       end
 
-      it 'should run faster with threads' do
+      it 'should run faster with threads', :retry => 3 do
         expect(measure{ enum.in_threads.each_entry(&runner) }).
           to be < measure{ enum.each_entry(&runner) } * speed_coef
       end
@@ -587,7 +576,7 @@ describe 'in_threads' do
           end
         end
 
-        it 'should run faster with threads' do
+        it 'should run faster with threads', :retry => 3 do
           expect(measure{ enum.in_threads.send(method, &runner) }).
             to be < measure{ enum.send(method, &runner) } * speed_coef
         end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rspec'
+require 'rspec/retry'
+
+RSpec.configure do |config|
+  config.verbose_retry = true # show retry status in spec process
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: in_threads
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,20 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0.26'
 description: 
 email: 
 executables: []
@@ -64,20 +78,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: in_threads
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Execute ruby code in parallel
 test_files:
 - spec/in_threads_spec.rb
 - spec/spec_helper.rb
+has_rdoc: