infrastruct 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0113af6fb911302493392efa436bd557868e34a0
-  data.tar.gz: c8c215e965f2c8793ce42ca92650e30f28127cfa
+  metadata.gz: e2813c7d3fd70f85cd9885ac8c0a3100739318c5
+  data.tar.gz: 59097900e493e1064d55694c76344a3c588c4384
 SHA512:
-  metadata.gz: 208a75436dc546580844be7d284328f1828ed4654cfac6cf53df9000ef609d0cfdf9713f3f1253bfa6e6cde2e2f250e90f54006267c3f7b75e940e7d0880c38d
-  data.tar.gz: a8eead8fba97d5406e5c1021f1c4c7400a3ceb89355431b82047f37ee3a8f939613447bc0d7a222f08e6917f1a3f4e5540cc7dba7f47426584e9832c71c277fd
+  metadata.gz: e5d60b4858af59f4b9bc92e32fb0751232abb2ed04616bbf4a6b85cfa0d5c14d2486b9ea4fa0ed032f467288c77c885de56d9cf998806a4a76ce010fabbf6beb
+  data.tar.gz: 05969d1377a42b7bb1baeb9de55141bf320c77942a003f86fded1c4f70a3b4981521373b83ffdf3eb7328ab9acbd8882e97fafac420bcbfb471b56e10816d1c0

data/lib/infrastruct/runner.rb

@@ -2,18 +2,21 @@ module Infrastruct
   class Runner
     def initialize(factory)
       @factory = factory
+      @results = Array.new
+      @mutex = Mutex.new
     end
 
     def perform(args)
       worker = @factory.new
+      result = worker.perform(*args)
 
-      worker.perform(*args)
+      @mutex.synchronize { @results << result }
     end
 
-    def collect(results)
+    def collect
       worker = @factory.new
 
-      worker.collect(results)
+      @mutex.synchronize { worker.collect(@results) }
     end
   end
 end

data/lib/infrastruct/thread_pool.rb

@@ -4,7 +4,6 @@ module Infrastruct
       @runner = runner
       @number_of_threads = threads
       @queue = Infrastruct::BlockingQueue.new
-      @results = Array.new
       @threads = []
     end
 
@@ -16,21 +15,15 @@ module Infrastruct
       @queue.unblock!
       @threads.map(&:join)
 
-      @runner.collect(@results)
+      @runner.collect
     end
 
     def run
-      mutex = Mutex.new
-
       @threads = @number_of_threads.times.map do |n|
         Thread.new do
           begin
             while args = @queue.pop do
-              result = @runner.perform(args)
-
-              mutex.synchronize do
-                @results << result
-              end
+              @runner.perform(args)
             end
           rescue ThreadError => error
             raise error unless error.message == 'queue empty'

data/lib/infrastruct/version.rb

@@ -1,3 +1,3 @@
 module Infrastruct
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrastruct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler