xoptparse 0.1.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4581fc5af988d4643c8cadc47f9d685c11bfc93c9c7e467136eb521d4926338
-  data.tar.gz: 7a126c2f9f468d61fc7bc72cdc62d6694f78b8505c0d937a54c9731340c6b5cb
+  metadata.gz: b67b857f7260f74d4f14c343279a3bb75002061470b49473206c95ad5cd38816
+  data.tar.gz: 3d7056c4e16be3b0f6b71cb85cacc39481ee9523ce427840dc960126c3ddfbba
 SHA512:
-  metadata.gz: b3e8e688e2e5499d38dbecd687526d9b8fd9b0f47ce2b2dd2244518f8bd0917a8dfb22a4f49e02b42de7e8bc613d9b8add4dbd77738491b48ae792fb82bfa655
-  data.tar.gz: 12a596b13d62628cca1b31fcb92eef894673a0bb2487dd2624075ae498fe597f3d62e8094cce5149b91a02a3b12036aabf107c5d69eb408f2e3e5d1344a7892e
+  metadata.gz: a6c00977cccfead1e09cdde9b40592a7a5ef23777c516fbd65332f2a08a50a42f94bf669c4bc89f42e5c84ed427fe61dae5544cc2c33e3c0e8db3f4147b0505c
+  data.tar.gz: 3f63f73775990580eb2496a7b99975d94f7d5f773acc3ae4c2cdaae1acaa5930cd24212d555ed1f59229853e2d47f0d8c7bd10368351c306ca21c0e3e9fac8b1

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.1.0)
+    xoptparse (0.6.1)
 
 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

@@ -4,108 +4,45 @@ require 'xoptparse/version'
 require 'optparse'
 
 class XOptionParser < ::OptionParser
-  class << self
-    def valid_arg_switch_ranges?(ranges)
-      ranges.inject(0) do |pt, r| # prev_type = req: 0, opt: 1, rest: 2, after_req: 3
-        t = r.end.nil? ? 2 : 1 - r.begin
-        next pt.zero? ? 0 : 3 if t.zero?
-        next t if pt < 2 && pt <= t
-
-        return false
-      end
-      true
-    end
-
-    def calc_arg_switch_ranges_counts(ranges)
-      req_count = 0
-      opt_count = 0
-      rest_req_count = nil
-      last_req_count = 0
-      ranges.each do |r|
-        if r.end.nil?
-          rest_req_count = r.begin
-        elsif r.begin.zero?
-          opt_count += 1
-        elsif opt_count.positive? || rest_req_count
-          last_req_count += 1
-        else
-          req_count += 1
-        end
-      end
-      [req_count, opt_count, rest_req_count, last_req_count]
-    end
-  end
-
-  attr_reader :description
-
-  def initialize(description = nil, *args)
+  def initialize(description = nil, *args, &block)
     @commands = {}
-    @arg_stack = [[], []]
-    @description = description
     @banner_usage = 'Usage: '
     @banner_options = '[options]'
     @banner_command = '<command>'
-    super(nil, *args)
+    super(nil, *args) do |opt|
+      if description
+        opt.separator ''
+        opt.separator description
+      end
+      block&.call(opt)
+    end
   end
 
+  def select(*args, &block)
+    Enumerator.new do |y|
+      visit(:each_option) { |el| y << el }
+    end.select(*args, &block)
+  end
+  private :select
+
   def no_options
-    visit(:summarize, {}, {}) { return false }
-    true
+    select { |sw| sw.is_a?(::OptionParser::Switch) }.all? { |sw| !(sw.short || sw.long) }
   end
   private :no_options
 
-  def banner # rubocop:disable Metrics/AbcSize
+  def banner
     return @banner if @banner
 
     banner = +"#{@banner_usage}#{program_name}"
     banner << " #{@banner_options}" unless no_options
     visit(:add_banner, banner)
     banner << " #{@banner_command}" unless @commands.empty?
-    @arg_stack.flatten(1).each do |sw|
-      banner << " #{sw.short.first}"
-    end
-    banner << "\n\n#{description}" if description
 
     banner
   end
 
-  def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    nl = "\n"
-    blk ||= proc { |l| to << (l.index(nl, -1) ? l : l + nl) }
-
-    no_opt = @arg_stack.flatten(1).empty? && no_options
-    blk.call("\nOptions:") if to.is_a?(String) && !no_opt
-
-    res = super(to, width, max, indent, &blk)
-    @arg_stack.flatten(1).each do |sw|
-      sw.summarize({}, {}, width, max, indent, &blk)
-    end
-
-    unless @commands.empty?
-      blk.call("\nCommands:") if to.is_a?(String)
-      @commands.each do |name, command|
-        sw = Switch::NoArgument.new(nil, nil, [name], nil, nil, command[1] ? [command[1]] : [], nil)
-        sw.summarize({}, {}, width, max, indent, &blk)
-      end
-    end
-
-    res
-  end
-
-  def define_opt_switch_values(target, swvs)
-    case target
-    when :tail
-      base.append(*swvs)
-    when :head
-      top.prepend(*swvs)
-    else
-      top.append(*swvs)
-    end
-  end
-  private :define_opt_switch_values
-
   def search_arg_switch_atype(sw0)
-    @stack.reverse_each do |el|
+    visit(:tap) do |el|
       el.atype.each do |klass, atype|
         next unless atype[1] == sw0.conv
         return [nil, nil] if klass == Object
@@ -119,149 +56,200 @@ class XOptionParser < ::OptionParser
   private :search_arg_switch_atype
 
   def fix_arg_switch(sw0) # rubocop:disable Metrics/AbcSize
-    pattern, conv = search_arg_switch_atype(sw0)
-    sw0.instance_variable_set(:@pattern, pattern)
-    sw0.instance_variable_set(:@conv, conv)
-    sw0.instance_variable_set(:@short, [sw0.desc.shift])
-
-    # arg pattern example:
-    # * req req => 1..1, 1..1
-    # * req [opt] => 1..1, 0..1
-    # * req... => 1..nil
-    # * [opt...] => 0..nil
-    # * req [opt] req... => 1..1, 0..1, 1..nil
-    # * req [opt...] => 1..1, 0..nil
-    # * req [opt...] req => 1..1, 0..nil, 1..1
-    ranges = sw0.short.first.scan(/(?:\[\s*(.*?)\s*\]|(\S+))/).map do |opt, req|
-      (opt ? 0 : 1)..((opt || req).end_with?('...') ? nil : 1)
-    end
-    unless self.class.valid_arg_switch_ranges?(ranges)
-      raise ArgumentError, "unsupported argument format: #{sw0.short.first.inspect}"
+    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
-
-    sw0.instance_variable_set(:@ranges, ranges)
-    sw0.define_singleton_method(:ranges) { @ranges }
-    sw0
   end
   private :fix_arg_switch
 
-  def valid_arg_switch(sw0)
-    ranges = @arg_stack.flatten(1).map(&:ranges).flatten(1)
-    unless self.class.valid_arg_switch_ranges?(ranges)
-      raise ArgumentError, "unsupported argument format: #{sw0.short.first.inspect}"
-    end
+  def make_switch(opts, block = nil)
+    sw = super(opts, block || proc {})
+    sw0 = sw[0] = fix_arg_switch(sw[0])
+    return sw if sw0.short || sw0.long
 
-    sw0
+    long = sw0.arg_parameters.map(&:first)
+    [sw0, nil, long]
   end
-  private :valid_arg_switch
-
-  def define_arg_switch(target, sw0)
-    case target
-    when :tail
-      @arg_stack[1].append(sw0)
-    when :head
-      @arg_stack[0].prepend(sw0)
-    else
-      @arg_stack[0].append(sw0)
+
+  def parse_arguments(argv, setter = nil, opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    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)
+    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_with_index do |sw, i|
+      if sw.is_a?(Switch::SimpleArgument)
+        callable = false
+        conv = proc do |v|
+          callable = true
+          sw.send(:conv_arg, *sw.send(:parse_arg, v))[2]
+        end
+        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.pattern =~ argv.first
+        argv.shift
+        @command_switch = sw
+        break
+      elsif !argv.empty? && i == arg_sws.size - 1
+        raise MissingArgument
+      end
     end
 
-    valid_arg_switch(sw0)
+    argv
   end
-  private :define_arg_switch
+  private :parse_arguments
 
-  def define_at(target, *opts, &block)
-    sw = make_switch(opts, block || proc {})
-    sw0 = sw[0]
-    if sw0.short || sw0.long
-      define_opt_switch_values(target, sw)
-    else
-      sw0 = fix_arg_switch(sw0)
-      define_arg_switch(target, sw0)
+  def parse_in_order(argv = default_argv, setter = nil, &nonopt)
+    nonopts = []
+    opts = {}
+    opts_setter = proc do |name, val|
+      opts[name] = true
+      setter&.call(name, val)
     end
-    sw0
+    rest = if nonopt
+             super(argv, opts_setter, &nonopts.method(:<<))
+           else
+             nonopts = super(argv, opts_setter)
+           end
+    parse_arguments(nonopts, setter, opts).map(&nonopt)
+    rest
   end
-  private :define_at
+  private :parse_in_order
 
-  def define(*args, &block)
-    define_at(:body, *args, &block)
-  end
-  alias def_option define
+  def order!(*args, into: nil, **kwargs)
+    return super(*args, into: into, **kwargs) if @commands.empty?
 
-  def define_head(*args, &block)
-    define_at(:head, *args, &block)
-  end
-  alias def_head_option define_head
+    @command_switch = nil
+    argv = super(*args, into: into, **kwargs, &nil)
+    return argv unless @command_switch
 
-  def define_tail(*args, &block)
-    define_at(:tail, *args, &block)
+    into = into[@command_switch.arg.to_sym] = {} if into
+    @command_switch.block.call.send(block_given? ? :permute! : :order!, *args, into: into, **kwargs)
   end
-  alias def_tail_option define_tail
 
-  def parse_arguments(original_argv) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    arg_sws = @arg_stack.flatten(1)
-    return original_argv if arg_sws.empty?
-
-    req_count, opt_count, rest_req_count, last_req_count =
-      self.class.calc_arg_switch_ranges_counts(arg_sws.map(&:ranges).flatten(1))
+  def command(name, desc = nil, *args, &block)
+    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] = sw0
+    nil
+  end
 
-    argv_min = req_count + last_req_count + (rest_req_count || 0)
-    raise MissingArgument, original_argv.join(' ').to_s if original_argv.size < argv_min
+  class Switch < ::OptionParser::Switch
+    class SummarizeArgument < self
+      undef_method :add_banner
 
-    argv_max = rest_req_count ? nil : argv_min + opt_count
-    argv = original_argv.slice!(0...argv_max)
+      attr_reader :ranges
+      attr_reader :arg_parameters
 
-    opt_size = [argv.size - argv_min, opt_count].min
-    req_argv = argv[0...req_count] + argv[(argv.size - last_req_count)...argv.size]
-    opt_argv = argv[req_count...(req_count + opt_size)] # + ([nil] * (opt_count - opt_size))
-    rest_argv = argv[(req_count + opt_size)...(argv.size - last_req_count)]
+      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]
+        end
+      end
 
-    arg_sws.each do |sw|
-      conv = proc { |v| sw.send(:conv_arg, *sw.send(:parse_arg, v))[2] }
-      a = sw.ranges.map do |r|
-        if r.end.nil?
-          rest_argv.map(&conv)
-        elsif r.begin.zero?
-          conv.call(opt_argv.shift)
-        else
-          conv.call(req_argv.shift)
+      def summarize(*)
+        original_arg = arg
+        @short = arg_parameters.map do |name, type, rest|
+          var = "#{name}#{rest ? '...' : ''}"
+          type == :req ? var : "[#{var}]"
         end
+        @arg = nil
+        res = super
+        @arg = original_arg
+        @short = nil
+        res
       end
-      sw.block.call(*a)
-    end
 
-    original_argv
-  end
-  private :parse_arguments
+      def match_nonswitch?(*)
+        super if @pattern.is_a?(Regexp)
+      end
 
-  def order!(*args, **kwargs) # rubocop:disable Metrics/AbcSize
-    if @commands.empty?
-      argv = super(*args, **kwargs)
-      return block_given? ? argv : parse_arguments(argv)
-    end
+      def switch_name
+        arg_parameters.first.first
+      end
 
-    argv = super(*args, **kwargs) { |a| throw :terminate, a }
-    return argv if argv.empty?
+      def parse(_arg, _argv)
+        raise XOptionParser::InvalidOption
+      end
+    end
 
-    name = argv.shift
-    cmd = @commands[name]
-    return cmd.first.call.send(block_given? ? :permute! : :order!, *args, **kwargs) if cmd
+    class SimpleArgument < SummarizeArgument
+      def initialize(*)
+        super
+        @ranges = arg_parameters.map do |_name, type, rest|
+          (type == :req ? 1 : 0)..(rest == :rest ? nil : 1)
+        end
+      end
 
-    puts "#{program_name}:" \
-         "'#{name}' is not a #{program_name} command. See '#{program_name} --help'."
-    exit
-  end
+      def add_banner(to)
+        to << " #{arg}"
+      end
 
-  def permute!(*args, **kwargs)
-    parse_arguments(super(*args, **kwargs))
-  end
+      def parse(arg, argv) # rubocop:disable Metrics/CyclomaticComplexity
+        case ranges.size
+        when 0
+          yield(NeedlessArgument, arg) if arg
+          conv_arg(arg)
+        when 1
+          unless arg
+            raise XOptionParser::MissingArgument if argv.empty?
+
+            arg = argv.shift
+          end
+          arg = [arg] if ranges.first.end.nil?
+          conv_arg(*parse_arg(arg, &method(:raise)))
+        else
+          super(arg, argv)
+        end
+      end
+    end
 
-  def command(name, desc = nil, *args, &block)
-    @commands[name.to_s] = [proc do
-      self.class.new(desc, *args) do |opt|
-        opt.program_name = "#{program_name} #{name}"
-        block.call(opt) if block
+    class FlagArgument < PlacedArgument
+      def parse(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, desc]
-    nil
+    end
   end
 end

data/lib/xoptparse/version.rb

@@ -3,5 +3,5 @@
 require 'optparse'
 
 class XOptionParser < ::OptionParser
-  VERSION = '0.1.0'
+  VERSION = '0.6.1'
 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.1.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ofk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-08-18 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