optparse2 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65c3cbdeee5a8be4421cfb6690664c5a717493b21d27c7e2772796bbfc07c31
-  data.tar.gz: 2635447e0c1d6aeb4b64d1d5cd85aa3f722f5d73d67a8d111983e6f1f230d2e6
+  metadata.gz: dda7dfaa9390f8a4e8cf1cc33c382b31e12caa3aa3e2c8d66684dc14bca5381a
+  data.tar.gz: bc3ddf03d60a82c084fece437072cdb8e3aada7cab0abed5ae5f73bdbcab077e
 SHA512:
-  metadata.gz: 93e0b546543a5cd14e0c013c8f36031f1661ed8c5bed77eebf8b833533245fb1dbd4ced50ec9b56167a89fe4f0ab16096172a01b3e8723bc6b7766a0ddf5a6c8
-  data.tar.gz: 9c2d74d86790e248f1a2fb660155b9514f36efd4edc8dd17eff4491dd2d184e246c51fbc0e8ce6ecab112c5bc13aa252dca74c823aebd1bc0638655f2b6b3832
+  metadata.gz: 2b86da17e14359336c501cfdeb5dd552915a1e069b68874854b098f662dd63bc78aa82cc226d0c75a2bb885a24db806800894f719a063e60941d7357cb31929c
+  data.tar.gz: 8718f37e9eb5d2a4f9d6674800682cd7b487608621d768fdadde9271404d0914e558f96e3efdcf66306cd4e943250ae9f0cc9725a738364bb98a59f41d355105

data/README.md

@@ -1,5 +1,24 @@
 # OptParse2
 
+example:
+
+```ruby
+OptParse2.new do |op|
+  op.on('-d', '--debug', hidden: true) do |dbg|
+    puts "debug = #{dbg}"
+  end
+
+  op.on('-b', '--branch=STRING')
+  op.on('-m', '--master', key: :branch) { :master }
+
+  puts op.help
+  op.parse! %w[-d --branch=foo --master], into: h={}
+  p h
+end
+```
+
+
+
 TODO: Delete this and the text below, and describe your gem
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/optparse2`. To experiment with that code, run `bin/console` for an interactive prompt.

data/lib/optparse2/fixes.rb

@@ -0,0 +1,19 @@
+class OptParse2
+  # Provide support for passing keyword arguments into `make_switch`
+  def define(*opts, **, &block) top.append(*(sw = make_switch(opts, block, **))); sw[0] end
+  alias def_option define
+  def on(...) define(...); self end
+
+  def define_head(*opts, **, &block) top.prepend(*(sw = make_switch(opts, block, **))); sw[0] end
+  alias def_head_option define_head
+  def on_head(...) define_head(...); self end
+
+  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/globals.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module OptParse2::Globals
+  def self.[]=(key, value)
+    key = key.to_s.gsub('-', '_')
+
+    unless key.match? /\A[[:alpha:]_][[:alnum:]_]*\z/
+      raise "invalid global name: #{key}"
+    end
+
+    eval "$#{key} = value"
+  end
+end

data/lib/optparse2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module OptParse2
-  VERSION = "0.1.0"
+class OptParse2
+  VERSION = "0.1.2"
 end

data/lib/optparse2.rb

@@ -1,27 +1,66 @@
 # frozen_string_literal: true
 
+require 'optparse'
+class OptParse2 < OptParse; end # Make sure it's a subclass
+OptionParser2 = OptParse2 # Alias
+
 require_relative "optparse2/version"
+require_relative "optparse2/fixes"
+# require_relative "optparse2/helpers"
+
+class OptParse2
+  def initialize(...)
+    @defaults = Set[]
+    super
+  end
+
+  ## Helpers is a mixin that contains methods to modify how the original `Switch` works
+  module Helpers
+    def set_hidden
+      def self.summarize(*) end
+    end
+
+    attr_writer :switch_name
+    def switch_name; defined?(@switch_name) ? @switch_name : super end
+
 
-class OptParse2 < OptParse
-  # Provide support for passing keyword arguments into `make_switch`
-  def define(*opts, **, &block) top.append(*(sw = make_switch(opts, block, **))); sw[0] end
-  alias def_option define
-  def on(...) define(...); self end
+    # requires `switch_name`, `desc` to work
+    def set_default(value, description)
+      if defined? value.call
+        @default = value
+      else
+        @default = proc { value }
+      end
 
-  def define_head(*opts, **, &block) top.prepend(*(sw = make_switch(opts, block, **))); sw[0] end
-  alias def_head_option define_head
-  def on_head(...) define_head(...); self end
+      @default_description = description
+    end
 
-  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 default = @default.call(switch_name)
+    def default_description = @default_description || default.inspect
+    def desc
+      return super unless defined? @default
+      x = super
+      x << '' if x.empty?
+      x.last << " [default: #{default_description}]"
+      x
+    end
+  end
 
   # Update `make_switch` to support OptParse2's keyword arguments
-  def make_switch(opts, block, hidden: false, key: nil)
+  def make_switch(opts, block, hidden: false, key: nil, default: nodefault=true, default_description: nil)
     sw, *rest = super(opts, block)
 
-    key and sw.define_singleton_method(:switch_name) { key }
-    hidden and def sw.summarize(*) end
+    sw.extend Helpers
+
+    sw.switch_name = key if key
+    sw.set_hidden if hidden
+
+    if nodefault && default_description != nil
+      raise ArgumentError, "default: not supplied, but default_description: given"
+    elsif not nodefault
+      sw.set_default(default, default_description)
+      @defaults << sw
+    end
 
     [sw, *rest]
   end
@@ -31,14 +70,26 @@ class OptParse2 < OptParse
     on_tail("\n" + msg)
   end
 
-  # def env(var, *opts, hidden: false, &)
-  #   fail if hidden
-  #   sw, = make_switch(['-_X', *opts])
+  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"
+    end
 
-  #   p sw
-  #   exit
-  #   on_tail(var)
-  # end
+    already_done = {}
+    already_done.define_singleton_method(:[]=) do |key, value|
+      key = key.to_s
+      super(key, value)
+      into[key] = value
+    end
 
-  # def positional
+    result = super(argv, into: already_done, **keywords, &nonopt)
+
+    @defaults.each do |sw|
+      key = sw.switch_name
+      next if already_done.key? key
+      into[key] = sw.default()
+    end
+
+    result
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - SamW
@@ -19,6 +19,8 @@ files:
 - README.md
 - Rakefile
 - lib/optparse2.rb
+- lib/optparse2/fixes.rb
+- lib/optparse2/globals.rb
 - lib/optparse2/version.rb
 - sig/optparse2.rbs
 licenses: