optparse2 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb6261613557a808dfda4002a86d4218d955804583135a3489ce5de01ba0e0e
-  data.tar.gz: babfce64dd51938c50999db68237a920a9270701c85b415e5fde510796134189
+  metadata.gz: '089aa30260171fcc53efa5d5099338973990015878df07b4a3c9ae023ae7d0c6'
+  data.tar.gz: 2e46af429af2a2c3576bb5bfd2f32bc4bcb448fb2ecb73c34f419de705d502d6
 SHA512:
-  metadata.gz: b7b7521fc75776437521cbf73fc024fc15ffa2f1a5b59ed7c43319f4fa8b103083e7e8eced9ae63d74475d741d49f84b43f4413cd806ceb41199223bd545ee0e
-  data.tar.gz: ef7eb6f76bd62d96d293303aed61d3ee884212145c6507cb373877b6fa19005c6bc5e6be6ce2c328ed963c11fee6b931c4dbbcdb68fbb2ef29d9fa04ff33d631
+  metadata.gz: c2f53a2bc1382025cdc0c66ddbfe2878bbcec9a21ddb66b5c54e6952fdef9a32d4b9d9c11ea68875ec2b1e875f135cd33c48ec54d138cc450c7d92428e9a8ed0
+  data.tar.gz: 66b6650a5aa9b38020ccb8a053268037188897b7b6d2514b14b384fb488b1d7553f005bd9ed266b4ae293ad506cc45ad6f8fe6384125bbc9928e1b9b79b1d42b

data/lib/optparse2/switch-helpers.rb

@@ -150,7 +150,7 @@ class OptParse2
     # 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)
+    def set_default(value, description, bypass, no_default_description)
       if required?
         raise ArgumentError, 'cannot supply a default value for a required argument'
       end
@@ -165,6 +165,7 @@ class OptParse2
         @default_proc = proc { |_switch_name| value }
       end
 
+      @no_default_description = no_default_description
       @default_description = description
       @default_bypass = bypass
     end
@@ -174,9 +175,10 @@ class OptParse2
     def default? = defined?(@default_proc)
     def default = @default_proc&.call(switch_name)
 
-    def default_description = @default_description || default.inspect
+    def default_description = @default_description || default.to_s
     def desc
       return super unless defined? @default_proc
+      return super if @no_default_description
       x = super
       x << '' if x.empty?
       x[-1] += " [default: #{default_description}]"

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -35,7 +35,7 @@ class OptParse2
     key: @group,
     default: nodefault=true,
     default_bypass: false,
-    default_description: nil,
+    default_description: no_default_description=true,
     required: false,
     multiple: nil
   )
@@ -56,12 +56,12 @@ class OptParse2
 
     sw.set_required true if required
 
-    if nodefault && default_description != nil
+    if nodefault && !no_default_description
       raise ArgumentError, "default: not supplied, but default_description: given"
     elsif nodefault && default_bypass
       raise ArgumentError, "default: not supplied, but default_bypass: given"
     elsif not nodefault
-      sw.set_default(default, default_description, default_bypass)
+      sw.set_default(default, default_description, default_bypass, !no_default_description)
       @defaults << sw
     end
 
@@ -131,12 +131,15 @@ 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
 
@@ -267,6 +270,12 @@ class OptParse2
   end
 end
 
+__END__
+OptParse2.new do |op|
+  op.on '-f', '--foo=BAR', 'does it', default: 10, default_description: nil
+  puts op.help
+end
+
 __END__
 OptParse2.new do |op|
   op.on '--foo=FOO', multiple: :first! do puts "FOO: #{it}"; it end

metadata

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