optparse2 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b73eda58e3715e16d45898c5d4e22386a23ba2363d0708c02ea336aec51a631
-  data.tar.gz: 777192092c696ec69bd6199fbcbd09819468dc0b06541268fa8d1a1ba4b4e389
+  metadata.gz: b99d0120a660e1c0831e8bb7498a7628f2e5e77bef266540ffdb7022120190e0
+  data.tar.gz: 7a9e744ba67a2f23e0a69fde19f30807867ac259902cbaeff477c5b64b3c3627
 SHA512:
-  metadata.gz: c31c01a23b2d0b7020cc004d6a4dda0f24ed2dfe18464a5f8f71249502cedd425e4cb2bb341d4974e733b7e1e721b9f421e49ee022009780c3d512216df220fb
-  data.tar.gz: e0d55f1dc1a4743a3b7d3e763272791d30895e89fcbc60ebab3554bce3f0fa1dc3dcbd0a40cef3248875d32b8d1c9da507c773e4e41e33c02065af0439e9676f
+  metadata.gz: f08a3c93c23ca10eb994e63317726c2c2b13407e7b80bdf1cedd095c9066679ac1c8d552c3691f3b87e9596c6c147def64a605a29794388d29766da3a5ccb4e4
+  data.tar.gz: 40f819a15e6f05be7dd1e0ce72ac264492405415386840fad30543ef277ff2e93b048e7963693ec682b82bc410e30406d5a85c08a551f2337bcc87d4f3c68684

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -13,11 +13,15 @@ class OptParse2
   end
   self.pos_set_banner = true
 
+  attr_reader :into
+
   def initialize(...)
     @defaults = Set[]
     @positional = []
     @required = Set[]
     @rest = nil
+    @into = nil
+    @group = nil
     self.pos_set_banner = OptParse2.pos_set_banner
     super
   end
@@ -64,7 +68,7 @@ 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: @group, default: nodefault=true, default_description: nil,
     required: false)
     sw, *rest = super(opts, block)
 
@@ -102,6 +106,17 @@ class OptParse2
     on_tail("\n" + msg)
   end
 
+  def group(name, default: nodefault=true)
+    old_group, @group = @group, name
+    yield
+    if !nodefault && !@defaults.any? { |x| x.switch_name.to_sym == name }
+      (orig_default = default; default = proc { orig_default }) unless default.respond_to?(:call)
+      @defaults << Struct.new(:switch_name, :default_){ def default = default_.() }.new(name, default) # TODO: This should probably be extracted out into a class lol
+    end
+  ensure
+    @group = old_group
+  end
+
   def order!(argv = default_argv, into: nil, **keywords, &nonopt)
     if into.nil? && !@defaults.empty?
       raise "cannot call `order!` without an `into:` if there are default values"
@@ -113,6 +128,11 @@ class OptParse2
       into[key] = value
     end
 
+    # Really this shouldn't be on the class and should probably be passed to the block of each
+    # parameter as requested, but that requires a _significant_ amount of tinkering with `optparse`'s
+    # internals, which is not really in scope.
+    @into = already_done
+
     non_options = []
 
     result = super(argv, into: already_done, **keywords, &non_options.method(:<<))
@@ -156,6 +176,8 @@ class OptParse2
     end
 
     argv2
+  ensure
+    @into = nil # make sure we unset it when returning
   end
 
   module Positional

data/publish

@@ -78,4 +78,7 @@ update_version unless $version.nil?
 ####################################################################################################
 
 system('gem', 'build', exception: true)
-system('gem', 'push', "#$gem-#$version.gem", exception: true) unless $dry
+unless $dry
+  system('gem', 'push', "#$gem-#$version.gem", exception: true)
+  system('gem', 'install', $gem, exception: true)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - SamW