xoptparse 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8ba0e138b8c1d6e68ca65d8e022ef51f3456647121207904074ffa8d53ac9f
-  data.tar.gz: e3ffc6e2caa748fadeb8b9a6f3129491d2997c8edf89780689bc6eac02c07489
+  metadata.gz: 9d6bc35d1d29eed17b83bf93ec3258e1af9efa589d18db17937f7e9c2860acc3
+  data.tar.gz: 81e91f8110396a484fb34f891e272347905cda64b52d32a8d87ca184b90e61e6
 SHA512:
-  metadata.gz: f160dfefb34a43a2b9f60ec775679e810613665edba3138857836467285eb5d8ce58c664687bd823322c619ea32a8c84ddab328b7e6a432c5f784dfffdff9727
-  data.tar.gz: '0950deea41a448199bc90aa1fb65365940fee26c3e3dd994c27d62e8e5677aaaf160e2234a91e24539ae36ecbc498f17aded45674e50e694c1ce4599c45ed1d5'
+  metadata.gz: 4093b4ca1c56032b567a187eebfcf1513acb8dfd67eb6138366505eb38c55e0b9eab11b2a488d58b67f4821367be206bc5c76cde97c8d5650519d4d72b472b78
+  data.tar.gz: 83133509376750bf9b0d30a39bc59cbfcbeca6820a5856ff4f0900ea0093e8c0e9c725b0f60ef7697c3ce94167e5f8eca67efe2b14227c490835b08a4a6b88ab

data/Gemfile.lock

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

data/lib/xoptparse.rb

@@ -67,12 +67,12 @@ class XOptionParser < ::OptionParser
     return sw if sw0.short || sw0.long
 
     sw0 = fix_arg_switch(sw0)
-    long = sw0.arg.scan(/(?:\[\s*(.*?)\s*\]|(\S+))/).flatten.compact
+    long = sw0.arg_parameters.map(&:first)
     [sw0, nil, long]
   end
 
-  def parse_arguments(argv) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    arg_sws = select { |sw| sw.is_a?(Switch::SimpleArgument) }
+  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) }
     return argv if arg_sws.empty?
 
     sws_ranges = arg_sws.map(&:ranges).flatten(1)
@@ -101,34 +101,43 @@ class XOptionParser < ::OptionParser
           conv.call(argv.shift)
         end
       end
-      sw.block.call(*a)
+      val = sw.block.call(*a)
+      setter&.call(sw.switch_name, val)
     end
 
     argv
   end
   private :parse_arguments
 
-  def parse_in_order(*args, &nonopt)
-    argv = []
+  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
     rest = if nonopt
-             super(*args, &argv.method(:<<))
+             super(argv, opts_setter, &nonopts.method(:<<))
            else
-             argv = super(*args)
+             nonopts = super(argv, opts_setter)
            end
-    parse_arguments(argv).map(&nonopt)
+    parse_arguments(nonopts, setter, opts).map(&nonopt)
     rest
   end
   private :parse_in_order
 
-  def order!(*args, **kwargs)
-    return super(*args, **kwargs) if @commands.empty?
+  def order!(*args, into: nil, **kwargs) # rubocop:disable Metrics/AbcSize
+    return super(*args, into: into, **kwargs) if @commands.empty?
 
-    argv = super(*args, **kwargs, &nil)
+    argv = super(*args, into: into, **kwargs, &nil)
     return argv if argv.empty?
 
     name = argv.shift
     sw = @commands[name]
-    return sw.block.call.send(block_given? ? :permute! : :order!, *args, **kwargs) if sw
+    if sw
+      into = into[name.to_sym] = {} if into
+      return sw.block.call.send(block_given? ? :permute! : :order!, *args, into: into, **kwargs)
+    end
 
     puts "#{program_name}:" \
          "'#{name}' is not a #{program_name} command. See '#{program_name} --help'."
@@ -148,37 +157,71 @@ class XOptionParser < ::OptionParser
   end
 
   class Switch < ::OptionParser::Switch
-    class SummarizeArgument < NoArgument
+    class SummarizeArgument < self
       undef_method :add_banner
 
-      def summarize(*args)
+      attr_reader :arg_parameters
+
+      def initialize(*)
+        super
+        @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
+
+      def summarize(*)
         original_arg = arg
-        @short = arg.scan(/\[\s*.*?\s*\]|\S+/)
+        @short = arg_parameters.map do |name, type, rest|
+          var = "#{name}#{rest ? '...' : ''}"
+          type == :req ? var : "[#{var}]"
+        end
         @arg = nil
-        res = super(*args)
+        res = super
         @arg = original_arg
         @short = nil
         res
       end
 
-      def match_nonswitch?(*args)
-        super(*args) if @pattern.is_a?(Regexp)
+      def match_nonswitch?(*)
+        super if @pattern.is_a?(Regexp)
+      end
+
+      def switch_name
+        arg_parameters.first.first
       end
     end
 
     class SimpleArgument < SummarizeArgument
       attr_reader :ranges
 
-      def initialize(*args)
-        super(*args)
-        @ranges = arg.scan(/\[\s*(.*?)\s*\]|(\S+)/).map do |opt, req|
-          (opt ? 0 : 1)..((opt || req).end_with?('...') ? nil : 1)
+      def initialize(*)
+        super
+        @ranges = arg_parameters.map do |_name, type, rest|
+          (type == :req ? 1 : 0)..(rest == :rest ? nil : 1)
         end
       end
 
       def add_banner(to)
         to << " #{arg}"
       end
+
+      def parse(arg, argv)
+        case ranges.size
+        when 0
+          super(arg, argv)
+        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
+          raise XOptionParser::InvalidOption
+        end
+      end
     end
   end
 end

data/lib/xoptparse/version.rb

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

metadata

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