optparse2 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '089aa30260171fcc53efa5d5099338973990015878df07b4a3c9ae023ae7d0c6'
-  data.tar.gz: 2e46af429af2a2c3576bb5bfd2f32bc4bcb448fb2ecb73c34f419de705d502d6
+  metadata.gz: 3dcc11ed7e12ad87b21d8ebe019134d532b939cae79c8ed28ad7a7306995bfc2
+  data.tar.gz: 492b927a81e1df4d1e0cfb7aa7f91fb8e456c31be7a04052e2f870ff8862871d
 SHA512:
-  metadata.gz: c2f53a2bc1382025cdc0c66ddbfe2878bbcec9a21ddb66b5c54e6952fdef9a32d4b9d9c11ea68875ec2b1e875f135cd33c48ec54d138cc450c7d92428e9a8ed0
-  data.tar.gz: 66b6650a5aa9b38020ccb8a053268037188897b7b6d2514b14b384fb488b1d7553f005bd9ed266b4ae293ad506cc45ad6f8fe6384125bbc9928e1b9b79b1d42b
+  metadata.gz: 420612dd7c3d50fff1ddff3fdfa9c87bfd05bb58f01036450a348d7ee7109cd8cf320c39382566d1d7f341b0402f09c9439dde39e20a7f732bc013c2fe60cf40
+  data.tar.gz: a5e696e36c4206f75531d11157743462edc0ca1500b7100ac7f85fcf4a87b791b5a9758794d1181380e4da048ad8ef633aabf955803e3c3e745c63c7532a9f9c

data/lib/optparse2/builder.rb

@@ -0,0 +1,48 @@
+class OptParse2
+  def switch(*pos, &block)
+    Builder.new(pos, block, self)
+  end
+
+  class Builder
+    def initialize(positional, block, optparse2)
+      @positional, @block, @optparse2 = positional, block, optparse2
+      @args = {}
+    end
+
+    def build!
+      @optparse2.on(*@positional, **@args, &@block)
+    end
+
+    def block(&block)
+      raise LocalJumpError unless defined? yield
+      @block = block
+      self
+    end
+
+    def hidden(hidden = true)
+      @args[:hidden] = hidden
+      self
+    end
+
+    def default(value = novalue=true, description: nodescription=true, &block)
+      if novalue.nil? != block.nil?
+        raise ArgumentError, "Exactly one of a positional argument or a block can be given"
+      end
+
+      @args[:default] = (novalue ? block : proc { value })
+      @args[:default_description] = description unless nodescription
+      self
+    end
+
+    def key(key)
+      @args[:key] = key
+      self
+    end
+
+    def required(required = true)
+      @args[:required] = required
+      self
+    end
+  end
+end
+

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, no_default_description)
+    def set_default(value, description, bypass)
       if required?
         raise ArgumentError, 'cannot supply a default value for a required argument'
       end
@@ -165,7 +165,6 @@ class OptParse2
         @default_proc = proc { |_switch_name| value }
       end
 
-      @no_default_description = no_default_description
       @default_description = description
       @default_bypass = bypass
     end
@@ -173,16 +172,30 @@ class OptParse2
     # Calls the default proc to figure out what the default value is for this switch
     def default_bypass? = @default_bypass
     def default? = defined?(@default_proc)
-    def default = @default_proc&.call(switch_name)
+    def default
+      return unless default?
+      if defined? @__default_value_after_calling_proc__
+        @__default_value_after_calling_proc__
+      else
+        @__default_value_after_calling_proc__ = @default_proc&.call(switch_name)
+      end
+    end
 
-    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}]"
-      x
+      super_desc = super
+      return super_desc unless defined? @default_proc
+
+      if !@default_description
+        return super_desc
+      end
+
+      super_desc << '' if super_desc.empty?
+      super_desc[-1] += " [default"
+      if @default_description != true
+        super_desc.last.concat ": #{@default_description == :__TODO_DEFAULT__ ? default : @default_description}"
+      end
+      super_desc.last.concat ']'
+      super_desc
     end
   end
 end

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -8,6 +8,7 @@ require_relative "optparse2/version"
 require_relative "optparse2/fixes"
 require_relative "optparse2/switch-helpers"
 require_relative "optparse2/context"
+require_relative "optparse2/builder"
 
 class OptParse2
   class << self
@@ -35,7 +36,7 @@ class OptParse2
     key: @group,
     default: nodefault=true,
     default_bypass: false,
-    default_description: no_default_description=true,
+    default_description: :__TODO_DEFAULT__,
     required: false,
     multiple: nil
   )
@@ -56,12 +57,12 @@ class OptParse2
 
     sw.set_required true if required
 
-    if nodefault && !no_default_description
+    if nodefault && default_description != :__TODO_DEFAULT__
       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, !no_default_description)
+      sw.set_default(default, default_description, default_bypass)
       @defaults << sw
     end
 
@@ -270,6 +271,17 @@ class OptParse2
   end
 end
 
+__END__
+
+OptParse2.new do |op|
+  op.switch('-f', '--foo=BAR', 'does it')
+    .default { p $x += 1 }
+    .build!
+  op.parse! into: opts={}
+  p opts
+  p $x
+end
+
 __END__
 OptParse2.new do |op|
   op.on '-f', '--foo=BAR', 'does it', default: 10, default_description: nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - SamW
@@ -19,6 +19,7 @@ files:
 - README.md
 - Rakefile
 - lib/optparse2.rb
+- lib/optparse2/builder.rb
 - lib/optparse2/context.rb
 - lib/optparse2/fixes.rb
 - lib/optparse2/pathname.rb