optparse2 0.7.7 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dcc11ed7e12ad87b21d8ebe019134d532b939cae79c8ed28ad7a7306995bfc2
-  data.tar.gz: 492b927a81e1df4d1e0cfb7aa7f91fb8e456c31be7a04052e2f870ff8862871d
+  metadata.gz: f72b9507463f134c1c50c41330ab92e73c087764f0e378b84bff1819f52997e6
+  data.tar.gz: 0d46f1626d79f5a056a754467338dbb640e425d46b81c36747aab525ec69b340
 SHA512:
-  metadata.gz: 420612dd7c3d50fff1ddff3fdfa9c87bfd05bb58f01036450a348d7ee7109cd8cf320c39382566d1d7f341b0402f09c9439dde39e20a7f732bc013c2fe60cf40
-  data.tar.gz: a5e696e36c4206f75531d11157743462edc0ca1500b7100ac7f85fcf4a87b791b5a9758794d1181380e4da048ad8ef633aabf955803e3c3e745c63c7532a9f9c
+  metadata.gz: 6e647563d1b3ffc9d1f8501ae527a1de6c4069bc69cd7c81f0a456a2938f203ed22606383115a0dcf2d3ef2c71f680fa72810379cb14655608895ed10c915d04
+  data.tar.gz: 37805f0e018d3b842807cca56e5dcaf2906c5ad0c873171279816a658bc8b9dc6eb20faad51b4dbf4da4f557467895a4845e8104d5eb3b77f71afce748d1fea3

data/lib/optparse2/fixes.rb

@@ -11,9 +11,4 @@ class OptParse2
   def define_head(*opts, **, &block) base.append(*(sw = make_switch(opts, block, **))); sw[0] end
   alias def_tail_option define_tail
   def on_tail(...) define_tail(...); self end
-
-  def initialize(*)
-    @defaults = {}
-    super
-  end
 end

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -8,7 +8,6 @@ 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
@@ -174,10 +173,13 @@ class OptParse2
       ensure_all_required_arguments_were_supplied!(context)
 
       # For each non-option argument, call the `nonopt` block
-      not_matched_options.each(&nonopt)
-
-      # Replace the original argv with the resulting options
-      argv.replace not_matched_options
+      if nonopt
+        not_matched_options.each(&nonopt)
+        argv.clear
+      else
+        # Replace the original argv with the resulting options
+        argv.replace not_matched_options
+      end
     end
   rescue OptionParser::ParseError => err
     abort ? abort(err) : raise
@@ -271,17 +273,6 @@ 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.7
+  version: 0.8.1
 platform: ruby
 authors:
 - SamW
@@ -19,7 +19,6 @@ files:
 - README.md
 - Rakefile
 - lib/optparse2.rb
-- lib/optparse2/builder.rb
 - lib/optparse2/context.rb
 - lib/optparse2/fixes.rb
 - lib/optparse2/pathname.rb

data/lib/optparse2/builder.rb

@@ -1,48 +0,0 @@
-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
-