rbbt-util 5.6.2 → 5.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7529a3f61ee17378eae98591577b9a39f9a64fd8
-  data.tar.gz: 21485c3f12ae2823f13e7a7f098d242dac15c0c1
+  metadata.gz: ecea1d091627d32a02327ea8a0eee78b099f13f0
+  data.tar.gz: a2ebf3798cb4ee454a3050307816b5d6ad46747d
 SHA512:
-  metadata.gz: 73f9e121eb79a0c91b92dd5474f04508771230d8451178cf348d6fb3f920d89518491106c7a051f95bd28d94bb59884aa20491b3d8dd1839786603eecb2efc41
-  data.tar.gz: 39c04b2dff5c9fd798c2cb45cb432395d627b60f1ff2bf9483e5602035ab8e36ccd5847e75b03eec3c0cd4b61ee0a2c4c5bdb804d2776f031708babee6303289
+  metadata.gz: ff9269d0314aa934653a32231706cf665209e411773b4e174228623697ec01fd223a626059d87c2ed2209b9ba33779c019719b2d17b795b0e68fca4e8ea8ba15
+  data.tar.gz: e34f7b523daa44e076da779f3ed6d79733214770fceb5a16e8643f1e8db6aa035523c0925656adfee7b1d5f9d8713e4c026ea6905064927de2cbcddb26095d68

data/bin/rbbt

@@ -57,11 +57,13 @@ begin
       load dir[command].find
       exit 0
     else
-      puts "Error: Command not understood"
-      puts
+      error = "Command '#{command }' not understood"
       break
     end
   end
+rescue ParameterException
+  error = $!.message
+  backtrace = $!.backtrace
 ensure
   if options[:profile]
     result = RubyProf.stop
@@ -83,4 +85,18 @@ puts
 commands(prev).each do |command|
     puts "  " << command
 end
+
+if error
+  puts
+  puts Term::ANSIColor.red("Error executing '#{ [File.basename($0), prev, command].compact.flatten * " " }':")
+  puts
+  puts error
+  if backtrace
+    puts
+    puts Term::ANSIColor.red("Backtrace:")
+    puts
+    puts backtrace * "\n"
+  end
+  puts
+end
     

data/lib/rbbt/persist/tsv/tokyocabinet.rb

@@ -12,7 +12,7 @@ module Persist
       database = CONNECTIONS[path] ||= tokyocabinet_class.new
 
       flags = (write ? tokyocabinet_class::OWRITER | tokyocabinet_class::OCREAT : tokyocabinet_class::OREADER)
-      database.close
+      database.close 
 
       if !database.open(path, flags)
         ecode = database.ecode
@@ -93,7 +93,7 @@ module Persist
     end
 
     def write_and_read
-      lock_filename = Persist.persistence_path(persistence_path, {:dir => TSV.lock_dir})
+      lock_filename = Persist.persistence_path(persistence_path + '.write', {:dir => TSV.lock_dir})
       Misc.lock(lock_filename) do
         write if @closed or not write?
         res = begin
@@ -106,7 +106,7 @@ module Persist
     end
 
     def write_and_close
-      lock_filename = Persist.persistence_path(persistence_path, {:dir => TSV.lock_dir})
+      lock_filename = Persist.persistence_path(persistence_path + '.write', {:dir => TSV.lock_dir})
       Misc.lock(lock_filename) do
         write if @closed or not write?
         res = begin

data/lib/rbbt/util/semaphore.rb

@@ -88,5 +88,54 @@ void post_semaphore(char* name){
       end
     end
   end
-end if continue
+
+  def self.thread_each_on_semaphore(elems, size)
+    mutex = Mutex.new
+    count = 0
+    cv = ConditionVariable.new
+    wait_mutex = Mutex.new
+
+    begin
+
+      threads = []
+      wait_mutex.synchronize do
+        threads = elems.collect do |elem| 
+          Thread.new(elem) do |elem|
+
+            continue = false
+            mutex.synchronize do
+              while not continue do
+                if count < size 
+                  continue = true
+                  count += 1
+                end
+                mutex.sleep 1 unless continue
+              end
+            end
+
+            begin
+              yield elem
+            rescue Interrupt
+              Log.error "Thread was aborted while processing: #{Misc.fingerprint elem}"
+              raise $!
+            ensure
+              mutex.synchronize do
+                count -= 1
+                cv.signal if mutex.locked?
+              end
+            end
+          end
+        end
+      end
+
+      threads.each do |thread| 
+        thread.join 
+      end
+    rescue Exception
+      Log.exception $!
+      Log.info "Ensuring threads are dead: #{threads.length}"
+      threads.each do |thread| thread.kill end
+    end
+  end
+end 
 

data/lib/rbbt/util/simpleopt/accessor.rb

@@ -0,0 +1,50 @@
+
+module SOPT
+  class << self
+    attr_accessor :inputs, :input_shortcuts, :input_types, :input_descriptions, :input_defaults
+  end
+
+  def self.all
+    @all ||= {}
+  end
+
+  def self.shortcuts
+    @shortcuts ||= {}
+  end
+  
+  def self.inputs 
+    @inputs ||= []
+  end
+
+  def self.input_shortcuts 
+    @input_shortcuts ||= {}
+  end
+
+  def self.input_types 
+    @input_types ||= {}
+  end
+
+  def self.input_descriptions 
+    @input_descriptions ||= {}
+  end
+
+  def self.input_defaults 
+    @input_defaults ||= {}
+  end
+
+  def self.reset
+    @shortcuts = {}
+    @all = {}
+  end
+
+  def self.delete_inputs(inputs)
+    inputs.each do |input|
+      input = input.to_s
+      self.shortcuts.delete self.input_shortcuts.delete(input)
+      self.inputs.delete input
+      self.input_types.delete input
+      self.input_defaults.delete input
+      self.input_descriptions.delete input
+    end
+  end
+end

data/lib/rbbt/util/simpleopt/doc.rb

@@ -0,0 +1,90 @@
+module SOPT
+
+  class << self
+    attr_accessor :command, :summary, :synopsys, :description
+  end
+
+  def self.command
+    @command ||= File.basename($0)
+  end
+
+  def self.summary
+    @summary ||= ""
+  end
+
+  def self.synopsys
+    @synopsys ||= begin
+                    "#{command} " <<
+                    inputs.collect{|name|
+                      "[" << input_format(name, input_types[name] || :string, input_defaults[name], input_shortcuts[name]).sub(/:$/,'') << "]"
+                    } * " "
+                  end
+  end
+
+  def self.description
+    @description ||= "Missing"
+  end
+
+  def self.input_format(name, type = nil, default = nil, short = nil)
+    input_str = (short.nil? or short.empty?) ? "--#{name}" : "-#{short}, --#{name}"
+    input_str << case type
+    when nil
+      "#{default != nil ? " (default '#{default}')" : ""}:"
+    when :boolean
+      "[=false]#{default != nil ? " (default '#{default}')" : ""}:"
+    when :tsv, :text
+      "=<filename.#{type}|->#{default != nil ? " (default '#{default}')" : ""}; Use '-' for STDIN:"
+    when :array
+      "=<string[,string]*|filename.list|->#{default != nil ? " (default '#{default}')" : ""}; Use '-' for STDIN:"
+    else
+      "=<#{ type }>#{default != nil ? " (default '#{default}')" : ""}:"
+    end
+  end
+
+  def self.input_doc(inputs, input_types = nil, input_descriptions = nil, input_defaults = nil, input_shortcuts = nil)
+    type = description = default = nil
+    shortcut = ""
+    inputs.collect do |name|
+      name = name.to_s
+
+      type = input_types[name] unless input_types.nil?
+      description = input_descriptions[name] unless input_descriptions.nil?
+      default = input_defaults[name] unless input_defaults.nil?
+
+      case input_shortcuts
+      when nil, FalseClass
+        shortcut = nil
+      when Hash
+        shortcut = input_shortcuts[name] 
+      when TrueClass
+        shortcut = fix_shortcut(name[0], name)
+      end
+
+      type = :string if type.nil?
+      register(shortcut, name, type, description) unless self.inputs.include? name
+
+      str  = "  * " << SOPT.input_format(name, type.to_sym, default, shortcut) << "\n"
+      str << "    " << description << "\n" if description and not description.empty?
+      str
+    end * "\n"
+  end
+
+  def self.doc
+    doc = <<-EOF
+#{command}(1) -- #{summary}
+#{"=" * (command.length + summary.length + 7)}
+
+## SYNOPSYS
+
+#{synopsys}
+
+## DESCRIPTION
+
+#{description}
+
+## OPTIONS
+
+#{input_doc(inputs, input_types, input_descriptions, input_defaults, input_shortcuts)}
+    EOF
+  end
+end

data/lib/rbbt/util/simpleopt/get.rb

@@ -0,0 +1,41 @@
+module SOPT
+  def self.consume(args = ARGV)
+    i = 0
+    values = {}
+    while i < args.length do
+      current = args[i]
+      if m = current.match(/--?(.+?)(?:=(.+))?$/)
+        key = $1
+        value = $2
+
+        input = inputs.include?(key)? key : shortcuts[key]
+
+        if input.nil?
+          i += 1
+          next
+        else
+          args.delete_at i
+        end
+      else
+        i += 1
+        next
+      end
+
+      if input_types[input] == :string
+        value = args.delete_at(i) if value.nil?
+        values[input] = value
+      else
+        values[input] = %w(F false FALSE no).include?(value)? false : true
+      end
+    end
+
+    IndiferentHash.setup values
+
+    values
+  end
+  
+  def self.get(opt_str)
+    SOPT.parse(opt_str)
+    SOPT.consume(ARGV)
+  end
+end

data/lib/rbbt/util/simpleopt/parse.rb

@@ -0,0 +1,44 @@
+require 'rbbt/util/simpleopt/accessor'
+module SOPT
+  def self.fix_shortcut(short, long)
+    return short unless short and shortcuts.include?(short)
+
+    chars = long.chars.to_a
+    current = [chars.shift]
+    short = current * ""
+
+    while shortcuts.include? short
+      next_letter = chars.shift
+      return nil if next_letter.nil?
+      current << next_letter
+      short = current * ""
+    end
+
+    short
+  end
+
+  def self.register(short, long, asterisk, description)
+    short = fix_shortcut(short, long)
+    shortcuts[short] = long if short
+    inputs << long
+    input_shortcuts[long] = short
+    input_descriptions[long] = description
+    input_types[long] = asterisk ? :string : :boolean
+  end
+
+  def self.parse(opt_str)
+    info = {}
+
+    inputs = []
+    opt_str.split(/[:\n]+/).each do |entry|
+      entry.strip!
+      next if entry.empty?
+      names, _sep, description = entry.partition /\s+/
+      short, long, asterisk = names.match(/\s*(?:-(.+))?(?:--(.+?))([*])?$/).values_at 1,2,3 
+
+      inputs << long
+      register short, long, asterisk, description
+    end
+    inputs
+  end
+end

data/lib/rbbt/util/simpleopt.rb

@@ -1,244 +1,7 @@
-module SOPT
-
-  #{{{ ACCESSORS
-  
-  class << self
-    attr_accessor :command, :summary, :synopsys, :description
-    attr_accessor :inputs, :input_shortcuts, :input_types, :input_descriptions, :input_defaults
-  end
-
-  def self.command
-    @command ||= File.basename($0)
-  end
-
-  def self.summary
-    @summary ||= ""
-  end
-
-  def self.synopsys
-    @synopsys ||= begin
-                    "#{command} " <<
-                    inputs.collect{|name|
-                      "[" << input_format(name, input_types[name] || :string, input_defaults[name], input_shortcuts[name]).sub(/:$/,'') << "]"
-                    } * " "
-                  end
-  end
-
-  def self.description
-    @description ||= "Missing"
-  end
-
-  def self.shortcuts
-    @shortcuts ||= []
-  end
-
-  def self.delete_inputs(inputs)
-    inputs.each do |input|
-      input = input.to_s
-      self.shortcuts.delete self.input_shortcuts.delete(input)
-      self.inputs.delete input
-      self.input_types.delete input
-      self.input_defaults.delete input
-      self.input_descriptions.delete input
-    end
-  end
-
-  def self.all
-    @all ||= {}
-  end
-  
-  def self.inputs 
-    @inputs ||= []
-  end
-
-  def self.input_shortcuts 
-    @input_shortcuts ||= {}
-  end
-
-  def self.input_types 
-    @input_types ||= {}
-  end
-
-  def self.input_descriptions 
-    @input_descriptions ||= {}
-  end
-
-  def self.input_defaults 
-    @input_defaults ||= {}
-  end
-
-  def self.reset
-    @shortcuts = []
-    @all = {}
-  end
-
-  #{{{ PARSING
-  
-  def self.record(info)
-    input = info[:long].sub("--", '')
-    inputs << input
-    input_types[input] = info[:arg] ? :string : :boolean
-    input_descriptions[input] = info[:description]
-    input_defaults[input] = info[:default]
-    input_shortcuts[input] = info[:short]? info[:short].sub("-",'') : nil
-  end
-
-  def self.short_for(name)
-    short = []
-    chars = name.to_s.chars.to_a
-
-    short << chars.shift 
-    shortcuts = input_shortcuts.values.compact.flatten
-    while shortcuts.include? short * "" and chars.any?
-      short << chars.shift 
-    end
-    return nil if chars.empty?
-
-    short * ""
-  end
-
-
-  def self.name(info)
-    (info[:long] || info[:short]).sub(/^-*/,'')
-  end
-
-  def self.parse(opts)
-    info = {}
-
-    opts.split(/[:\n]+/).each do |opt|
-      next if opt.strip.empty?
-
-      short, long = opt.strip.sub(/(^[^\s]*)\*/,'\1').split('--').values_at(0,1)
-      long, short = short, nil if long.nil?
-
-      if long.index(" ")
-        long, description = long.match(/^([^\s]+)\s+(.*)/).values_at 1, 2
-      else
-        description = nil
-      end
-      
-      i= { :arg => !!opt.match(/^[^\s]*\*/) }
-
-      i[:short]       = short unless short.nil? || short.empty?
-      i[:long]        = '--' + long unless long.nil? || long.empty?
-      i[:description] = description unless description.nil? || description.empty?
-
-      if shortcuts.include? short
-        i[:short] = short_for(i[:long])
-        Log.debug{ "Short for #{ long } is taken. Changed to #{i[:short]}" }
-      else
-        shortcuts << i[:short] if short
-      end
+require 'rbbt/util/simpleopt/accessor'
+require 'rbbt/util/simpleopt/doc'
+require 'rbbt/util/simpleopt/parse'
+require 'rbbt/util/simpleopt/get'
 
-      record(i)
-
-      info[name(i)] = i
-    end
-
-    info
-  end
-
-  def self.get(opts)
-    info = parse(opts)
-
-    switches = {}
-    info.each do |name, i|
-      switches[i[:short]] = name if i[:short]
-      switches[i[:long]] = name if i[:long]
-    end
-
-    options = Hash.new(false)
-    rest = []
-
-    index = 0
-    while index < ARGV.length do
-      orig_arg = ARGV[index]
-
-      if orig_arg =~ /=/
-        arg, value = orig_arg.match(/(.*?)=(.*)/).values_at 1, 2
-      else
-        arg = orig_arg
-        value = nil
-      end
-
-      if switches.include? arg
-        name = switches[arg]
-        i = info[name]
-        if i[:arg]
-          if value.nil?
-            value = ARGV[index + 1]
-            index += 1
-          end
-          options[name.to_sym] = value
-        else
-          options[name.to_sym] = value == "false" ? false : true
-        end
-      else
-        rest << orig_arg
-      end
-      index += 1
-    end
-
-    ARGV.delete_if do true end
-    rest.each do |e| ARGV << e end
-
-    options
-  end
-
-  #{{{ DOCUMENTATION
-
-  def self.input_format(name, type = nil, default = nil, short = "")
-    short = short_for(name) if not short.nil? and short.empty?
-
-    input_str = short.nil? ? "--#{name}" : "-#{short}, --#{name}"
-    input_str << case type
-    when nil
-      "#{default != nil ? " (default '#{default}')" : ""}:"
-    when :boolean
-      "[=false]#{default != nil ? " (default '#{default}')" : ""}:"
-    when :tsv, :text
-      "=<filename.#{type}|->#{default != nil ? " (default '#{default}')" : ""}; Use '-' for STDIN:"
-    when :array
-      "=<string[,string]*|filename.list|->#{default != nil ? " (default '#{default}')" : ""}; Use '-' for STDIN:"
-    else
-      "=<#{ type }>#{default != nil ? " (default '#{default}')" : ""}:"
-    end
-  end
-
-  def self.input_doc(inputs, input_types = nil, input_descriptions = nil, input_defaults = nil, input_shortcuts = nil)
-    type = description = default = nil
-    shortcut = ""
-    inputs.collect do |name|
-
-      type = input_types[name] unless input_types.nil?
-      description = input_descriptions[name] unless input_descriptions.nil?
-      default = input_defaults[name] unless input_defaults.nil?
-      shortcut = input_shortcuts[name] unless input_shortcuts.nil?
-
-      type = :string if type.nil?
-
-      str  = "  * " << SOPT.input_format(name, type.to_sym, default, shortcut) << "\n"
-      str << "    " << description << "\n" if description and not description.empty?
-      str
-    end * "\n"
-  end
-
-  def self.doc
-    doc = <<-EOF
-#{command}(1) -- #{summary}
-#{"=" * (command.length + summary.length + 7)}
-
-## SYNOPSYS
-
-#{synopsys}
-
-## DESCRIPTION
-
-#{description}
-
-## OPTIONS
-
-#{input_doc(inputs, input_types, input_descriptions, input_defaults, input_shortcuts)}
-    EOF
-  end
+module SOPT
 end

data/lib/rbbt/workflow/accessor.rb

@@ -260,19 +260,23 @@ module Workflow
   end
 
   def rec_input_defaults(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_defaults}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_defaults}.
+      tap{|h| IndiferentHash.setup(h)}
   end
 
   def rec_input_types(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_types}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_types}.
+      tap{|h| IndiferentHash.setup(h)}
   end
 
   def rec_input_descriptions(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_descriptions}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_descriptions}.
+      tap{|h| IndiferentHash.setup(h)}
   end
 
   def rec_input_options(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_options}
+    [taskname].concat(rec_dependencies(taskname)).inject({}){|acc, tn| acc.merge tasks[tn.to_sym].input_options}.
+      tap{|h| IndiferentHash.setup(h)}
   end
 
   def real_dependencies(task, jobname, inputs, dependencies)

data/lib/rbbt/workflow/usage.rb

@@ -4,8 +4,7 @@ module Task
   def doc(deps = nil)
     puts "## #{ name }:"
     puts "\n" << description if description and not description.empty?
-    puts
-    puts SOPT.input_doc(inputs, input_types, input_descriptions, input_defaults)
+    puts SOPT.input_doc(inputs, input_types, input_descriptions, input_defaults, true)
 
     if deps and deps.any?
       puts
@@ -14,7 +13,7 @@ module Task
       deps.each do |dep|
         puts "  #{dep.name}:"
         puts
-        puts SOPT.input_doc(dep.inputs, dep.input_types, dep.input_descriptions, dep.input_defaults)
+        puts SOPT.input_doc(dep.inputs, dep.input_types, dep.input_descriptions, dep.input_defaults, true)
         puts
       end
     end

data/share/rbbt_commands/workflow/task

@@ -108,17 +108,19 @@ end
 
 options = SOPT.get <<EOF
 -h--help Show this help:
+-wd--workdir* Change the working directory of the workflow:
 -as--array_separator* Change the character that separates elements of Arrays, ',', '|', or '\\n' by default:
+-jn--jobname* Job name to use. The name 'Default' is used by default:
+-pn--printname Print the name of the job and exit without starting it:
 -cl--clean Clean the last step of the job so that it gets recomputed:
 -rcl--recursive_clean Clean the last step and its dependencies to recompute the job completely:
--jn--jobname* Job name to use. The name 'Default' is used by default:
--wd--workdir* Change the working directory of the workflow:
+--fork Run job asyncronously:
+--exec Run job with no persistence:
 -O--output* Save job result into file:
--pn--printname Print the name of the job and exit without starting it:
 -jf--job_file* Output one of the job produced files:
+-ljf--list_job_files List all the files produced in that step:
 --info Show the job info:
 --provenance Report the jobs provenance:
---fork Run job asyncronously:
 EOF
 
 workflow = ARGV.shift
@@ -132,6 +134,8 @@ do_fork = !!options.delete(:fork)
 do_exec = !!options.delete(:exec)
 clean = !!options.delete(:clean)
 recursive_clean = !!options.delete(:recursive_clean)
+out = options.include?(:output) ? File.open(options[:output], 'wb') : STDOUT
+
 $array_separator = options.delete(:array_separator)
 
 # Get workflow
@@ -157,13 +161,14 @@ namespace = nil, nil
 case 
 when task.nil?
   usage workflow
-when (task =~ /\./)
-  namespace, task = options.delete(:task).split('.')
-  namespace = Misc.string2const(namespace)
+  # Can not remember what this was
+#when (task =~ /\./)
+#  namespace, task = options.delete(:task).split('.')
+#  namespace = Misc.string2const(namespace)
 else
   task_name = task.to_sym
   task = workflow.tasks[task_name]
-  raise "Task not found: #{ task_name }" if task.nil?
+  raise ParameterException, "Task not found: #{ task_name }" if task.nil?
 end
 
 usage workflow, task if help
@@ -206,13 +211,13 @@ begin
     res = job.exec
     case
     when Array === res
-      puts res * "\n"
+      out.puts res * "\n"
     when TSV === res
-      puts res
+      out.puts res
     when Hash === res
-      puts res.to_yaml
+      out.puts res.to_yaml
     else
-      puts res
+      out.puts res
     end
     exit 0
   end
@@ -247,10 +252,14 @@ rescue ParameterException
   usage(workflow, task, $!.message, $!.backtrace)
 end
 
-out = options.include?(:output) ? File.open(options[:output], 'wb') : STDOUT
+
+if options.delete(:list_job_files)
+  out.puts job.files * "\n"
+  exit 0
+end
 
 if job_file = options.delete(:job_file)
-  out.puts res.file(job_file).read
+  out.puts job.file(job_file).read
   exit 0
 end
 

data/test/rbbt/util/simpleopt/test_get.rb

@@ -0,0 +1,12 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../../..', 'test_helper.rb')
+require 'rbbt/util/simpleopt/parse'
+require 'rbbt/util/simpleopt/get'
+
+class TestSOPTParse < Test::Unit::TestCase
+  def test_consume
+    SOPT.parse("-f--first* first arg:-f--fun")
+    args = "-f myfile --fun".split(" ")
+    assert_equal "myfile", SOPT.consume(args)[:first]
+  end
+end
+

data/test/rbbt/util/simpleopt/test_parse.rb

@@ -0,0 +1,10 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../../..', 'test_helper.rb')
+require 'rbbt/util/simpleopt/parse'
+
+class TestSOPTParse < Test::Unit::TestCase
+  def test_parse
+    SOPT.parse("-f--first* first arg:-f--fun")
+    assert_equal "fun", SOPT.shortcuts["fu"]
+  end
+end
+

data/test/rbbt/util/test_semaphore.rb

@@ -0,0 +1,18 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'test_helper.rb')
+require 'rbbt/util/semaphore'
+
+class TestRbbtSemaphore < Test::Unit::TestCase
+  def test_thread
+    times = 50
+    TmpFile.with_file do |dir|
+      Path.setup(dir)
+      FileUtils.mkdir_p dir
+      RbbtSemaphore.thread_each_on_semaphore((1..times).to_a, 25){|elem|
+        sleep rand
+        Open.write(dir[elem], "test")
+      }
+      assert_equal times, dir.glob.length
+    end
+  end
+end
+

data/test/rbbt/util/test_simpleopt.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 class TestSOPT < Test::Unit::TestCase
 
   def test_cmd_option_string
-    assert_equal("--tsv-options", SOPT.parse("-h--help:-to--tsv-options")["tsv-options"][:long])
+    SOPT.parse("-h--help:-to--tsv-options")
+    assert_equal "tsv-options", SOPT.shortcuts["to"]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.6.3
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -196,6 +196,10 @@ files:
 - lib/rbbt/util/semaphore.rb
 - lib/rbbt/util/simpleDSL.rb
 - lib/rbbt/util/simpleopt.rb
+- lib/rbbt/util/simpleopt/accessor.rb
+- lib/rbbt/util/simpleopt/doc.rb
+- lib/rbbt/util/simpleopt/get.rb
+- lib/rbbt/util/simpleopt/parse.rb
 - lib/rbbt/util/tar.rb
 - lib/rbbt/util/task/job.rb
 - lib/rbbt/util/tmpfile.rb
@@ -267,6 +271,8 @@ files:
 - test/rbbt/tsv/test_index.rb
 - test/rbbt/tsv/test_manipulate.rb
 - test/rbbt/tsv/test_util.rb
+- test/rbbt/util/simpleopt/test_get.rb
+- test/rbbt/util/simpleopt/test_parse.rb
 - test/rbbt/util/test_R.rb
 - test/rbbt/util/test_chain_methods.rb
 - test/rbbt/util/test_cmd.rb
@@ -275,6 +281,7 @@ files:
 - test/rbbt/util/test_filecache.rb
 - test/rbbt/util/test_misc.rb
 - test/rbbt/util/test_open.rb
+- test/rbbt/util/test_semaphore.rb
 - test/rbbt/util/test_simpleDSL.rb
 - test/rbbt/util/test_simpleopt.rb
 - test/rbbt/util/test_tmpfile.rb
@@ -309,6 +316,8 @@ test_files:
 - test/rbbt/test_workflow.rb
 - test/rbbt/resource/test_path.rb
 - test/rbbt/util/test_cmd.rb
+- test/rbbt/util/simpleopt/test_get.rb
+- test/rbbt/util/simpleopt/test_parse.rb
 - test/rbbt/util/test_chain_methods.rb
 - test/rbbt/util/test_simpleDSL.rb
 - test/rbbt/util/test_open.rb
@@ -317,6 +326,7 @@ test_files:
 - test/rbbt/util/test_simpleopt.rb
 - test/rbbt/util/test_excel2tsv.rb
 - test/rbbt/util/test_filecache.rb
+- test/rbbt/util/test_semaphore.rb
 - test/rbbt/util/test_misc.rb
 - test/rbbt/util/test_tmpfile.rb
 - test/rbbt/test_association.rb