optparse2 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c990adf931ecaaf320100ceaafd82e2af9b12ebdd20f5643fa287a5de33fb693
-  data.tar.gz: b92e798fe76d863dc51f9c7cc67411e0c7d17d1655ea500b1713b8401c57dee3
+  metadata.gz: d4f4b99d85e717967ed1fa272d7b2084db9c09ee1d4872fa7927d5a7bf0c6104
+  data.tar.gz: cb88e6660fa66b062089db1bb857ef9bea459581b700fc63e60957b964c852dc
 SHA512:
-  metadata.gz: 18c21e34d23152d8c4d74bcf816ca23ab9c3595e99aed36f7f1f333ba48a6e7a65d648ef2e69107921ea2e91a0490d5de6bcf943d9605f080c4491f5917da4d5
-  data.tar.gz: 98e247c8f9d0a29e5fda3e9d03fcd96d23049265ab576bc14b7ad355c8acfd025af610b6b181b4a46c419d06b96dbe25d90a9ee31416570df3e507e6641d44f1
+  metadata.gz: 0717d580106c2a3a084f1c59718e5399103008c932249c4752c4b9d2f9c9c3114d6f1ef62f72d639b3758a7cfd517907b28b4782d21f7ba55c26b3e7804356f8
+  data.tar.gz: 97d4a6da7c401a6343ee931039039800b33aa6a1f5bdb08bae961c329e928e4f4ade8906cfa4a31cba353c0a6a4cd129e08a37ae0ecfd1ff484f84da116af34e

data/lib/optparse2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class OptParse2
-  VERSION = "0.2.3"
+  VERSION = "0.4.1"
 end

data/lib/optparse2.rb

@@ -9,8 +9,17 @@ require_relative "optparse2/fixes"
 # require_relative "optparse2/helpers"
 
 class OptParse2
+  class << self
+    attr_accessor :pos_set_banner
+  end
+  self.pos_set_banner = true
+
   def initialize(...)
     @defaults = Set[]
+    @positional = []
+    @required = Set[]
+    @rest = nil
+    self.pos_set_banner = OptParse2.pos_set_banner
     super
   end
 
@@ -58,7 +67,8 @@ class OptParse2
   end
 
   # Update `make_switch` to support OptParse2's keyword arguments
-  def make_switch(opts, block, hidden: false, key: nil, default: nodefault=true, default_description: nil)
+  def make_switch(opts, block, hidden: false, key: nil, default: nodefault=true, default_description: nil,
+    required: false)
     sw, *rest = super(opts, block)
 
     sw.extend Helpers
@@ -74,6 +84,13 @@ class OptParse2
       not_style.set_hidden if hidden
     end
 
+    if required
+      unless nodefault
+        raise ArgumentError, "cannot supply both a default with required: true"
+      end
+      @required << sw.switch_name
+    end
+
     if nodefault && default_description != nil
       raise ArgumentError, "default: not supplied, but default_description: given"
     elsif not nodefault
@@ -100,7 +117,27 @@ class OptParse2
       into[key] = value
     end
 
-    result = super(argv, into: already_done, **keywords, &nonopt)
+    non_options = []
+
+    result = super(argv, into: already_done, **keywords, &non_options.method(:<<))
+
+    argv2 = non_options.each_with_index.flat_map { ["--*-positional-#{_2}", _1] }
+
+    old_raise, self.raise_unknown = self.raise_unknown, false
+    begin
+      super(argv2, into: already_done, **keywords)
+    rescue
+      self.raise_unknown = old_raise
+    end
+
+    argv2 = argv2.each_slice(2).map { _2 }
+
+    if @rest
+      argv2 = @rest[:block].call(argv2)
+      into[@rest[:key]] = argv2 if @rest[:key]
+    else
+      argv2.each(&nonopt)
+    end
 
     @defaults.each do |sw|
       key = sw.switch_name.to_sym
