xoptparse 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba4ac7ea8acae37ac7b9a7d824d6bb1e0c71e38eefcad9d51ae2b577bd2637b
-  data.tar.gz: b46b96861f8273625d5934b06e3db2b01831015ee611a1c9a9ab6e46e8febf5e
+  metadata.gz: b67b857f7260f74d4f14c343279a3bb75002061470b49473206c95ad5cd38816
+  data.tar.gz: 3d7056c4e16be3b0f6b71cb85cacc39481ee9523ce427840dc960126c3ddfbba
 SHA512:
-  metadata.gz: 694618d261b60dc6e25f319d208e6f994d86362ee561dfaf754b8174a37611fe2653c41805dc5b257d505c82e52d9801b414c8ecef6bbc28465ea7dbe15ae0c2
-  data.tar.gz: 1a91cac3019d7509b23d564e92428014cbe44dc40f7fec7db556407ec97aabc73bcfc858715cb8e3c7d3c6a67772070bd7488d60cfb810f785330cfd387f297b
+  metadata.gz: a6c00977cccfead1e09cdde9b40592a7a5ef23777c516fbd65332f2a08a50a42f94bf669c4bc89f42e5c84ed427fe61dae5544cc2c33e3c0e8db3f4147b0505c
+  data.tar.gz: 3f63f73775990580eb2496a7b99975d94f7d5f773acc3ae4c2cdaae1acaa5930cd24212d555ed1f59229853e2d47f0d8c7bd10368351c306ca21c0e3e9fac8b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xoptparse (0.5.0)
+    xoptparse (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/xoptparse.rb

@@ -114,7 +114,7 @@ class XOptionParser < ::OptionParser
           val = sw.block.call(*a)
           setter&.call(sw.switch_name, val)
         end
-      elsif sw.arg == argv.first
+      elsif sw.pattern =~ argv.first
         argv.shift
         @command_switch = sw
         break
@@ -156,14 +156,16 @@ class XOptionParser < ::OptionParser
   end
 
   def command(name, desc = nil, *args, &block)
-    sw0 = Switch::SummarizeArgument.new(nil, nil, nil, nil, name.to_s, desc ? [desc] : [], nil) do
+    name = name.to_s
+    pattern = /^#{name.gsub('_', '[-_]?')}$/i
+    sw0 = Switch::SummarizeArgument.new(pattern, nil, nil, nil, name, desc ? [desc] : [], nil) do
       self.class.new(desc, *args) do |opt|
         opt.program_name = "#{program_name} #{name}"
         block&.call(opt)
       end
     end
     top.append(sw0, nil, [sw0.arg])
-    @commands[name.to_s] = sw0
+    @commands[name] = sw0
     nil
   end
 
@@ -242,11 +244,11 @@ class XOptionParser < ::OptionParser
 
     class FlagArgument < PlacedArgument
       def parse(arg, argv, &error)
-        if !arg && (argv.empty? || /\A-/ =~ argv[0])
-          conv_arg(arg)
-        else
-          super(arg, argv, &error)
+        super(arg, argv, &error).tap do |val|
+          raise OptionParser::InvalidArgument if val[0].nil? && val[2].nil?
         end
+      rescue OptionParser::InvalidArgument
+        conv_arg(arg)
       end
     end
   end

data/lib/xoptparse/version.rb

@@ -3,5 +3,5 @@
 require 'optparse'
 
 class XOptionParser < ::OptionParser
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xoptparse
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ofk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler