jparallel 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a7a5ec17084fa8f1e62c9a49d01f3d66095a02
-  data.tar.gz: 6cb3d56a35a38f80862b5d1a4a92609b26e9dcd7
+  metadata.gz: a11c348627ed9d42fbbfc7c171a2de4c189be5e7
+  data.tar.gz: 9220a634ebe628b29dcc0b4bdcfcf9240179e40b
 SHA512:
-  metadata.gz: a72d330ba4d063f3aa7f20b2da8b585110eb9980fb0efce5be87cd56e140dee23ea81d3ecf3543d326016e8aaa7bf00972d4edc56e1b8ccdedf521d8014fea13
-  data.tar.gz: ca7c38de5315d38385a4951f361eb716f575af2986efa018e3200e67d9b1ecc5b774bb4efb2e407dea466c96d79152ec49d6cf36baf1823214c3275da57800af
+  metadata.gz: 1bd0cc6fbfca372d77634ab190b0dd00453bf2ab7b65414406641463d6a5c0c00a5274f7d2f8be009d25db6387334afd9d71c2ebfcb1a2d956b3b26172f3d65c
+  data.tar.gz: 048ba129144b8b22d40e51dce874d73a30b3bb29e8918337daad6374bc9b363e32604c87c1d0f6ef722218105c93f3eb5cfa5cf053bc0e3db3aa5bc4d99c4243

data/Gemfile.lock

@@ -1,59 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
-    formatador (0.2.4)
-    guard (2.4.0)
+    ffi (1.9.6-java)
+    formatador (0.2.5)
+    guard (2.10.4)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.7)
+    guard-compat (1.1.0)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    listen (2.6.0)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hitimes (1.2.2-java)
+    listen (2.8.4)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    lumberjack (1.0.9)
     method_source (0.8.2)
-    nio4r (1.0.0-java)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    nenv (0.1.1)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.4.7)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    slop (3.6.0)
     spoon (0.0.4)
       ffi
-    thor (0.18.1)
-    thread (0.1.3)
-    timers (1.1.0)
+    thor (0.19.1)
+    thread (0.1.4)
+    timers (4.0.1)
+      hitimes
 
 PLATFORMS
   java

data/README.md

@@ -38,5 +38,15 @@ jp.hashmap({a: 1, b: 2}) {|x,y| "#{x} -> #{y}" }
 # -> {:a=>"a -> 1", :b=>"b -> 2"}
 ```
 
+### Timeouts
+With all the methods you can add an optional timeout value in seconds.  This timeout is checked before executing the block for each element of the input collection.  If the timeout is reached before we begin working on a work-unit, then the `TimeoutError` with the index or key of the item is placed in the output collection.
+```ruby
+jp.map((0..20).to_a, timeout: 0.1) do |x|
+  sleep(0.1)
+  x
+end
+# -> [0,1, ... ,TimeoutError, TimeoutError]
+```
+
 ## Licence
 This library is licenced under the GNU Lesser General Public Licence, version 3 or later.

data/jparallel.gemspec

@@ -1,12 +1,15 @@
 Gem::Specification.new do |s|
   s.name = "jparallel"
-  s.version = "0.1.1"
+  s.version = "0.1.3"
   s.license = "LGPL-3.0"
   s.summary = "Easy parallel processing for ruby"
   s.files = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
   s.platform = Gem::Platform::RUBY
   s.authors = ["Ravi Desai"]
+  s.add_dependency "thread"
+  s.add_dependency "pry"
+  s.add_dependency "rspec"
 
   s.homepage = "https://github.com/ravster/jparallel"
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jparallel.rb

@@ -30,15 +30,22 @@ class Jparallel
     output_array.map(&:value)
   end
 
-  def map_with_index (input_array, &block)
+  def map_with_index (input_array, ops={}, &block)
+    timeout = ops[:timeout]
     output_array = Array.new input_array.size
+    start_time = Time.now
 
     input_array.each_with_index do |item, index|
       output_array[index] = Thread.future @pool do
-        begin
-          yield(item, index)
-        rescue => e
-          e
+        if !timeout.nil? &&
+            (Time.now - start_time) > timeout
+          TimeoutError.new("Timed out before item #{index}")
+        else
+          begin
+            yield(item, index)
+          rescue => e
+            e
+          end
         end
       end
     end
@@ -46,15 +53,22 @@ class Jparallel
     output_array.map(&:value)
   end
 
-  def hashmap (input_hash, &block)
+  def hashmap (input_hash, ops={}, &block)
+    timeout = ops[:timeout]
     output_hash = {}
+    start_time = Time.now
 
     input_hash.each_pair do |key, value|
       output_hash[key] = Thread.future @pool do
-        begin
-          yield(key, value)
-        rescue => e
-          e
+        if !timeout.nil? &&
+            (Time.now - start_time) > timeout
+          TimeoutError.new("Timed out before item #{key}")
+        else
+          begin
+            yield(key, value)
+          rescue => e
+            e
+          end
         end
       end
     end

data/spec/jparallel_hashmap_spec.rb

@@ -26,5 +26,21 @@ describe Jparallel do
     it "returns errors within the hash" do
       expect(error_result[:a]).to be_a StandardError
     end
+
+    let(:timeout_hash_result) do
+      big_array = (0..20).to_a.map do |x|
+        [x,x]
+      end
+      big_hash = Hash[big_array]
+      jp.hashmap(big_hash, timeout: 0.01) do |k,v|
+        sleep(0.01)
+        v
+      end
+    end
+
+    it "returns timeouts in the output" do
+      expect(timeout_hash_result.any? {|k,v| v.is_a?(TimeoutError)}).
+        to be(true)
+    end
   end
 end

data/spec/jparallel_map_spec.rb

@@ -23,21 +23,20 @@ describe Jparallel do
       jp.map(error_array) { |x| 12 / x }
     end
 
-    it "returns an array even when there is an exception in one of the input" do
-      expect(error_array_result).to be_instance_of Array
-    end
-
     it "stores the exception in the result" do
       expect(error_array_result.last).to be_a StandardError
     end
 
-    let(:timeout_array_result) do
-      jp.map((0..20).to_a, timeout: 0.1) { |x| sleep(0.1) }
+    let(:timeout_array_map_result) do
+      jp.map((0..20).to_a, timeout: 0.01) do |x|
+        sleep(0.01)
+        x
+      end
     end
 
     it "returns timeouts in the output" do
-      expect(timeout_array_result.any?{ |x| x.is_a?(TimeoutError)}).
+      expect(timeout_array_map_result.any?{ |x| x.is_a?(TimeoutError)}).
         to be(true)
-      end
+    end
   end
 end

data/spec/jparallel_map_with_index_spec.rb

@@ -18,7 +18,7 @@ describe Jparallel do
         input_array.each_with_index.map do |x, index|
           "#{x} is at index #{index}"
         end
-        )
+      )
     end
 
     let(:error_array_result) do
@@ -34,5 +34,14 @@ describe Jparallel do
     it "returns errors within the array" do
       expect(error_array_result.last).to be_a StandardError
     end
+
+    it "returns timeouts in the output" do
+      result = jp.map_with_index((0..20).to_a, timeout: 0.001) do |x, index|
+        sleep(0.001)
+        x
+      end
+      expect(result.any? {|x| x.is_a?(TimeoutError)}).
+        to be(true)
+    end
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jparallel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ravi Desai
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
-dependencies: []
+date: 2014-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thread
+  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'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+  prerelease: false
+  type: :runtime
 description:
 email:
 executables: []
@@ -51,7 +93,4 @@ rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Easy parallel processing for ruby
-test_files:
-- spec/jparallel_hashmap_spec.rb
-- spec/jparallel_map_spec.rb
-- spec/jparallel_map_with_index_spec.rb
+test_files: []