shellopts 2.1.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e35f8f74b401892334c494a767678b724049a9e77c275884591718d7903bfdf
-  data.tar.gz: bec330c7546466bc6e25f74fd2d3e9ae94247db5e048515a5b342cbf9cee31a1
+  metadata.gz: 1c8545c5ef2b66679aa262ab499925ffa3e3a53e99df55844f658877a4722095
+  data.tar.gz: adf2161d1a41f0161ed76031329a306677c88af739f341f01771eba863330a5c
 SHA512:
-  metadata.gz: 49f17500a669a195ba1ccd75b14f9b8417e7640c2ae54dd704a5a0995e01a644fb860a93f0d645829e3d34859955eafd58b96528226b79c57326ff8692976114
-  data.tar.gz: b6e29046a96b36c68a088fa43f2ee2f25ad1c0fd9da5b5741035f7cae1be9030c731e1a3491fb47b2a51730e385388e8bc373bfd7986413b954ac3be929ac22c
+  metadata.gz: 260e46338b058593f0561bf524e595455060101e0de1bec96e3209b15992318cd29ed99a188d539ac2d57dad7c818306249fa3104a23da8e9fc665c1a7cb13fe
+  data.tar.gz: 221cc49626cdd1d172f570187facf4e3941420ec12fc2fbe16a3d73c56fcddf048db40381234726467f2be8f568a9f81c95c038db0d26edff7b6fe31b76090a9

data/lib/shellopts/args.rb

@@ -32,6 +32,7 @@ module ShellOpts
         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)
@@ -58,6 +59,7 @@ module ShellOpts
       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.4"
+  VERSION = "2.3.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
 #
@@ -419,20 +419,24 @@ module ShellOpts
     exit 1
   end
 
-  def self.notice(message)
-    $stderr.puts message if !instance.quiet || !instance.program.quiet?
+  def self.notice(message, newline: true)
+    method = newline ? :puts : :print
+    $stderr.send(method, message) if !instance.quiet || !instance.program.quiet? # FIXME quiet? vs __quiet__ below
   end
 
-  def self.mesg(message)
-    $stdout.puts message if !instance.quiet || !instance.program.__quiet__
+  def self.mesg(message, newline: true)
+    method = newline ? :puts : :print
+    $stdout.send(method,  message) if !instance.quiet || !instance.program.__quiet__
   end
 
-  def self.verb(level = 1, message)
-    $stdout.puts message if instance.verbose && level <= instance.program.__verbose__
+  def self.verb(level = 1, message, newline: true)
+    method = newline ? :puts : :print
+    $stdout.send(method,  message) if instance.verbose && level <= instance.program.__verbose__
   end
 
-  def self.debug(message)
-    $stdout.puts message if instance.debug && instance.program.__debug__
+  def self.debug(message, newline: true)
+    method = newline ? :puts : :print
+    $stdout.send(method,  message) if instance.debug && instance.program.__debug__
   end
 
   def self.quiet_flag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-01-28 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