esr-rim 1.3.8 → 1.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTAzMzg0MDJmNmNiNDIzZDA5MWJiNDUwNTkyNWJlZmQ3M2Q2MzliMg==
+    YzMzYjRlMWZiZWE5YmFiMGYzMjI1YWEzODczMTU1N2I4YWIxYmVjOQ==
   data.tar.gz: !binary |-
-    YjgwYzMzMWM3NGNiNWM5NWQxMGQ5MDYzZDg2NjRkMTI3N2VhMDBiYQ==
+    YTY4NGY4M2MwNTJmYTI0ZGUzMWY5N2IzNTliYTQ4YzNiNDhmMzdmZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjVhNzBkZWIyNWMyMjM3ZDJiZTI2MjY1NmVlODVhYjYwYmFhNTk5ZjVjMjJi
-    NGJlMDViZGFmZDA0M2I1ZGNiM2VhN2NmMTY0ZmE0ODRmOTEyNzFiNjA1M2Y1
-    ZGI2NjE5ZDQ5NDE5Y2M5NjE1ODM0N2UzZTNhZTAyNmM4MjcyMTQ=
+    MGY0YzQ3NjU2ODJhNTg0OTk0MmM4NTRjOGZhZmQxMTYxOGNkZWJhNDc0YzM2
+    OGIzOTFhMTAyZjYxNmJlZGQwYWYzMTY5NDBkMjY1MDYxZjVhYzUyMzEzMGU1
+    MmVkNjAzMjkyMjVlZTY5NGQ2OGQ2ZDViZDIzNGVhYmM3NzE5OGM=
   data.tar.gz: !binary |-
-    NjRkMjg1Nzg1MDgzMjQxOGM2NTM1NzQ0ZDg1ZGE0NTk5NDM4MzFiMTIyZTg1
-    ZjViMDg5YmE1NmNiMzRhNDcwMWRlNGE3Y2JlNTU3Y2M2YjhlMTAzNDUzZGM1
-    NmNkY2ZhNTJmYjJkMjIzNDQ3ODk3NTE1MTkwZjdjYTdmZGYzYmI=
+    NjdmZjM2ODc4MWMwNTc1YTlmZGM2NjRlODg2NTI4MGNlOTFhYmU1NWRhZWYx
+    OWIyZTE5NmYyN2JhYjhhOGE2MmE5YWY1YjY0MGI2ZmEwOTkzN2QyZWQ3YjBk
+    ZjZiNTRjMmJkYjc4YWFjMWI1NWM1NTI1OWY2MzFmOTYzY2JlMTE=

data/CHANGELOG

@@ -118,3 +118,7 @@
 # 1.3.8
 
 * Normalize also path set in HOME before using (fixes problems with backslash used in Windows).
+
+# 1.3.9
+
+* Changed handling of parallel tasks due to robustness problems

data/lib/rim/processor.rb

@@ -109,36 +109,33 @@ end
 def each_module_parallel(task_desc, modules)
   if !modules.empty?
     @logger.debug "starting \"#{task_desc}\" for #{modules.size} modules\r"
-    threads = []
-    messages = []
-    i = 0
-    done = 0
-    while i == 0 || !threads.empty?
-      while threads.size < MaxThreads && i < modules.size
-        threads << Thread.new(i) do |i|
+    index_queue = Queue.new
+    (0...modules.size).each do |i|
+      index_queue << i
+    end
+    result_queue = Queue.new
+    (1..MaxThreads).each do
+      Thread.new do
+        loop do
+          i = index_queue.pop(true)
+          break if i.nil?
+          result = []
           begin
             yield(modules[i], i)
           rescue RimException => e
-            messages += e.messages
+            result = e.messages
+          rescue Exception => e
+            result = [e.to_s]
           end
+          result_queue << result
         end
-        i += 1
       end
-      sleep(0.1)
-      threads = threads.select{|t|
-        if t.alive?
-          true
-        else
-          t.join
-          done += 1
-          @logger.debug "#{task_desc} #{done}/#{modules.size}\r"
-          false
-        end
-      }
     end
-    if !messages.empty?
-      raise RimException.new(messages)
+    messages = []
+    (0...modules.size).each do |i|
+      messages.concat(result_queue.pop)
     end
+    raise RimException.new(messages) if !messages.empty?
   end
 end
 

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.3.8"
+Version = "1.3.9"
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -83,9 +83,6 @@ files:
 - test/test_helper.rb
 - test/unit_tests.rb
 - test/upload_helper_test.rb
-- test/upload_helper_test/remote_git/mod1/readme.txt
-- test/upload_helper_test/remote_ws/readme
-- test/upload_helper_test/ws/readme
 - test/upload_module_helper_test.rb
 homepage: http://github.com/esrlabs/esr-rim
 licenses: []

data/test/upload_helper_test/remote_git/mod1/readme.txt

@@ -1 +0,0 @@
-Content.

data/test/upload_helper_test/remote_ws/readme

@@ -1 +0,0 @@
-Content

data/test/upload_helper_test/ws/readme

@@ -1 +0,0 @@
-Content