optparse2 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96e00ac7534cbe1b11eff82f027568f5b37339cb562dd2aefc5640134ee98f7f
-  data.tar.gz: 043042d6dd8c2c207da95355d317a6df45c758c48d98f444fc1ba5b7f29b82e1
+  metadata.gz: d3dff76909d0005ee325d16f79bfa00b18d26a65b3b06b018eef33713e40d250
+  data.tar.gz: 14733f7d9258908dc1df030b475937590089d1f6eb45f0a99f7df8dbcc6a0ded
 SHA512:
-  metadata.gz: bafcec132c0791ce7121c0b3e3d6c290e239ab78a687e799eba07fd3299db17fbfc96a7b14fd555fa5ecf3f01cb841e02dc3e6f2829e4e84edeecd3226258622
-  data.tar.gz: cec1c603fd5dda235644bd1fb3298dd9a0e57e1f91b45cb762c9bc06b809298656eee7cd71d234257fb316209cfc0b860f4f070a067a06968e0afc2024515577
+  metadata.gz: e715049dd9d3d3089c6d7ae994666b497eab0436927fe9a98114fcf1d46456798284fb5402fde4edf34ff2dcaf95f5856067fcbcc313fe20ccc46cc0e78635d1
+  data.tar.gz: 32fc2f6d56246b215845adf065103a60be82d5daf78f3d09d6ae64c1a100664a7521cfdfbc2c362047df74933567f59fe97caa839fce054e2baec97d943e863d

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -6,7 +6,6 @@ OptionParser2 = OptParse2 # Alias
 
 require_relative "optparse2/version"
 require_relative "optparse2/fixes"
-# require_relative "optparse2/helpers"
 
 class OptParse2
   class << self
@@ -29,20 +28,18 @@ class OptParse2
       def self.summarize(*) end
     end
 
-    def switch_name=(val)
-      # binding.irb
-      @switch_name = val
-    end
+    attr_writer :switch_name
+    def switch_name; defined?(@switch_name) ? @switch_name : super end
 
-    def set_block_name_because_of_switch_name
+    def set_switch_name_possibly_block_value
       if @block.nil? && @arg.nil?
-        q = @switch_name.to_sym
+        q = switch_name.to_sym
         @block = proc { q }
       end
+
+      self.switch_name = val
     end
 
-    # attr_writer :switch_name
-    def switch_name; defined?(@switch_name) ? @switch_name : super end
 
     # requires `switch_name`, `desc` to work
     def set_default(value, description)
@@ -73,8 +70,7 @@ class OptParse2
 
     sw.extend Helpers
     if key
-      sw.switch_name = key
-      sw.set_block_name_because_of_switch_name
+      sw.set_switch_name_possibly_block_value key
     end
     sw.set_hidden if hidden
 
@@ -121,7 +117,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
@@ -141,7 +137,8 @@ class OptParse2
       end
 
       argv2 = @rest[:block] ? @rest[:block].call(argv2) : argv2
-      into[@rest[:key]] = argv2 if @rest[:key]
+      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
@@ -238,23 +235,3 @@ class OptParse2
     @rest = { name:, key:, required: required || 0, 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[1 -t3 b lol what is up]
-
-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 'branch name', 'Message to submit', 'pretty coo', required: 1 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.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - SamW