shellopts 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e1be2ce8220b6bec3fac551a2c44fef7ca52fa4cf1f1565e15836387a85bd9
-  data.tar.gz: b5872f570a32ff841cb632f18e390eb060fe746cd62d09347dd449782ce529ef
+  metadata.gz: 53f85a46df1cf2280e591fbf996781c73e3ddb3dfe88ede023f6ef29f26995a4
+  data.tar.gz: 0ffb37c5f3843e92676004994600687dec0db89afccd20dea984998692e160a8
 SHA512:
-  metadata.gz: '08b6078dbf4690562e7e4d68cdbd27f2e840ba6440dbe8cbcb0aef932e27b2db959608bf3630f5725d2d8629691839546a41c72d6ea9f178c662a61e984b43be'
-  data.tar.gz: 49bd8f950a6f1e3ce457b974b88301f4052a597578f2379680f6b7bed8581f522860a679d9a9600427b37927ea5f9a3f110dbe857be14c564cd4e7c221b361ff
+  metadata.gz: e67de152c69ae86557ec6898e7b0402d4188b8ca57a53128cfd7b3521655e80aadbc6114bcf943101f1a4012216604703dba54ae2a6921019d228b0b343b1837
+  data.tar.gz: bfe12de981b2504514cd42c81f64511d01fe7948d1d8a563b2f34473d30fa8cd7e5cc22f550e9e81bd3a31ff3da863adbc60dd33ffd9fed53ea69d0bc8907a62

data/lib/shellopts/argument_type.rb

@@ -60,6 +60,17 @@ module ShellOpts
     class FileArgument < ArgumentType
       attr_reader :kind
 
+      def subject # Used in error messages
+        @subject ||= 
+            case kind
+              when :file, :efile, :nfile, :ifile, :ofile; "file"
+              when :dir, :edir, :ndir; "directory"
+              when :path, :epath, :npath; "path"
+            else
+              raise ArgumentError
+            end
+      end
+
       def initialize(kind)
         constrain kind, :file, :dir, :path, :efile, :edir, :epath, :nfile, :ndir, :npath, :ifile, :ofile
         @kind = kind 
@@ -128,15 +139,6 @@ module ShellOpts
 
     protected
       def match_path(name, literal, kind, method, mode)
-        subject = 
-            case kind
-              when :file, :efile, :nfile, :ifile, :ofile; "file"
-              when :dir, :edir, :ndir; "directory"
-              when :path, :epath, :npath; "path"
-            else
-              raise ArgumentError
-            end
-
         # file exists and is the rigth type?
         if File.send(method, literal)
           if mode == :new
@@ -174,7 +176,7 @@ module ShellOpts
               set_message "Illegal path in #{name}: #{literal}"
             end
           else
-            set_message "Can't find #{literal}"
+            set_message "Can't find #{subject} #{literal}"
           end
         end
       end

data/lib/shellopts/program.rb

@@ -315,12 +315,14 @@ module ShellOpts
   class Program < Command
     # Accessors for standard options values that are not affected if the option
     # is renamed
+    attr_accessor :__silent__
     attr_accessor :__quiet__
     attr_accessor :__verbose__
     attr_accessor :__debug__
 
     def initialize
       super
+      @__silent__ = false
       @__quiet__ = false
       @__verbose__ = 0
       @__debug__ = false

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.3.1"
+  VERSION = "2.4.1"
 end

data/lib/shellopts.rb

@@ -110,6 +110,9 @@ module ShellOpts
     # Version of client program. If not nil, a --version option is added to the program
     attr_reader :version
 
+    # Automatically add a -s and a --silent option if true
+    attr_reader :silent
+
     # Automatically add a -q and a --quiet option if true
     attr_reader :quiet
 
@@ -140,6 +143,7 @@ module ShellOpts
         # Options
         help: true, 
         version: true, 
+        silent: nil,
         quiet: nil,
         verbose: nil,
         debug: nil,
@@ -157,6 +161,7 @@ module ShellOpts
       @name = name || File.basename($PROGRAM_NAME)
       @help = help
       @version = version || (version.nil? && !version_number.nil?)
+      @silent = silent
       @quiet = quiet
       @verbose = verbose
       @debug = debug
@@ -177,10 +182,13 @@ module ShellOpts
 
         help_spec = (@help == true ? "-h,help" : @help)
         version_spec = (@version == true ? "--version" : @version)
+        silent_spec = (@silent == true ? "-q,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
         @quiet_option = 
             ast.inject_option(quiet_spec, "Quiet", "Do not write anything to standard output") if @quiet
         @verbose_option = 
@@ -224,6 +232,8 @@ module ShellOpts
           puts version_number
           exit
         else
+          # Assign standard options. The targets doesn't change if the option is renamed
+          @program.__silent__ = @program.__send__(:"#{@silent_option.ident}?") if @silent
           @program.__quiet__ = @program.__send__(:"#{@quiet_option.ident}?") if @quiet
           @program.__verbose__ = @program.__send__(:"#{@verbose_option.ident}") if @verbose
           @program.__debug__ = @program.__send__(:"#{@debug_option.ident}?") if @debug
@@ -393,19 +403,35 @@ module ShellOpts
     end
   end
 
-  def self.process(spec, argv, quiet: nil, verbose: nil, debug: nil, **opts)
+  def self.process(spec, argv, silent: nil, quiet: nil, verbose: nil, debug: nil, **opts)
+    constrain silent, String, true, false, nil
     constrain quiet, String, true, false, nil
+    silent = silent.nil? ? Message.is_included? || Verbose.is_included? : silent
     quiet = quiet.nil? ? Message.is_included? || Verbose.is_included? : quiet
     verbose = verbose.nil? ? ::ShellOpts::Verbose.is_included? : verbose
     debug = debug.nil? ? Debug.is_included? : debug
-    ShellOpts.process(spec, argv, quiet: quiet, verbose: verbose, debug: debug, **opts)
+    ShellOpts.process(spec, argv, silent: silent, quiet: quiet, verbose: verbose, debug: debug, **opts)
   end
 
+  # The instance is a ShellOpts object. 'instance.program' and 'instance.argv'
+  # is the same as the values returned from ShellOpts.process
   @instance = nil
   def self.instance?() !@instance.nil? end
   def self.instance() @instance or raise Error, "ShellOpts is not initialized" end
   def self.instance=(instance) @instance = instance end
-  def self.shellopts() instance end
+  def self.shellopts() instance end # TODO: Yt
+
+  # Returns the corresponding option status on the program object. Note that
+  # the "bare" ShellOpts standard option methods (eg. ShellOpts.silent)
+  # determines if an option can be used while the query methods (eg.
+  # ShellOpts.silent?) reports if the option was present on the command line
+  #
+  # The methods below are implemented using the name-independent members of
+  # Program: __silent__ etc.
+  def self.silent?() instance.program.__silent__ end
+  def self.quiet?() silent? || instance.program.__quiet__ end
+  def self.verbose?(level = 1) level <= instance.program.__verbose__ end
+  def self.debug?() instance.program.__debug__ end
 
   def self.error(subject = nil, message)
     instance.error(subject, message) if instance? # Never returns
@@ -419,30 +445,29 @@ module ShellOpts
     exit 1
   end
 
+  # Emit a message on standard error. The --silent option suppresses these messages
   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
+    $stderr.send(method, message) if !silent?
   end
 
+  # Emit a message on standard output. The --quiet option suppresses these messages
   def self.mesg(message, newline: true)
     method = newline ? :puts : :print
-    $stdout.send(method,  message) if !instance.quiet || !instance.program.__quiet__
+    $stdout.send(method, message) if !quiet?
   end
 
+  # Emit a message on standard output. The --verbose option controls these messages
   def self.verb(level = 1, message, newline: true)
     method = newline ? :puts : :print
-    $stdout.send(method,  message) if instance.verbose && level <= instance.program.__verbose__
+    $stdout.send(method, message) if verbose?(level)
   end
 
   def self.debug(message, newline: true)
     method = newline ? :puts : :print
-    $stdout.send(method,  message) if instance.debug && instance.program.__debug__
+    $stdout.send(method, message) if debug?
   end
 
-  def self.quiet?() instance.program.quiet? end
-  def self.verbose?(level = 1) level <= instance.program.verbose end
-  def self.debug?() instance.program.debug? end
-
   module Message
     @is_included = false
     def self.is_included?() @is_included end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-28 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to