shotgunner 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd6afd5b6c1f99087fcb7954751e4e22ba361c60edb7c7908a220256d47d136
-  data.tar.gz: 4af6839b27afbc55c84c0b0d6a86b0fd201d50f7104cb9a4dddfa0a67c8ed2c4
+  metadata.gz: 3c08913aab8f39266b071b796662097e01cccc22e46af6bbb0d7f53370042d74
+  data.tar.gz: 25b057a4846b34f1b713ab6a6c65b80e6251bacdc22c2a3bf581668c5790b71f
 SHA512:
-  metadata.gz: 646316b5c02fe055e8763f2011003cf2c68b24e96ce301ab01d3a37950d5af74efbc65017ee60e01ba5a7cb8922328ac0052f57887bcbd3d5a49849b2747bff7
-  data.tar.gz: 6ab8f72650cee928aca7a95bac8c8e517a92b9a04f45e069cd5a52728bd07d242a9686b4b34e961c8235876e410ec4ce9176c7e325f05a53cb8caac966f0c3bb
+  metadata.gz: df768f9d8813513d3a494dad52cffacb7ec8a49a3bb4f33a5af16acf1e4761c763ce55836a454d9b1b63945cdba35db1278173dab1c591b6e359b25c5b3c1b39
+  data.tar.gz: 69d8e6e92b5f68b42e53725a7a40dde784b56cc37350cd1bbfd9750e1eb1f5c0454c93ccba156c6759c25d88e429ca6cddb227dca06f83ecc95d367ebf4e843a

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] || []
-        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, please select number from 1..100' unless threads&.between?(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.3
+  version: 0.1.8
 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:
@@ -18,7 +18,8 @@ extra_rdoc_files: []
 files:
 - lib/shotgunner/parallel.rb
 homepage: https://github.com/nucleom42/shotgunner
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []