shellopts 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a0965923d18a30dfcf2423a94e836ed70175c855c0cfe053ad6bcb4477f86e
-  data.tar.gz: 577bbd74ae1d865294fe2959234dcf661011a8f4feaa9f267206eff41160dc5a
+  metadata.gz: fccea78ec2de7eab1323d529055ce1875ca9ac6b966a40dcadad83e4e68594f5
+  data.tar.gz: 6326b0754e0c24164bdd09f0bfbe36248aa2c7b493c1b4fa5db2c65046de7c3f
 SHA512:
-  metadata.gz: a742f7189ce47ea95f0477f4a450345d95b66a871ac6f123a5c9107f3e06b2d4cbeb573fa75e7d6fc2b1947b4fac7b5f846c1ba39873faa3e5eeb8f54e8834e4
-  data.tar.gz: bf176d5794767dc0aadd732763da86850b028cc065e5dda72d404b93355f77577ad0c7e9413d753881ca50685a137f4108f35df4c1dce38555d433888ced1f43
+  metadata.gz: 400ac812870c7b51321cc360e547a43e0b3976c1e6d7b2358cbc2abd3fb0491837bb230bf386a899a08967d0ed5201c8e532bb49fb12ef7aa95050c9af8b8fd6
+  data.tar.gz: 115186fbd56935988bcdd1d7f37b00168e4432aa5fff889933b79b7ddbea0be5ab95f0a970c635e04c713aa4664e8333f67c43bc26ccc3e4916f419afb67d65c

data/lib/shellopts/args.rb

@@ -26,11 +26,13 @@ module ShellOpts
     # #extract raise a ShellOpts::Error exception if there's is not enough
     # elements in the array to satisfy the request
     #
+    # TODO: Better handling of ranges. Allow: 2..-1, -2..-4, etc.
     def extract(count_or_range, message = nil)
       case count_or_range
         when Range
           range = count_or_range
           range.min <= self.size or inoa(message)
+          return self.to_a if range.end.nil?
           n_extract = [self.size, range.max].min
           n_extend = range.max > self.size ? range.max - self.size : 0
           r = self.shift(n_extract) + Array.new(n_extend)
@@ -52,10 +54,12 @@ module ShellOpts
     # #expect raise a ShellOpts::Error exception if the array is not emptied 
     # by the operation
     #
+    # TODO: Better handling of ranges. Allow: 2..-1, -2..-4, etc.
     def expect(count_or_range, message = nil)
       case count_or_range
         when Range
           count_or_range === self.size or inoa(message)
+          return self.to_a if count_or_range.end.nil?
         when Integer
           count_or_range >= 0 or inoa(message)
           count_or_range.abs == self.size or inoa(message)

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.1.3"
+  VERSION = "2.2.0"
 end

data/lib/shellopts.rb

@@ -4,28 +4,28 @@ require 'indented_io'
 require 'constrain'
 include Constrain
 
-require 'ext/array.rb'
-require 'ext/follow.rb'
-require 'ext/forward_to.rb'
-require 'ext/lcs.rb'
+require_relative 'shellopts/ext/array.rb'
+require_relative 'shellopts/ext/follow.rb'
+require_relative 'shellopts/ext/forward_to.rb' # Import into standard forward_to
+require_relative 'shellopts/ext/lcs.rb'
 include ForwardTo
 
-require 'shellopts/version.rb'
-
-require 'shellopts/stack.rb'
-require 'shellopts/token.rb'
-require 'shellopts/grammar.rb'
-require 'shellopts/program.rb'
-require 'shellopts/args.rb'
-require 'shellopts/lexer.rb'
-require 'shellopts/argument_type.rb'
-require 'shellopts/parser.rb'
-require 'shellopts/analyzer.rb'
-require 'shellopts/interpreter.rb'
-require 'shellopts/ansi.rb'
-require 'shellopts/renderer.rb'
-require 'shellopts/formatter.rb'
-require 'shellopts/dump.rb'
+require_relative 'shellopts/version.rb'
+
+require_relative 'shellopts/stack.rb'
+require_relative 'shellopts/token.rb'
+require_relative 'shellopts/grammar.rb'
+require_relative 'shellopts/program.rb'
+require_relative 'shellopts/args.rb'
+require_relative 'shellopts/lexer.rb'
+require_relative 'shellopts/argument_type.rb'
+require_relative 'shellopts/parser.rb'
+require_relative 'shellopts/analyzer.rb'
+require_relative 'shellopts/interpreter.rb'
+require_relative 'shellopts/ansi.rb'
+require_relative 'shellopts/renderer.rb'
+require_relative 'shellopts/formatter.rb'
+require_relative 'shellopts/dump.rb'
 
 # TODO: Describe exception handling
 #
@@ -212,15 +212,15 @@ module ShellOpts
         @argv = argv.dup
         @program, @args = Interpreter.interpret(grammar, argv, float: float, exception: exception)
 
-        # Process standard options (that may have been renamed)
-        if @program.__send__(:"#{@help_option.ident}?")
+        # Process standard options that may have been renamed or be deactivated
+        if @help && @program.__send__(:"#{@help_option.ident}?")
           if @program[:help].name =~ /^--/
             ShellOpts.help
           else
             ShellOpts.brief
           end
           exit
-        elsif @program.__send__(:"#{@version_option.ident}?")
+        elsif @version && @program.__send__(:"#{@version_option.ident}?")
           puts version_number
           exit
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -133,16 +133,16 @@ files:
 - doc/stylesheet.css
 - doc/syntax.rb
 - doc/syntax.txt
-- lib/ext/array.rb
-- lib/ext/follow.rb
-- lib/ext/forward_to.rb
-- lib/ext/lcs.rb
 - lib/shellopts.rb
 - lib/shellopts/analyzer.rb
 - lib/shellopts/ansi.rb
 - lib/shellopts/args.rb
 - lib/shellopts/argument_type.rb
 - lib/shellopts/dump.rb
+- lib/shellopts/ext/array.rb
+- lib/shellopts/ext/follow.rb
+- lib/shellopts/ext/forward_to.rb
+- lib/shellopts/ext/lcs.rb
 - lib/shellopts/formatter.rb
 - lib/shellopts/grammar.rb
 - lib/shellopts/interpreter.rb
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: Parse command line options and arguments