xoptparse 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d6bc35d1d29eed17b83bf93ec3258e1af9efa589d18db17937f7e9c2860acc3
-  data.tar.gz: 81e91f8110396a484fb34f891e272347905cda64b52d32a8d87ca184b90e61e6
+  metadata.gz: 7394cd54a72531488fcb897fba20e2fbac39d299bed1ff2f06e38c04536050da
+  data.tar.gz: 15c8862b6f254cb26edf6e7d9aabc5b3b09603c421037e309437dc91f80ba418
 SHA512:
-  metadata.gz: 4093b4ca1c56032b567a187eebfcf1513acb8dfd67eb6138366505eb38c55e0b9eab11b2a488d58b67f4821367be206bc5c76cde97c8d5650519d4d72b472b78
-  data.tar.gz: 83133509376750bf9b0d30a39bc59cbfcbeca6820a5856ff4f0900ea0093e8c0e9c725b0f60ef7697c3ce94167e5f8eca67efe2b14227c490835b08a4a6b88ab
+  metadata.gz: ef48822f56f652134a67e0f86c97a40c9750286f5de3ddbcdf8f2b3f13e7351c5c07964f7538303c86811e350843935a0eb9b66c0afca926d90b5aaadd2171ad
+  data.tar.gz: 1b3b45a58ebea67193baab6351aa2403060820e0102d0126c4767c96a8ecac7eb53d407755da8c53be4a8d19d0ba802d106c3954dea945e0122fbfccfb20837d

data/Gemfile.lock

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

data/lib/xoptparse.rb

@@ -55,18 +55,24 @@ class XOptionParser < ::OptionParser
   end
   private :search_arg_switch_atype
 
-  def fix_arg_switch(sw0)
-    pattern, conv = search_arg_switch_atype(sw0)
-    Switch::SimpleArgument.new(pattern, conv, nil, nil, sw0.desc[0], sw0.desc[1..], sw0.block)
+  def fix_arg_switch(sw0) # rubocop:disable Metrics/AbcSize
+    if !(sw0.short || sw0.long)
+      pattern, conv = search_arg_switch_atype(sw0)
+      Switch::SimpleArgument.new(pattern, conv, nil, nil, sw0.desc[0], sw0.desc[1..], sw0.block)
+    elsif sw0.is_a?(Switch::PlacedArgument) && sw0.long.size == 1 && /^--\[no-\]/ =~ sw0.long.first
+      args = [sw0.pattern, sw0.conv, sw0.short, sw0.long, sw0.arg, sw0.desc, sw0.block]
+      Switch::FlagArgument.new(*args)
+    else
+      sw0
+    end
   end
   private :fix_arg_switch
 
   def make_switch(opts, block = nil)
     sw = super(opts, block || proc {})
-    sw0 = sw[0]
+    sw0 = sw[0] = fix_arg_switch(sw[0])
     return sw if sw0.short || sw0.long
 
-    sw0 = fix_arg_switch(sw0)
     long = sw0.arg_parameters.map(&:first)
     [sw0, nil, long]
   end
@@ -85,24 +91,30 @@ class XOptionParser < ::OptionParser
 
     arg_sws.each do |sw|
       conv = proc { |v| sw.send(:conv_arg, *sw.send(:parse_arg, v))[2] }
+      callable = false
       a = sw.ranges.map do |r|
         if r.end.nil?
           rest_size = r.begin + opt_count
           req_count -= r.begin
           opt_count = 0
+          callable = true if rest_size.positive?
           argv.slice!(0...rest_size).map(&conv)
         elsif r.begin.zero?
-          next conv.call(nil) if opt_count.zero?
+          next nil if opt_count.zero?
 
           opt_count -= 1
+          callable = true
           conv.call(argv.shift)
         else
           req_count -= 1
+          callable = true
           conv.call(argv.shift)
         end
       end
-      val = sw.block.call(*a)
-      setter&.call(sw.switch_name, val)
+      if callable
+        val = sw.block.call(*a)
+        setter&.call(sw.switch_name, val)
+      end
     end
 
     argv
@@ -223,5 +235,15 @@ class XOptionParser < ::OptionParser
         end
       end
     end
+
+    class FlagArgument < PlacedArgument
+      def parse(arg, argv, &error)
+        if !arg && (argv.empty? || /\A-/ =~ argv[0])
+          conv_arg(arg)
+        else
+          super(arg, argv, &error)
+        end
+      end
+    end
   end
 end

data/lib/xoptparse/version.rb

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

metadata

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