shotgunner 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec6606a8eab14fe6a3e852250000220fac0241fb7acb77d87e81eddd9545115
-  data.tar.gz: f278873f790da5b90a14c0664dea0941778346a2628c58737ed1905df9d1745f
+  metadata.gz: 1ec304efcbca4c8edc0eb78f9257c261dbb9f5a86276ab742f6bef34dcbc8003
+  data.tar.gz: 050ca25cca81c3da5a4afc7921b20078e4aa249a020a3b59ef5aa3284902fb63
 SHA512:
-  metadata.gz: eab16fc2914834b6a003f8c37735b8226544fe538ebf004fc06c283dae6f743ed5a2d889408b3c35ade831a742063f5ef3f03c565bcfa3f2deed2f2b388bd083
-  data.tar.gz: 546bf51dacc3fdfee6761a9723a723ac60161bb18bd3cffd454be25d8ae1666ae31dea623685f4bfeb4eae6ca8d784485f3b0e91ac336098e76daedc023a5f8d
+  metadata.gz: 918a61027e0d43e841a287bfc81fc4cbdac6da2092480fb16ff647360496892181ca169d68d6b2c9f97b5a91625d153bee7a1428d03fb22007abd84504008a2a
+  data.tar.gz: fd376df404ab44ffc9424772392e12eb6e4bf4093a1fdc16ceb81035d9de2712c58ac3cd56b88edf7e681b499deaf2d2b0ff67c1bda1ed5ebab4022f79763d0b

data/lib/shotgunner/parallel.rb

@@ -15,20 +15,35 @@ module Shotgunner
 
     module ClassMethods
       def run(options = {}, &block)
-        mutex = Mutex.new
-        threads = options[:threads] || 4
-        tasks = options[:tasks]&.dup || []
-        raise ArgumentError, 'There is no tasks array defined!' if tasks.empty?
-        call_results = []
+        call_results, mutex, tasks, threads = initiate(options)
+        
+        validate_params(tasks, threads)
+        
         threads.times.map do
           Thread.new(tasks, call_results) do |tasks, call_results|
             while (task = mutex.synchronize { tasks.pop })
               call_result = yield(task)
-              mutex.synchronize { call_results << call_result }
+              mutex.synchronize { call_results[task] = call_result }
             end
           end
         end.each(&:join)
-        call_results
+        
+        call_results.map{|v| v[1]}
+      end
+
+      private
+      
+      def validate_params(tasks, threads)
+        raise ArgumentError, 'There is no tasks array defined!' if tasks.empty?
+        raise ArgumentError, 'Invalid threads number' if threads == (1..100)
+      end
+
+      def initiate(options)
+        mutex = Mutex.new
+        threads = options[:threads] || 4
+        tasks = options[:tasks]&.dup || []
+        call_results = Hash[tasks.map { |x| [x, nil] }]
+        [call_results, mutex, tasks, threads]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shotgunner
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Oleg Saltykov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies: []
 description:
 email: