optbind 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08d6fbf553b3406e305a2b8f2f238d322af9f940
-  data.tar.gz: 6bbb9c352093c33304bf7efd1b9e28b58f4fae89
+  metadata.gz: 4469bc21ab4953923de07a629997c6594b7c1467
+  data.tar.gz: 744cb5fe0bc9999eb640a1649c6037aa9349d3cc
 SHA512:
-  metadata.gz: d836778a595cb58dc5abddd17c975cc043e677250282d54071450034d75e77478361cbe43040b7d922222ee3677d679fceb2ed264598c5a01830022e4e0ea6a0
-  data.tar.gz: be2ecf0661478e19f81b3e1904bc243e264e12b5842f54b583bca126a68011bb26620177eb7fa4d42a6384f6debdec55faa600f1d180ab782c795a62ccad8578
+  metadata.gz: 7254d3d366227ef2ad584512b7ebc3d518a3217038fcaef66265659ec6b6013796a69141343e4af6b39b1d8d8a755238a52116e0a567e782e735f972aa6656d7
+  data.tar.gz: 3a6e491075503f6cbf27234475be5b5334ef738be8fdd324e5d1d0a36f9968e2b4d25bcbfa8668a536c84e3f8881cebb34c0783c349fa0e2c5513f9d5d8ec19a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.1.0
+
+*   Fix optional argument handling and help text generation
+
+*   Update default help text 
+
+    *Pavol Zbell*
+
+## 0.0.2
+
+*   Fix gem files 
+
+    *Pavol Zbell*
+
 ## 0.0.1
 
 *   Add initial extension to standard command line option parsing, setup Gem environment and RSpec tests 

data/README.md

@@ -16,10 +16,12 @@ partial argument analysis. Builds Git-like options and help by default.
 
 ## Usage
 
-Binds local variables to `ARGV` and parses command line arguments: 
+Bind local variables to `ARGV` and parse command line arguments: 
 
 ```ruby
-ARGV                                         #=> ['--no-verbose' '-o', 'file.out', 'file.in'] 
+require 'optbind'
+
+ARGV                                         #=> ['--no-verbose', '-o', 'file.out', 'file.in'] 
 
 i, o, v = STDIN, STDOUT, true
 

data/lib/optbind/version.rb

@@ -1,3 +1,3 @@
 module OptBind
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/optbind.rb

@@ -26,9 +26,9 @@ class OptionBinder
 
   def resolve_parser(parser = nil)
     parser || OptionParser.new do |p|
-      p.define_singleton_method(:banner) { (b = super()) !~ /\AU/ ? b : "usage: #{program_name}\n\n" }
+      p.define_singleton_method(:banner) { (b = super()) !~ /\AU/ ? b : "usage: #{program_name} [<options>]\n\n" }
       p.define_singleton_method(:version) { super() || (defined?(::VERSION) && ::VERSION) }
-      p.define_singleton_method(:help) { super() << "    -h, --help\n        --version\n\n" }
+      p.define_singleton_method(:help) { super().gsub(/(-\S+)=\[/, '\1[=') << "    -h, --help\n        --version\n\n" }
     end
   end
 
@@ -95,7 +95,7 @@ class OptionBinder
     opts, handler, bound, variable, default = *several_variants(*opts, &handler)
 
     @parser.on(*opts) do |r|
-      unless opts.include? :OPTIONAL
+      if opts.include? :REQUIRED
         a = opts.select { |o| o =~ /\A-/ }.sort_by { |o| o.length }[-1]
         @parser.abort "missing argument: #{a}=" if !r || (r.respond_to?(:empty?) && r.empty?)
       end
@@ -147,7 +147,6 @@ class OptionBinder
 
       pattern = hash[:pattern] || hash[:type]
       values = hash[:values]
-
       names = [hash[:long], hash[:longs]].flatten.map { |n| n.to_s.sub(/\A-{,2}/, '--') if n }
       names += [hash[:short], hash[:shorts]].flatten.map { |n| n.to_s.sub(/\A-{,2}/, '-') if n }
       names += [hash[:name], hash[:names]].flatten.map do |n|
@@ -157,7 +156,7 @@ class OptionBinder
         n[2] ? "--#{n}" : "-#{n}"
       end
 
-      argument = (hash[:argument].to_s if hash[:argument])
+      argument = (hash[:argument].to_s.sub(/\A\[=/, '=[') if hash[:argument])
       description = ([hash[:description]].flatten * ' ' if hash[:description])
       handler ||= hash[:handler]
       return ([style, pattern, values] + names + [argument, description]).compact, handler
@@ -173,18 +172,18 @@ class OptionBinder
       style, pattern, values, argument = nil
 
       while string.sub!(/\A(?:(?<long>--[\[\]\-\w]+[\]\w]+)?(?:(?<argument>\[?=[<(]\S+[)>]\.{,3}\]?)|\s+))/, '')
-        longs << $~[:long]
+        longs << $~[:long] if $~[:long]
+        next unless $~[:argument]
         argument = $~[:argument]
-
-        next unless argument
-
         style = argument[0] == '=' ? :REQUIRED : :OPTIONAL
         values = $~[:values].split('|') if argument =~ /\[?=\((?<values>\S*)\)\]?/
 
         if values.nil? && argument =~ /\[?=<(?<name>\S+):(?<pattern>\S+)>\]?/
           pattern = Module.const_get($~[:pattern]) rescue Regexp.new($~[:pattern])
           argument = "=<#{$~[:name]}>"
-          argument = "[#{argument}]" if style == :OPTIONAL
+          argument = "=[#{argument[1..-1]}]" if style == :OPTIONAL
+        else
+          argument.sub!(/\A\[=/, '=[')
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optbind
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavol Zbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler