rbbt-util 5.5.33 → 5.5.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWEwNDc0YzJmMjEzZTdmMDQzNTdiMzg0MTdiNWQ2OTA1ZTgzYTk3ZQ==
+    NzliNGFhOTdhZmJjMzhmZDJhNzU4ZDUwZWQzNjgxNjE3NzQ3MTkyZg==
   data.tar.gz: !binary |-
-    MWMzNGU3YTA5MGJiMzkyZDNkOGUyZjYyOTE5YTM0ZDkwYWM2Yzc3MA==
+    Y2M1ZTJmMjJkZjE4NGQxM2NhMGYyNDBlZjA0ODYxMWJhMGJjMWI3ZA==
 SHA512:
   metadata.gz: !binary |-
-    MzMyM2RmMjRiMDkxMzIxMjQ0MmMxMjU4YWJmYTc4MThmNGJjOTZlZWI3YTNl
-    NGZjMGViMTFmOWRkN2FkYjIxODZlNjA1NmFhZGE3MTdhYmVmYzdiZmU2N2Ri
-    N2M2OGRkZTE1NmU3ODkyZWY2NjkyMmU2ZjlmZTJlN2UwMTk0ZGE=
+    ODQ1OWQ0NmUwOTM1MDRjNTk5MGY5MTUxZjcyNTJjNzQ1N2M4NzMxNmVmMmVm
+    ZGI3NzFmN2I1MzliYmM4ZTE0NjZhZjJlMWUyYTVhZDZhZGQxN2IxMTIxZjkx
+    MzUyOWQwNTg4MmIxMzQyYjIxNTJmYjhiNGNjZDZiNzc3Y2RjODc=
   data.tar.gz: !binary |-
-    OGQ3MTI4Yzc2NjIzNjQ1NjFmNjI4YWUxMzZlOTViMWU0NWZmOWU5ZjQ1MWJi
-    ZjBkOWRiYjg4YWZkNmNmNGVmYTBmZDdmMGMwNmZiOTJmMDE0MDY0YzRmOTE0
-    Njc0N2FmZmMxZDQ0ODZjYzliYzFkZWIyNWFjY2VlYWY5YzMxM2I=
+    MjBiYWZiNmYyYThiY2Q0YTM4NmE4NWZlZDRmMzI2YTM4ZmIwMmI4MmY3ZmY0
+    NWJhNDI0OTQxYTM4Y2UzOGYwZjY1N2M3ODAwNTk4MzgxMGMxOTY3NmQ0NzVi
+    OWM2Y2I1YzU3MjUwNWFlMWUyZmMyZTEzMGIyODg1YTg3YzZmYzI=

data/lib/rbbt/util/misc.rb

@@ -84,37 +84,68 @@ module Misc
     [colors, used]
   end
 
+  #def self.collapse_ranges_old(ranges)
+  #  processed = []
+  #  last = nil
+  #  ranges.sort_by{|range| range.begin }.each do |range|
+  #    rbegin = range.begin
+  #    rend = range.end
+  #    if last.nil? or rbegin > last
+  #      processed << range
+  #      last = rend
+  #    else
+  #     new_processed = []
+  #      processed.each do |processed_range|
+  #        if processed_range.end < rbegin
+  #          new_processed << processed_range
+  #        else
+  #          eend = [rend, processed_range.end].max
+  #          new_processed << (processed_range.begin..eend)
+  #          break
+  #        end
+  #      end
+  #      processed = new_processed
+  #      last = rend if rend > last
+  #    end
+  #  end
+  #
+  #  processed
+  #end
+
   def self.collapse_ranges(ranges)
     processed = []
     last = nil
+    final = []
     ranges.sort_by{|range| range.begin }.each do |range|
-      if last.nil? or range.begin > last
-        processed << range
-        last = range.end
+      rbegin = range.begin
+      rend = range.end
+      if last.nil? or rbegin > last
+        processed << [rbegin, rend]
+        last = rend
       else
-        new_processed = []
-        processed.each do |processed_range|
-          if processed_range.end < range.begin
-            new_processed << processed_range
+       new_processed = []
+        processed.each do |pbegin,pend|
+          if pend < rbegin
+            final << [pbegin, pend]
           else
-            eend = [range.end, processed_range.end].max
-            new_processed << (processed_range.begin..eend)
+            eend = [rend, pend].max
+            new_processed << [pbegin, eend]
             break
           end
         end
         processed = new_processed
-        last = range.end if range.end > last
+        last = rend if rend > last
       end
     end
 
-    processed
+    final.concat processed
+    final.collect{|b,e| (b..e)}
   end
 
   def self.total_length(ranges)
     Misc.collapse_ranges(ranges).inject(0) do |total,range| total += range.end - range.begin + 1 end
   end
 
-
   def self.random_sample_in_range(total, size)
     p = Set.new
 

data/lib/rbbt/util/semaphore.rb

@@ -66,8 +66,11 @@ void post_semaphore(char* name){
       pids = elems.collect do |elem| 
         Process.fork do 
           RbbtSemaphore.wait_semaphore(file)
-          yield elem
-          RbbtSemaphore.post_semaphore(file)
+          begin
+            yield elem
+          ensure
+            RbbtSemaphore.post_semaphore(file)
+          end
         end
       end
       pids.each do |pid| Process.waitpid pid end

data/share/rbbt_commands/tsv/info

@@ -3,13 +3,17 @@
 require 'rbbt-util'
 require 'rbbt/util/simpleopt'
 
-options = SOPT.get("-tc--tokyocabinet")
+options = SOPT.get("-tch--tokyocabinet:-tcb--tokyocabinet_bd")
 
 file = ARGV.shift
 
-if options[:tokyocabinet]
+case
+when options[:tokyocabinet]
   tsv = Persist.open_tokyocabinet(file, false)
   puts tsv.summary
+when options[:tokyocabinet_bd]
+  tsv = Persist.open_tokyocabinet(file, false, nil, TokyoCabinet::BDB)
+  puts tsv.summary
 else
   header = TSV.parse_header(Open.open(file))
 

data/share/rbbt_commands/workflow/install

@@ -14,7 +14,12 @@ workflow_dir = Rbbt.etc.workflow_dir.exists? ? Rbbt.etc.workflow_dir.read.strip
 FileUtils.mkdir_p workflow_dir unless File.exists? workflow_dir
 
 Misc.in_dir(workflow_dir) do
-  if File.exists? workflow
+  case
+  when File.exists? Misc.snake_case(workflow)
+    Misc.in_dir(Misc.snake_case(workflow)) do
+      `git pull`
+    end
+  when File.exists? workflow
     Misc.in_dir(workflow) do
       `git pull`
     end

data/share/rbbt_commands/workflow/monitor

@@ -6,7 +6,7 @@ require 'rbbt/util/simpleopt'
 require 'rbbt/workflow/step'
 require 'rbbt/util/misc'
 
-options = SOPT.get("-l--list:-z--zombies:-e--errors:-c--clean:-n--name:-a--all:-w--wipe:-f--file*:-q--quick")
+options = SOPT.get("-l--list:-z--zombies:-e--errors:-c--clean:-n--name:-a--all:-w--wipe:-f--file*:-q--quick:-d--directory*")
 
 YAML::ENGINE.yamler = 'syck' if defined? YAML::ENGINE and YAML::ENGINE.respond_to? :yamler
 
@@ -105,22 +105,26 @@ def clean_jobs(options)
   end
 end
 
-
-
 $name = options.delete :name
 $quick = options.delete :quick
-case
-when (options[:clean] and not options[:list])
-  if options[:file]
-    remove_job options[:file]
+old_dir = Dir.pwd
+begin
+  Dir.chdir options[:directory] if options[:directory]
+  case
+  when (options[:clean] and not options[:list])
+    if options[:file]
+      remove_job options[:file]
+    else
+      clean_jobs options
+    end
   else
-    clean_jobs options
-  end
-else
-  if options[:file]
-    info = Step::INFO_SERIALIAZER.load(Open.read(options[:file], :mode => 'rb'))
-    print_job options[:file], info
+    if options[:file]
+      info = Step::INFO_SERIALIAZER.load(Open.read(options[:file], :mode => 'rb'))
+      print_job options[:file], info
   else
     list_jobs options
   end
+  end
+ensure
+  Dir.chdir old_dir
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.33
+  version: 5.5.34
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -204,7 +204,8 @@ files:
 - test/test_helper.rb
 - test/test_rbbt.rb
 homepage: http://github.com/mikisvaz/rbbt-util
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []