rbbt-util 5.27.12 → 5.27.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96eabb01327f6e3f5facc629140375ee06c16d160f77788cf3cee63df1fe0a55
-  data.tar.gz: 3a30f619c73fb04003c7b6dd7d1a2d2a7f8f0fed2e503892c691280a02055af9
+  metadata.gz: 99b1ad9e8d9403c7f77e22b16497456324c340b08122b765033530f713e35c3c
+  data.tar.gz: 2d33590e395b9ca715e1c16d509d0a62a1ebeab2315b700ff4377a08803c89af
 SHA512:
-  metadata.gz: ab7cd7746f19395bbc430cfb7b90bd3c6727d9a72069828c338f9abcb69c9776a52f8a6ceeb9244764ed55d9b1ad039739d32e3de27107a5edf7f01e22d10f34
-  data.tar.gz: a9f620db6b823d54560b201fe6d706be0c6db502d1cae49100322926011702ad59e7fcdece25dcc2df8ac7cb49cfde67fd432a392b4416e492a0b4eadbeda47c
+  metadata.gz: '097ce6c8c16c17441f5a8748ba4ab33afecf6d22d4d54c7ce53475cd642407ae5013346ba482f7fa9375176ab6790febfe030e9f7959ba7b928b5d3762382237'
+  data.tar.gz: 2fb616d7d66fc2eb979c9911921faecf163f51dd3323ac127265bcaefd0e8a4e3aab9ef41cc9bdf8bd351d44d4ef2cc388c692d5dc9a2d1b811155f21e3f0889

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -727,6 +727,8 @@ module TSV
         Log.exception $!
         abort_stream(into, $!)
         raise $!
+      ensure
+        Log::ProgressBar.remove_bar(bar) if bar
       end
 
       into

data/lib/rbbt/util/misc.rb

@@ -2,6 +2,7 @@ require 'lockfile'
 require 'digest/md5'
 require 'cgi'
 require 'zlib'
+require 'etc'
 require 'rubygems/package'
 
 require 'rbbt/util/tar'

data/lib/rbbt/util/misc/development.rb

@@ -295,13 +295,18 @@ def self.add_libdir(dir=nil)
   def self.bootstrap(elems, num = nil, options = {}, &block)
     IndiferentHash.setup options
 
-    num = Rbbt::Config.get :cpus, :default_bootstrap_cpus, :bootstrap_cpus if num == :current || num == nil
+    num = Rbbt::Config.get :cpus, :default_bootstrap_cpus, :bootstrap_cpus if num == :current || num == nil if defined?(Rbbt::Config)
     num = :current if num.nil?
     cpus = case num
            when :current
              n = Etc.nprocessors
              n = elems.length / 2 if n > elems.length/2
-             n
+
+             if $BOOTSTRAPPED_CURRENT && $BOOTSTRAPPED_CURRENT + n > Etc.nprocessors
+               1
+             else
+               n
+             end
            when String
              num.to_i
            when Integer
@@ -320,7 +325,12 @@ def self.add_libdir(dir=nil)
     respawn = options[:respawn] and options[:cpus] and options[:cpus].to_i > 1
 
     index = (0..elems.length-1).to_a.collect{|v| v.to_s }
+
     TSV.traverse index, options do |pos|
+      if num == :current
+        $BOOTSTRAPPED_CURRENT ||= n 
+        $BOOTSTRAPPED_CURRENT += 0 
+      end
       elem = elems[pos.to_i]
       elems.annotate elem if elems.respond_to? :annotate
       res = begin

data/lib/rbbt/util/misc/inspect.rb

@@ -401,7 +401,7 @@ module Misc
 
   def self.scan_version_text(text, cmd = nil)
     cmd = "NOCMDGIVE" if cmd.nil? || cmd.empty?
-    m = text.match(/(?:version.*?|#{cmd}.*?|v)((?:\d+\.)*\d+(?:-[a-z_]+)?)/i)
+    m = text.match(/(?:version.*?|#{cmd}.*?|#{cmd.split(/[-_.]/).first}.*?|v)((?:\d+\.)*\d+(?:-[a-z_]+)?)/i)
     return nil if m.nil?
     m[1]
   end

data/lib/rbbt/util/open.rb

@@ -94,7 +94,8 @@ module Open
              end
 
     begin
-      wget_options = options.merge( '-O' => '-')
+      wget_options = options.dup
+      wget_options = wget_options.merge( '-O' => '-') unless options.include?('--output-document')
       wget_options[:pipe] = pipe unless pipe.nil?
       wget_options[:stderr] = stderr unless stderr.nil?
 
@@ -824,4 +825,8 @@ module Open
   def self.broken_link?(path)
     File.symlink?(path) && ! File.exists?(File.readlink(path))
   end
+
+  def self.download(url, path)
+    Open.wget(url, "--output-document" => path)
+  end
 end

data/share/rbbt_commands/tsv/uncollapse

@@ -25,5 +25,4 @@ file = STDIN if file == '-'
 
 tsv = TSV.open file, :merge => true, :type => :double
 
-
 puts tsv.to_unmerged_expanded_s

data/test/rbbt/util/test_misc.rb

@@ -690,5 +690,30 @@ Written by Mike Haertel and others, see
     EOF
     assert_equal "3.1", Misc.scan_version_text(txt, "grep")
   end
+
+  def test_bootstrap_current_only_once
+
+     
+    max = Etc.nprocessors * 10
+    TmpFile.with_file do |f|
+      RbbtSemaphore.with_semaphore(1) do |sem|
+        Misc.bootstrap (1..max).to_a do
+          Open.open(f, :mode => 'a') do |sin|
+            sin.puts Process.pid.to_s
+          end
+          Misc.bootstrap (1..10).to_a do
+            RbbtSemaphore.synchronize(sem) do
+              Open.open(f, :mode => 'a') do |sin|
+                sin.puts [Process.ppid.to_s, Process.pid.to_s] * ":"
+              end
+            end
+          end
+        end
+      end
+      assert_equal max * 10 + max, Open.read(f).split("\n").length
+      assert_equal Etc.nprocessors * 2, Open.read(f).split("\n").uniq.length
+    end
+
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.27.12
+  version: 5.27.13
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake