rbbt-util 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71dfbcf2b547eae0ab59b0fcf3b590d08668244
-  data.tar.gz: 27f56badaca1455685f00466bce558785ed357a8
+  metadata.gz: 6a46ea266ad3643e792d4ada78b8fc6481cb0402
+  data.tar.gz: f0d162717d49d90ed84fcf3a470970463210db11
 SHA512:
-  metadata.gz: 7a5fefc16d333e8ba239800eee76e90f3ae4d76efbcd50629c1ebd5cbab030f1f94aacba342336fab7bb12dc835ea1317ba1fcb1505e54e872ce0260afd9953c
-  data.tar.gz: 44dcbc2f220861724f3de420d7e6f6c65676893365b3d4c99391d0928b0ae12816db168b181af0e1349d35dc4441237687331f2f55febb459503ea928d8dfe95
+  metadata.gz: 3f94543a04e6919ced4606fe6d58a5211c6f4f84803d6320e99c87fc9a0d28802e8b7ee76011fbe2f5bcbf9bc993fb788ea5cd01f5edc178bddf823de47dc32f
+  data.tar.gz: cca962588cea1323d696ca06d8e4a81e936393cd7f217fc21d3879731276ca080144e21e42b3f1ae8469be61825e4accbd3f94b2baee19d7467583f6fdffb801

data/bin/rbbt

@@ -43,6 +43,7 @@ def commands(prev)
 end
 
 def rbbt_usage(prev = nil)
+  puts
   puts SOPT.doc
 
   if prev
@@ -58,10 +59,10 @@ def rbbt_usage(prev = nil)
       puts "  " << command
     end
   end
+  puts
 end
 
 def print_error(error, backtrace = nil)
-  puts
   puts Term::ANSIColor.red("Error:")
   puts
   puts error
@@ -94,9 +95,15 @@ begin
       exit -1
     end
   end
+
+  rbbt_usage(prev)
+  exit 0
+
 rescue ParameterException
+  puts
   rbbt_usage
   print_error($!.message, $!.backtrace)
+  puts
   exit -1
 ensure
   if options[:profile]

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

@@ -63,8 +63,8 @@ module SOPT
       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  = "  * " << SOPT.input_format(name, type.to_sym, default, shortcut) 
+      str << "\n     " << description << "\n" if description and not description.empty?
       str
     end * "\n"
   end

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

@@ -7,10 +7,18 @@ module SOPT
     current = [chars.shift]
     short = current * ""
 
+    if shortcuts.include? short and long.index "-" or long.index "_"
+      parts = long.split(/[_-]/)
+      acc = parts.collect{|s| s[0] } * ""
+      return acc unless shortcuts.include? acc
+    end
+
     while shortcuts.include? short
-      next_letter = chars.shift
-      return nil if next_letter.nil?
-      current << next_letter
+      while shortcuts[short].index current * ""
+        next_letter = chars.shift
+        return nil if next_letter.nil?
+        current << next_letter
+      end
       short = current * ""
     end
 

data/share/rbbt_commands/tsv/info

@@ -9,6 +9,8 @@ file = ARGV.shift
 
 file = STDIN if file == '-'
 
+raise ParameterException, "Please specify the tsv file as argument" if file.nil?
+
 case
 when options[:tokyocabinet]
   tsv = Persist.open_tokyocabinet(file, false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.6.5
 platform: ruby
 authors:
 - Miguel Vazquez