optparse2 0.4.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ed6158390436ca25a3f47b01614d16ffd0cf4bca06b2f1cae376e38a947ce9
-  data.tar.gz: 8fc0ae12b3a01f0c2f12b46bd09169d248ed48cdafab694c026a63d69bfae712
+  metadata.gz: 376bbfd9fc2c5c6c0be54659a67b7348e25020e9fc127241d99572731ab3242f
+  data.tar.gz: 8e11e2b03a970cd1f1de7ef5fe546eb02e49b0c7c536ccf297bdedb4162f2238
 SHA512:
-  metadata.gz: 55041cdb12c60bfa3bdfcf1849db88eb5ca8c68f778f175084ee66dc98b838c580726039d0e2dab25a79afd4d552cb8923900c71ed95fb558b1748ef1fc26cd7
-  data.tar.gz: 2d92f8714d75f5f166c4a09ca0c2ec4447a6a0deed83ea8fc4e18d9696754cdc5409466c645d66f43492eeb1d9187c07db1adbe734bdc34d7bc51f237e600a1e
+  metadata.gz: 5f675f1b0ea86836d55639bbf4a97721b686a570a6a4c3e1b57995515f1138d925dd07c6eae266dbbedb22645b124841a33e0770d9523d27fbdeb45b5b2adc15
+  data.tar.gz: f8121ecfff0b7e7bacde7649729cdf13f828b63d146f838749184ee362839157338a2939813bad5737c0c85ba1268bb0985baebef0c18330bc6f435cf99b977a

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -121,7 +121,7 @@ class OptParse2
 
     result = super(argv, into: already_done, **keywords, &non_options.method(:<<))
 
-    argv2 = non_options.each_with_index.flat_map { ["--*-positional-#{_2}", _1] }
+    argv2 = (non_options + result).each_with_index.flat_map { ["--*-positional-#{_2}", _1] }
 
     old_raise, self.raise_unknown = self.raise_unknown, false
     begin
@@ -140,8 +140,9 @@ class OptParse2
         raise ParseError, "at least #{@rest[:required]} trailing arguments required (only got #{argv2.length})", caller(1)
       end
 
-      argv2 = @rest[:block].call(argv2)
-      into[@rest[:key]] = argv2 if @rest[:key]
+      argv2 = @rest[:block] ? @rest[:block].call(argv2) : argv2
+      into[@rest[:key]] = argv2.dup if @rest[:key]
+      argv2.clear
     elsif !argv2.empty? && self.raise_unknown && !@positional.empty?
       raise ParseError, "got unexpected positional argument: #{argv2.first}", caller(1)
     else
@@ -225,7 +226,7 @@ class OptParse2
     @positional.append sw
   end
 
-  def rest(name, *description, key: name, required: 0, &block)
+  def rest(name, *description, key: name.to_s.tr(' ', '-').to_sym, required: 0, &block)
     title = "#{'[' if required.zero?}#{name} ...#{']' if required.zero?}"
     banner.concat " #{title}" if pos_set_banner
     title += " (#{required} arg minimum)" if required > 0
@@ -245,7 +246,7 @@ require_relative 'optparse2/pathname'
 
 # $* << '-tFOO' << '--no-cache' << '-x'
 # $*.replace %w[123 lol what -t10 is up here]
-$*.replace %w[1 -t3 b -h ]
+$*.replace %w[1 -t3 bb lol what -- is up]
 
 OPTS={}
 OptParse2.new do |op|
@@ -254,7 +255,7 @@ OptParse2.new do |op|
   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', 'pretty coo', required: 1 do it.join ' ' end
-  op.parse! into: OPTS
+  op.rest 'branch name', 'Message to submit', 'pretty coo', required: 1 do it.join ' ' end
+  p 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.4.4
+  version: 0.5.1
 platform: ruby
 authors:
 - SamW