shellopts 2.5.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff7cb2ce9ba5f03f921c602b81c179c185193d6e26eb9b39d34f54bed30c3bd
-  data.tar.gz: c18bf6c16327031b7228960649a88ef9d08638ec2e0bfadaf23ebcd49e29baab
+  metadata.gz: 1ba9102a9c2600e217c6ee3398b61d017ba7705a9eee4a56ac3a8005233827d2
+  data.tar.gz: 233b337ba011a4e868084ebe443b2794f044e06a41a5d913d449dc867a77125d
 SHA512:
-  metadata.gz: a517100a6152d7f0238367d6c7c95e0d92c982f6aff3d4888458b00513cb4e30f3320305f9ee3fd273b24bc8a88eddc5a0b6200e673717db896def4902dcd703
-  data.tar.gz: 895a4e62108e62106fcc644706a0c4cbd4bda973fb38d62ac473f0c50dda7439061357427f9a281f687ba4fc70e20d7eaab5e4910fbfb0bb0bba11529e7aae3d
+  metadata.gz: fa9721b673146939017c02e7434082f9e8d7133a3c0367e5d8016977adec49f859277be54b44c7998ae7927774d42203560ef4e53f7490e8bb3cf629350e78db
+  data.tar.gz: e5a926911404a936443ada678611089f93bb40c6620cd69d0c04b123ab7c2d3095af5f729b7862bdc4430ccb36a6343dcb63d6cc19d5aa29e73a035b40af1eb5

data/lib/shellopts/args.rb

@@ -48,6 +48,18 @@ module ShellOpts
       end
     end
 
+    # Return true args contains at least the given count or range of elements
+    def extract?(count_or_range)
+      case count_or_range
+        when Range
+          count_or_range.min <= self.size
+        when Integer
+          count_or_range.abs <= self.size
+      else
+        raise ArgumentError
+      end
+    end
+
     # As #extract except the array is expected to be emptied by the operation.
     # Raise a #inoa exception if count is negative
     #
@@ -67,6 +79,19 @@ module ShellOpts
       extract(count_or_range) # Can't fail
     end
 
+    # Return true args contains the given count or range of elements
+    def expect?(count_or_range, message = nil)
+      case count_or_range
+        when Range
+          count_or_range === self.size
+        when Integer
+          count_or_range >= 0 or raise ArgumentError # FIXME in #expect
+          count_or_range.abs == self.size
+      else
+        raise ArgumentError
+      end
+    end
+
   private
     def inoa(message = nil)
       message ||= "Illegal number of arguments"

data/lib/shellopts/formatter.rb

@@ -1,4 +1,4 @@
-require 'terminfo'
+require 'tty-screen'
 
 module ShellOpts
   module Grammar
@@ -296,8 +296,13 @@ module ShellOpts
     end
 
     def self.width()
-      @width ||= TermInfo.screen_width - MARGIN_RIGHT
-      @width
+      begin
+        _stdout = $stdout # TTY::Screen use $stdout but that can be a StringIO object without ioctl
+        $stdout = STDOUT if !$stdout.respond_to? :ioctl
+        @width ||= TTY::Screen.width - MARGIN_RIGHT
+      ensure
+        $stdout = _stdout
+      end
     end
 
     # Used in rspec

data/lib/shellopts/program.rb

@@ -6,7 +6,7 @@ module ShellOpts
   # BasicObject to have only a minimum of inherited member methods.
   #
   # The names of the inherited methods can't be used as options or
-  # command namess. They are: instance_eval, instance_exec method_missing,
+  # command names. They are: instance_eval, instance_exec method_missing,
   # singleton_method_added, singleton_method_removed, and
   # singleton_method_undefined.
   #

data/lib/shellopts/renderer.rb

@@ -1,5 +1,3 @@
-require 'terminfo'
-
 # Option rendering
 #   -a, --all                   # Only used in brief and doc formats (enum)
 #   --all                       # Only used in usage (long)

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.5.1"
+  VERSION = "2.6.1"
 end

data/lib/shellopts.rb

@@ -89,6 +89,9 @@ module ShellOpts
     # Name of program. Defaults to the name of the executable
     attr_reader :name
 
+    # Executable. Default $PROGRAM_NAME
+    attr_reader :file
+
     # Specification (String). Initialized by #compile
     attr_reader :spec
 
@@ -133,14 +136,11 @@ module ShellOpts
     # message and exit
     attr_accessor :exception
 
-    # File of source
-    attr_reader :file
-
     # Debug: Internal variables made public
     attr_reader :tokens
     alias_method :ast, :grammar
 
-    def initialize(name: nil,
+    def initialize(name: nil, file: $PROGRAM_NAME,
         # Options
         help: true,
         version: true,
@@ -149,7 +149,7 @@ module ShellOpts
         verbose: nil,
         debug: nil,
 
-        # Version number (usually detected)
+        # Version number (auto-detected for gem packages)
         version_number: nil,
 
         # Floating options
@@ -159,14 +159,15 @@ module ShellOpts
         exception: false
       )
 
-      @name = name || File.basename($PROGRAM_NAME)
+      @name = name || File.basename(file)
+      @file = file
       @help = help
-      @version = version || (version.nil? && !version_number.nil?)
+      @version_number = version_number || (version && find_version_number)
+      @version = !@version_number.nil? && version
       @silent = silent
       @quiet = quiet
       @verbose = verbose
       @debug = debug
-      @version_number = version_number || find_version_number
       @float = float
       @exception = exception
     end
@@ -177,19 +178,18 @@ module ShellOpts
       handle_exceptions {
         @oneline = spec.index("\n").nil?
         @spec = spec.sub(/^\s*\n/, "")
-        @file = find_caller_file
         @tokens = Lexer.lex(name, @spec, @oneline)
         ast = Parser.parse(tokens)
 
         help_spec = (@help == true ? "-h,help" : @help)
         version_spec = (@version == true ? "--version" : @version)
-        silent_spec = (@silent == true ? "-q,silent" : @silent)
+        silent_spec = (@silent == true ? "--silent" : @silent)
         quiet_spec = (@quiet == true ? "-q,quiet" : @quiet)
         verbose_spec = (@verbose == true ? "+v,verbose" : @verbose)
         debug_spec = (@debug == true ? "--debug" : @debug)
 
         @silent_option =
-            ast.inject_option(silent_spec, "Quiet", "Do not write anything to standard output") if @silent
+            ast.inject_option(silent_spec, "Silent", "Do not write anything to standard output/error") if @silent
         @quiet_option =
             ast.inject_option(quiet_spec, "Quiet", "Do not write anything to standard output") if @quiet
         @verbose_option =
@@ -311,10 +311,8 @@ module ShellOpts
 
   private
     def find_version_number
-      exe = caller.find { |line| line =~ /`<top \(required\)>'$/ }&.sub(/:.*/, "") or return nil
-      file = Dir.glob(File.dirname(exe) + "/../lib/*/version.rb").first or return nil
-      IO.read(file).sub(/^.*VERSION\s*=\s*"(.*?)".*$/m, '\1') or
-          raise ArgumentError, "ShellOpts needs an explicit version"
+      version_rb = Dir.glob(File.dirname(file) + "/../lib/*/version.rb").first or return nil
+      IO.readlines(version_rb).grep(/^.*VERSfION\s*=\s*"(.*?)".*$/) { $1 }.first
     end
 
     def handle_exceptions(&block)
@@ -334,10 +332,6 @@ module ShellOpts
       end
     end
 
-    def find_caller_file
-      caller.reverse.select { |line| line !~ /^\s*#{__FILE__}:/ }.last.sub(/:.*/, "").sub(/^\.\//, "")
-    end
-
     def self.compare_lines(text, spec)
       return true if text == spec
       return true if text =~ /[#\$\\]/

data/main

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift "#{Dir.getwd}/lib"
+#$LOAD_PATH.unshift "#{Dir.getwd}/lib"
 
-require 'shellopts'
+require_relative 'lib/shellopts.rb'
 
 #include ShellOpts::Message
 include ShellOpts::Verbose
@@ -10,7 +10,6 @@ include ShellOpts::Verbose
 
 #include ShellOpts::Messages
 #p ShellOpts::Messages.is_included?
-
 SPEC = %(
   Test
 
@@ -18,12 +17,12 @@ SPEC = %(
     An option
 )
 
-opts, args = ShellOpts.process(SPEC, ARGV, version: "--ver", version_number: "1.2.3", help: "-?,help")
+opts, args = ShellOpts.process(SPEC, ARGV, version: "--ver", version_number: "1.2.3")
 
 verb "Verbose default"
 (0..3).each { |i| verb i, "Verbose #{i}" }
 mesg "Message"
 notice "Notice"
 #debug "Debug"
-
+puts ShellOpts.instance.version_number
 

data/shellopts.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "forward_to"
   spec.add_dependency "constrain"
-  spec.add_dependency "ruby-terminfo-r3"
   spec.add_dependency "indented_io"
+  spec.add_dependency "tty-screen"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-terminfo-r3
+  name: indented_io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: indented_io
+  name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -159,7 +158,6 @@ files:
 homepage: http://github.com/clrgit/shellopts
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Parse command line options and arguments
 test_files: []