optparse2 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3dff76909d0005ee325d16f79bfa00b18d26a65b3b06b018eef33713e40d250
-  data.tar.gz: 14733f7d9258908dc1df030b475937590089d1f6eb45f0a99f7df8dbcc6a0ded
+  metadata.gz: b99d0120a660e1c0831e8bb7498a7628f2e5e77bef266540ffdb7022120190e0
+  data.tar.gz: 7a9e744ba67a2f23e0a69fde19f30807867ac259902cbaeff477c5b64b3c3627
 SHA512:
-  metadata.gz: e715049dd9d3d3089c6d7ae994666b497eab0436927fe9a98114fcf1d46456798284fb5402fde4edf34ff2dcaf95f5856067fcbcc313fe20ccc46cc0e78635d1
-  data.tar.gz: 32fc2f6d56246b215845adf065103a60be82d5daf78f3d09d6ae64c1a100664a7521cfdfbc2c362047df74933567f59fe97caa839fce054e2baec97d943e863d
+  metadata.gz: f08a3c93c23ca10eb994e63317726c2c2b13407e7b80bdf1cedd095c9066679ac1c8d552c3691f3b87e9596c6c147def64a605a29794388d29766da3a5ccb4e4
+  data.tar.gz: 40f819a15e6f05be7dd1e0ce72ac264492405415386840fad30543ef277ff2e93b048e7963693ec682b82bc410e30406d5a85c08a551f2337bcc87d4f3c68684

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -13,11 +13,15 @@ class OptParse2
   end
   self.pos_set_banner = true
 
+  attr_reader :into
+
   def initialize(...)
     @defaults = Set[]
     @positional = []
     @required = Set[]
     @rest = nil
+    @into = nil
+    @group = nil
     self.pos_set_banner = OptParse2.pos_set_banner
     super
   end
@@ -31,7 +35,7 @@ class OptParse2
     attr_writer :switch_name
     def switch_name; defined?(@switch_name) ? @switch_name : super end
 
-    def set_switch_name_possibly_block_value
+    def set_switch_name_possibly_block_value(val)
       if @block.nil? && @arg.nil?
         q = switch_name.to_sym
         @block = proc { q }
@@ -64,7 +68,7 @@ class OptParse2
   end
 
   # Update `make_switch` to support OptParse2's keyword arguments
-  def make_switch(opts, block, hidden: false, key: nil, default: nodefault=true, default_description: nil,
+  def make_switch(opts, block, hidden: false, key: @group, default: nodefault=true, default_description: nil,
     required: false)
     sw, *rest = super(opts, block)
 
@@ -102,6 +106,17 @@ class OptParse2
     on_tail("\n" + msg)
   end
 
+  def group(name, default: nodefault=true)
+    old_group, @group = @group, name
+    yield
+    if !nodefault && !@defaults.any? { |x| x.switch_name.to_sym == name }
+      (orig_default = default; default = proc { orig_default }) unless default.respond_to?(:call)
+      @defaults << Struct.new(:switch_name, :default_){ def default = default_.() }.new(name, default) # TODO: This should probably be extracted out into a class lol
+    end
+  ensure
+    @group = old_group
+  end
+
   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"
@@ -113,6 +128,11 @@ class OptParse2
       into[key] = value
     end
 
+    # Really this shouldn't be on the class and should probably be passed to the block of each
+    # parameter as requested, but that requires a _significant_ amount of tinkering with `optparse`'s
+    # internals, which is not really in scope.
+    @into = already_done
+
     non_options = []
 
     result = super(argv, into: already_done, **keywords, &non_options.method(:<<))
@@ -156,6 +176,8 @@ class OptParse2
     end
 
     argv2
+  ensure
+    @into = nil # make sure we unset it when returning
   end
 
   module Positional
@@ -223,6 +245,14 @@ class OptParse2
   end
 
   def rest(name, *description, key: name.to_s.tr(' ', '-').to_sym, required: 0, &block)
+    required = case required
+               when true then 1
+               when false then 0
+               when ->x{ Integer === x && !x.negative? } then required
+               else raise TypeError, "invalid type for required: #{required.class} (must be bool or positive integer)"
+               end
+
+    required = 1 if required == true
     title = "#{'[' if required.zero?}#{name} ...#{']' if required.zero?}"
     banner.concat " #{title}" if pos_set_banner
     title += " (#{required} arg minimum)" if required > 0

data/publish

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+
+# require 'optparse2'
+require_relative 'lib/optparse2'
+require 'gvars'
+
+def `(cmd)
+  super.tap { raise "cmd failed: #{cmd} (exit: #{$?.exitstatus})" unless $?.success? }
+end
+
+####################################################################################################
+#                                          Parse CLI Opts                                          #
+####################################################################################################
+
+OptParse2.new do |op|
+  op.pos 'gem', 'The name of the gem', default: proc { File.basename Dir.pwd }, default_description: 'current dir'
+
+  op.on '-f', '--force', 'Proceed even with dirty git status'
+  op.on '-n', '--dry', 'Do not actually publish the gem'
+
+  op.on '--version VERSION', 'Set the version string to VERSION'
+  op.on '-p', '--patch', 'Bump the patch version up', key: :version
+  op.on '-m', '--minor', 'Bump the minor version up (and reset patch to 0)', key: :version
+  op.on '--version-file=PATH', 'The file where the new version is stored', default: proc { File.join("lib", $gem, "version.rb") },
+    default_description: 'lib/<gem>/version.rb'
+
+
+  # note: no `--major`, as that should be done with `--version`
+  op.parse! into: GVars
+end
+
+####################################################################################################
+#                                      Check Git Dirty Status                                      #
+####################################################################################################
+
+unless `git status --porcelain`.chomp.empty?
+  if $force
+    warn "Proceeding with a dirty git status"
+  else
+    abort "Not proceeding due to dirty git status; use --force to override"
+  end
+end
+
+####################################################################################################
+#                                   Update VERSION, if supplied                                    #
+####################################################################################################
+
+# Fetch the git version
+def get_old_version
+  File.read($version_file)[/VERSION\s+=\s+"(\d+\.\d+\.\d+)"/, 1] or fail "cannot fetch old version"
+end
+
+def update_version
+
+  case $version
+  when :patch then $version = get_old_version.succ!
+  when :minor then $version = get_old_version.sub!(/\A(\d+\.\d+)\.\d*\z/, '\1').succ + '.0'
+  when String then # already set
+  else raise
+  end
+
+  puts "Using version #$version"
+  vf = File.read($version_file)
+  vf.sub!(/(VERSION\s+=\s+")\d+\.\d+\.\d+(")/, "\\1#$version\\2") or fail "cannot update version"
+  File.write $version_file, vf
+
+  unless $dry
+    system('git', 'add', '--', $version_file, exception: true)
+    system('git', 'commit', '-m', "Version #$version", exception: true)
+    system('git', 'push', exception: true)
+  end
+end
+
+update_version unless $version.nil?
+
+####################################################################################################
+#                                    Build and Publish the Gem                                     #
+####################################################################################################
+
+system('gem', 'build', exception: true)
+unless $dry
+  system('gem', 'push', "#$gem-#$version.gem", exception: true)
+  system('gem', 'install', $gem, exception: true)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - SamW
@@ -22,6 +22,7 @@ files:
 - lib/optparse2/fixes.rb
 - lib/optparse2/pathname.rb
 - lib/optparse2/version.rb
+- publish
 - sig/optparse2.rbs
 licenses:
 - MIT