xoptparse 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7394cd54a72531488fcb897fba20e2fbac39d299bed1ff2f06e38c04536050da
-  data.tar.gz: 15c8862b6f254cb26edf6e7d9aabc5b3b09603c421037e309437dc91f80ba418
+  metadata.gz: 4ba4ac7ea8acae37ac7b9a7d824d6bb1e0c71e38eefcad9d51ae2b577bd2637b
+  data.tar.gz: b46b96861f8273625d5934b06e3db2b01831015ee611a1c9a9ab6e46e8febf5e
 SHA512:
-  metadata.gz: ef48822f56f652134a67e0f86c97a40c9750286f5de3ddbcdf8f2b3f13e7351c5c07964f7538303c86811e350843935a0eb9b66c0afca926d90b5aaadd2171ad
-  data.tar.gz: 1b3b45a58ebea67193baab6351aa2403060820e0102d0126c4767c96a8ecac7eb53d407755da8c53be4a8d19d0ba802d106c3954dea945e0122fbfccfb20837d
+  metadata.gz: 694618d261b60dc6e25f319d208e6f994d86362ee561dfaf754b8174a37611fe2653c41805dc5b257d505c82e52d9801b414c8ecef6bbc28465ea7dbe15ae0c2
+  data.tar.gz: 1a91cac3019d7509b23d564e92428014cbe44dc40f7fec7db556407ec97aabc73bcfc858715cb8e3c7d3c6a67772070bd7488d60cfb810f785330cfd387f297b

data/.rubocop.yml

@@ -12,6 +12,9 @@ Metrics/AbcSize:
   Exclude:
     - test/**/*
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xoptparse (0.4.0)
+    xoptparse (0.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -52,7 +52,7 @@ DEPENDENCIES
   minitest-power_assert
   minitest-reporters
   rake (~> 12.3.3)
-  rubocop (= 0.84.0)
+  rubocop
   simplecov
   xoptparse!
 

data/lib/xoptparse.rb

@@ -78,42 +78,48 @@ class XOptionParser < ::OptionParser
   end
 
   def parse_arguments(argv, setter = nil, opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    arg_sws = select { |sw| sw.is_a?(Switch::SimpleArgument) && !opts.include?(sw.switch_name) }
+    arg_sws = select { |sw| sw.is_a?(Switch::SummarizeArgument) && !opts.include?(sw.switch_name) }
     return argv if arg_sws.empty?
 
     sws_ranges = arg_sws.map(&:ranges).flatten(1)
     req_count = sws_ranges.sum(&:begin)
-    raise MissingArgument, argv.join(' ') if argv.size < req_count
-
     opt_count = sws_ranges.sum(&:size) - sws_ranges.size
     opt_index = argv[req_count...].index { |arg| @commands.include?(arg) } unless @commands.empty?
     opt_count = [opt_count, opt_index || Float::INFINITY, argv.size - req_count].min
 
-    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 nil if opt_count.zero?
-
-          opt_count -= 1
-          callable = true
-          conv.call(argv.shift)
-        else
-          req_count -= 1
+    arg_sws.each_with_index do |sw, i|
+      if sw.is_a?(Switch::SimpleArgument)
+        callable = false
+        conv = proc do |v|
           callable = true
-          conv.call(argv.shift)
+          sw.send(:conv_arg, *sw.send(:parse_arg, v))[2]
         end
-      end
-      if callable
-        val = sw.block.call(*a)
-        setter&.call(sw.switch_name, val)
+        a = sw.ranges.map do |r|
+          raise MissingArgument if r.begin.positive? && argv.empty?
+
+          if r.end.nil?
+            rest_size = r.begin + opt_count
+            req_count -= r.begin
+            opt_count = 0
+            argv.slice!(0...rest_size).map(&conv)
+          elsif r.begin.positive?
+            req_count -= 1
+            conv.call(argv.shift)
+          elsif opt_count.positive?
+            opt_count -= 1
+            conv.call(argv.shift)
+          end
+        end
+        if callable
+          val = sw.block.call(*a)
+          setter&.call(sw.switch_name, val)
+        end
+      elsif sw.arg == argv.first
+        argv.shift
+        @command_switch = sw
+        break
+      elsif !argv.empty? && i == arg_sws.size - 1
+        raise MissingArgument
       end
     end
 
@@ -138,22 +144,15 @@ class XOptionParser < ::OptionParser
   end
   private :parse_in_order
 
-  def order!(*args, into: nil, **kwargs) # rubocop:disable Metrics/AbcSize
+  def order!(*args, into: nil, **kwargs)
     return super(*args, into: into, **kwargs) if @commands.empty?
 
+    @command_switch = nil
     argv = super(*args, into: into, **kwargs, &nil)
-    return argv if argv.empty?
-
-    name = argv.shift
-    sw = @commands[name]
-    if sw
-      into = into[name.to_sym] = {} if into
-      return sw.block.call.send(block_given? ? :permute! : :order!, *args, into: into, **kwargs)
-    end
+    return argv unless @command_switch
 
-    puts "#{program_name}:" \
-         "'#{name}' is not a #{program_name} command. See '#{program_name} --help'."
-    exit
+    into = into[@command_switch.arg.to_sym] = {} if into
+    @command_switch.block.call.send(block_given? ? :permute! : :order!, *args, into: into, **kwargs)
   end
 
   def command(name, desc = nil, *args, &block)
@@ -172,10 +171,12 @@ class XOptionParser < ::OptionParser
     class SummarizeArgument < self
       undef_method :add_banner
 
+      attr_reader :ranges
       attr_reader :arg_parameters
 
       def initialize(*)
         super
+        @ranges = []
         @arg_parameters = arg.scan(/\[\s*(.*?)\s*\]|(\S+)/).map do |opt, req|
           name = opt || req
           [name.sub(/\s*\.\.\.$/, ''), opt ? :opt : :req, name.end_with?('...') ? :rest : nil]
@@ -202,11 +203,13 @@ class XOptionParser < ::OptionParser
       def switch_name
         arg_parameters.first.first
       end
+
+      def parse(_arg, _argv)
+        raise XOptionParser::InvalidOption
+      end
     end
 
     class SimpleArgument < SummarizeArgument
-      attr_reader :ranges
-
       def initialize(*)
         super
         @ranges = arg_parameters.map do |_name, type, rest|
@@ -218,10 +221,11 @@ class XOptionParser < ::OptionParser
         to << " #{arg}"
       end
 
-      def parse(arg, argv)
+      def parse(arg, argv) # rubocop:disable Metrics/CyclomaticComplexity
         case ranges.size
         when 0
-          super(arg, argv)
+          yield(NeedlessArgument, arg) if arg
+          conv_arg(arg)
         when 1
           unless arg
             raise XOptionParser::MissingArgument if argv.empty?
@@ -231,7 +235,7 @@ class XOptionParser < ::OptionParser
           arg = [arg] if ranges.first.end.nil?
           conv_arg(*parse_arg(arg, &method(:raise)))
         else
-          raise XOptionParser::InvalidOption
+          super(arg, argv)
         end
       end
     end

data/lib/xoptparse/version.rb

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

data/xoptparse.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-power_assert'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rake', '~> 12.3.3'
-  spec.add_development_dependency 'rubocop', '0.84.0'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xoptparse
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ofk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.84.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.84.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement