optparse2 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231baf4fb3c4a278ea945a8bcff14e90decf66d13b37c25659cfc364ae9c0599
-  data.tar.gz: ede27c9be0e8bd48f9efe7358d716015d555a4f26544823354da0f005cb871ae
+  metadata.gz: 5b075c92a3cfbcdaf6d194a8c10b5a6bc1adb503cce26dc9e54d1ce98e01e234
+  data.tar.gz: aa78b0efbaaff344675ee564c43db64b0da6118505b9bd66820925e146b8a40a
 SHA512:
-  metadata.gz: 7365315d5bf866353e233f5771057eb709871ad75d320ac979b860d5d6625cdcbb315cdc073eb6a79a0542c33025e320f77bbacde1101f9c641cf4b41dbafb30
-  data.tar.gz: 619232fed57b4670346be829b7d4afac06748f117b415eeaabe71be96f57a5870b0d32a8b3b5d222b70b8c432abfeed6b5acf6d701d38c0ca00dc395c221200e
+  metadata.gz: 7b22ee332ef698a1f87daba95815adc0bb7a174e7d2985cd69f6e21fa0d038e85926a7d6a103202e2d7f26519acecdb554f75f1ba621a89e235384d0f12c8bfd
+  data.tar.gz: 396f15d23ddd21d3a5a76b243d99fc8cd591244b3c20b1610589af661e4d8ba30c3e7aab804c6b6fdd50138f70abccd372e938be7c4c17c7377f16cb875f2e27

data/lib/optparse2/switch-helpers.rb

@@ -136,10 +136,25 @@ class OptParse2
       self.switch_name = val
     end
 
+    # Required arguments must be supplied by the user. They conflict with `default` options, and
+    # cause an error if both required and default are specified
+    def set_required(required)
+      if default?
+        raise ArgumentError, 'cannot require an argument with a default value'
+      end
+      @required = required
+    end
+
+    def required? = @required
+
     # Default values of switches are used when the switch is never passed in.
     # If the `value` that's provided doesn't respond to `.call`, it's converted to a proc.
     # If `bypass` is truthy, then the default value is never passed to the block's proc (if any)
     def set_default(value, description, bypass)
+      if required?
+        raise ArgumentError, 'cannot supply a default value for a required argument'
+      end
+
       if @arg.nil? && value != true && !bypass
         raise ArgumentError, "Cannot supply a non-true default value to a flag which takes no arguments", caller(4)
       end

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -18,7 +18,6 @@ class OptParse2
   def initialize(...)
     @defaults = Set[]
     @positional = []
-    @required = Set[]
     @rest = nil
     @group = nil
     self.pos_set_banner = OptParse2.pos_set_banner
@@ -55,12 +54,7 @@ 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
+    sw.set_required true if required
 
     if nodefault && default_description != nil
       raise ArgumentError, "default: not supplied, but default_description: given"
@@ -137,18 +131,23 @@ class OptParse2
     visit :each_option do |sw|
       next if !sw.default? || context.key?(key = sw.switch_name.to_sym)
 
+=begin TODO: figure out how to re-parse variables (so it goes thru the whole validation scheme for defaults?)
       if sw.default_bypass?
         context[key] = sw.default
       else
         flag = sw.short.first || sw.long.first || raise("<INTERNAL ERROR: CAN THIS EVER HAPPEN?>")
         _super_order! [flag, sw.default], into: context
       end
+=end
+      context[key] = sw.default
     end
   end
 
   private def ensure_all_required_arguments_were_supplied!(context)
-    @required.each do |key|
-      raise ParseError, "required option '#{key}' not provided" unless context.key? key.to_sym
+    visit :each_option do |sw|
+      next unless sw.required?
+      key = sw.switch_name.to_sym
+      raise ParseError, "required option '#{key}' not provided" unless context.key? key
     end
   end
 

metadata

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