shellopts 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 485e81c58a890240d2a77e24a5f3a7a291551da968f395f3aaa4f5b2dac3cc9b
-  data.tar.gz: 2d6c92ca01ce1207f6311cf9b0e9bab3e555e309142ba6916d589396f215afb8
+  metadata.gz: b2f378c7e7c04297221bfae81065ef06699e93b2dc4fda892b210ef4702c5836
+  data.tar.gz: f5d83b09b371aebd7cc07e73905edffb2f9f834ba5e382894277310e984e7ecc
 SHA512:
-  metadata.gz: 31f3801b98585bed378ff77ae6632d18951ef37a49b3cfde843df9718dc5b46da40e777dff3f7b29e01bf8b32f2ebe0e1e7ab76ddb66744a461acf0061f75b1f
-  data.tar.gz: d72bcf1d58e9afdf4f92477af1f2824e01031a46b4cacf5283878ce1045ad91dd930c1c1a15cd588a2552a4ad90fe5ac3add6019b50e099693aa184b7747153f
+  metadata.gz: 6255a64a99ceefe0dc0a7a3195976d42b2db6b3a28d779cbeefbc9f36380e46a762939e2062ff9f32f4f78bd5bff8122606b5102d9d8473e86c0a742cd7db479
+  data.tar.gz: b54f74a5d8fd251d1492667bd8e1340c1f17a3e96936f423efd61e82fe665294936c1edd1ac9ac4ab9df118450ccefafcda117f84ef4e0726d78159196e075cf

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.11"
+  VERSION = "2.0.12"
 end

data/lib/shellopts.rb

@@ -192,23 +192,23 @@ module ShellOpts
     #
     # #error is supposed to be used when the user made an error and the usage
     # is written to help correcting the error
-    #
     def error(subject = nil, message)
-      saved = $stdout
-      $stdout = $stderr
       $stderr.puts "#{name}: #{message}"
-      Formatter.usage(grammar)
-      exit 1
-    ensure
-      $stdout = saved
+      saved = $stdout
+      begin
+        $stdout = $stderr
+        Formatter.usage(grammar)
+        exit 1
+      ensure
+        $stdout = saved
+      end
     end
 
     # Write error message to standard error and terminate program with status 1
     #
-    # #failure is supposed to be used the used specified the correct arguments
-    # but something went wrong during processing. Since the used didn't cause
-    # the problem, only the error message is written
-    #
+    # #failure doesn't print the program usage because is supposed to be used
+    # when the user specified the correct arguments but something else went
+    # wrong during processing
     def failure(message)
       $stderr.puts "#{name}: #{message}"
       exit 1
@@ -222,7 +222,6 @@ module ShellOpts
 
     # Print help for the given subject or the full documentation if +subject+
     # is nil. Clears the screen beforehand if :clear is true
-    #
     def help(subject = nil, clear: true)
       node = (subject ? @grammar[subject] : @grammar) or
           raise ArgumentError, "No such command: '#{subject&.sub(".", " ")}'"
@@ -333,7 +332,17 @@ module ShellOpts
   def self.instance=(instance) @instance = instance end
   def self.shellopts() instance end
 
-  forward_self_to :instance, :error, :failure
+  def self.error(subject = nil, message)
+    instance.error(subject, message) if instance? # Never returns
+    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
+    exit 1
+  end
+
+  def self.failure(message)
+    instance.failure(message) if instance?
+    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
+    exit 1
+  end
 
   # The Include module brings the reporting methods into the namespace when
   # included

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to