optparse2 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 376bbfd9fc2c5c6c0be54659a67b7348e25020e9fc127241d99572731ab3242f
-  data.tar.gz: 8e11e2b03a970cd1f1de7ef5fe546eb02e49b0c7c536ccf297bdedb4162f2238
+  metadata.gz: 4b73eda58e3715e16d45898c5d4e22386a23ba2363d0708c02ea336aec51a631
+  data.tar.gz: 777192092c696ec69bd6199fbcbd09819468dc0b06541268fa8d1a1ba4b4e389
 SHA512:
-  metadata.gz: 5f675f1b0ea86836d55639bbf4a97721b686a570a6a4c3e1b57995515f1138d925dd07c6eae266dbbedb22645b124841a33e0770d9523d27fbdeb45b5b2adc15
-  data.tar.gz: f8121ecfff0b7e7bacde7649729cdf13f828b63d146f838749184ee362839157338a2939813bad5737c0c85ba1268bb0985baebef0c18330bc6f435cf99b977a
+  metadata.gz: c31c01a23b2d0b7020cc004d6a4dda0f24ed2dfe18464a5f8f71249502cedd425e4cb2bb341d4974e733b7e1e721b9f421e49ee022009780c3d512216df220fb
+  data.tar.gz: e0d55f1dc1a4743a3b7d3e763272791d30895e89fcbc60ebab3554bce3f0fa1dc3dcbd0a40cef3248875d32b8d1c9da507c773e4e41e33c02065af0439e9676f

data/lib/optparse2/version.rb

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

data/lib/optparse2.rb

@@ -6,7 +6,6 @@ OptionParser2 = OptParse2 # Alias
 
 require_relative "optparse2/version"
 require_relative "optparse2/fixes"
-# require_relative "optparse2/helpers"
 
 class OptParse2
   class << self
@@ -29,20 +28,18 @@ class OptParse2
       def self.summarize(*) end
     end
 
-    def switch_name=(val)
-      # binding.irb
-      @switch_name = val
-    end
+    attr_writer :switch_name
+    def switch_name; defined?(@switch_name) ? @switch_name : super end
 
-    def set_block_name_because_of_switch_name
+    def set_switch_name_possibly_block_value(val)
       if @block.nil? && @arg.nil?
-        q = @switch_name.to_sym
+        q = switch_name.to_sym
         @block = proc { q }
       end
+
+      self.switch_name = val
     end
 
-    # attr_writer :switch_name
-    def switch_name; defined?(@switch_name) ? @switch_name : super end
 
     # requires `switch_name`, `desc` to work
     def set_default(value, description)
@@ -73,8 +70,7 @@ class OptParse2
 
     sw.extend Helpers
     if key
-      sw.switch_name = key
-      sw.set_block_name_because_of_switch_name
+      sw.set_switch_name_possibly_block_value key
     end
     sw.set_hidden if hidden
 
@@ -227,6 +223,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
@@ -239,23 +243,3 @@ class OptParse2
     @rest = { name:, key:, required: required || 0, block: }
   end
 end
-
-__END__
-return unless $0 == __FILE__
-require_relative 'optparse2/pathname'
-
-# $* << '-tFOO' << '--no-cache' << '-x'
-# $*.replace %w[123 lol what -t10 is up here]
-$*.replace %w[1 -t3 bb lol what -- is up]
-
-OPTS={}
-OptParse2.new do |op|
-  $op = op
-  op.on '-t', '--timeout=FOO', Array,required: true
-  op.pos 'file', Integer, 'sets the file name', 'is also pretty cool', 1..1000, required: true do it * 2 end
-  op.pos '[start[-end]]', 'things to do', key: 'line', default: 123
-
-  op.rest 'branch name', 'Message to submit', 'pretty coo', required: 1 do it.join ' ' end
-  p op.parse! into: OPTS
-  p ["finish: ", OPTS, $*]
-end

data/publish

@@ -0,0 +1,81 @@
+#!/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)
+system('gem', 'push', "#$gem-#$version.gem", exception: true) unless $dry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse2
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 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