@@ -108,6 +145,98 @@ class OptParse2
       into[key] = sw.default()
     end
 
-    result
+    @required.each do |key|
+      raise ParseError, "required option '#{key}' not provided" unless already_done.key? key.to_sym
+    end
+
+    argv2
+  end
+
+  module Positional
+    attr_accessor :name
+
+    # Essentially directly copied from `OptParse::Switch`.summarize, except with custom `left`
+    def summarize(sdone = {}, ldone = {}, width = 1, max = width - 1, indent = "")
+      left = ["#{name}"]
+      sdone[name] = true
+      ldone[name] = true
+      right = desc.dup
+
+      mlen = left.collect {|ss| ss.length}.max.to_i
+      while mlen > width and l = left.shift
+        mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen
+        if l.length < width and (r = right[0]) and !r.empty?
+          l = l.to_s.ljust(width) + ' ' + r
+          right.shift
+        end
+        yield(indent + l)
+      end
+
+      while begin l = left.shift; r = right.shift; l or r end
+        l = l.to_s.ljust(width) + ' ' + r if r and !r.empty?
+        yield(indent + l)
+      end
+
+      self
+    end
+
+    # def match_nonswitch?(arg)
+    #   p ["switch is: #{arg}"]
+
+
+    #   begin
+    #     opt, cb, val = parse(arg, []) {|*exc| raise(*exc)}
+    #     val = $op.send :callback!, cb, 1, val if cb
+    #     $op.send :callback!, $setter, 2, switch_name, val if $setter
+    #   rescue OptParse::ParseError
+    #     raise $!.set_option(arg, rest)
+    #   end
+    #   p "ok!"
+    #   throw :prune
+
+    #   # p arg
+    # end
+
+    # def parse(*argv, **keywords)
+    #   p argv, keywords
+    #   # p [argv, keywords]
+    #   # exit 1
+    # end
+  end
+
+  attr_accessor :pos_set_banner
+  def pos(name, *a, key: name, **b, &block)
+    banner.concat " #{name}" if pos_set_banner
+
+    sw, *rest = make_switch ["--*-positional-#{@positional.length} #{name}", *a], block, key:, **b
+    sw.extend Positional
+    sw.name = name
+    sw.switch_name = key
+    top.append(sw, *rest)
+    @positional.append sw
   end
+
+  def rest(name, description, &block)
+    @rest = { key: name.to_sym, block: }
+  end
+end
+
+__END__
+return unless $0 == __FILE__
+require_relative 'optparse2/pathname'
+
+# $* << '-tFOO' << '--no-cache' << '-x'
+# $*.replace %w[123 lol what -t10 is up here]
+$*.replace %w[]
+
+OPTS={}
+OptParse2.new do |op|
+  $op = op
+  op.on '-t', '--timeout=FOO', Array,required: true
+  op.pos 'file', Integer, 'sets the file name', 'is also pretty cool', 1..1000, required: true do it * 2 end
+  op.pos '[start[-end]]', 'things to do', key: 'line', default: 123
+
+  op.rest 'message', 'Message to submit' do it.join ' ' end
+  op.parse! into: OPTS
+  p ["finish: ", OPTS, $*]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.1
 platform: ruby
 authors:
 - SamW
@@ -20,7 +20,6 @@ files:
 - Rakefile
 - lib/optparse2.rb
 - lib/optparse2/fixes.rb
-- lib/optparse2/globals.rb
 - lib/optparse2/pathname.rb
 - lib/optparse2/version.rb
 - sig/optparse2.rbs

data/lib/optparse2/globals.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module OptParse2::Globals
-  def self.[]=(key, value)
-    key = key.to_s.gsub('-', '_')
-
-    unless key.match? /\A[[:alpha:]_][[:alnum:]_]*\z/
-      raise "invalid global name: #{key}"
-    end
-
-    eval "$#{key} = value"
-  end
-end