shellopts 2.8.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef632532d3cd4b1aa83c037e246b18000d8b3852163c2a17e59c4ca9af11a1b2
-  data.tar.gz: 17ca0bc5a4a8f5b29ceb4d130339608fbfe0e94925d05dd9185f0b4304cbdaf2
+  metadata.gz: 3dcef062b0b6bf1df9e6596e7410dc51a85c2b990fecfc8e7fede565e162fc2e
+  data.tar.gz: cf8bdddb542e324a0efcdef4fae00ce76338994263e4f603bd22149f5acd7777
 SHA512:
-  metadata.gz: e813c56df7e0680acc25733cc89afe7969cdecf592e555fb484d05fe8994f993d08e949198ef9b328018a1dfb7b7de7f823bb1b4f4e4ac538e1dbde8f79397cd
-  data.tar.gz: d083566cdc01944d3a30894e94ee025b73d2be9f70310b5df9184e50f701184117cfbfdd757421d7d9ae1e66be15de22d1522f86d477003a9f15a037cda1f5ca
+  metadata.gz: 93b9d18edd54a015170350865e460625cef1a6fa42918b386634912260c900041a76f486135813ef89341bec64355e2d29ef011f36f234143d42874d8fe0908a
+  data.tar.gz: 8434df86e5ef6238975a018530509de6d7fcef69bbaa63d4e6b2f33f2d738e74c5232d691172ff6f475cbe78995e62c7966b51517202ba6a440517b76a4843df

data/lib/shellopts/program.rb

@@ -104,7 +104,6 @@ module ShellOpts
       keys.filter_map { |key| __option_values__.key?(key) && [key, self.__send__(key)] }.to_h
     end
 
-
     # Subcommand identifier or nil if not present. #subcommand is often used in
     # case statement to branch out to code that handles the given subcommand:
     #
@@ -123,9 +122,9 @@ module ShellOpts
     # (#<identifier>!) are often used instead of #subcommand! to get the
     # subcommand
     #
-    # Note: Can be overridden by a subcommand declaration (but not an
-    # option), in that case use #__subcommand__! or
-    # ShellOpts.subcommand!(object) instead
+    # Note: Can be overridden by a subcommand declaration (but not an option),
+    # in that case use #__subcommand__! or ShellOpts.subcommand!(object)
+    # instead
     #
     def subcommand!() __subcommand__! end
 

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.8.0"
+  VERSION = "2.9.1"
 end

data/lib/shellopts.rb

@@ -268,14 +268,14 @@ 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(message)
+    def error(message, exit: 1)
       raise ShellOpts::Error.new(message) if ::ShellOpts.exception
       $stderr.puts "#{name}: #{message}"
       saved = $stdout
       begin
         $stdout = $stderr
         Formatter.usage(grammar)
-        exit 1
+        ::ShellOpts.handle_exit(exit)
       ensure
         $stdout = saved
       end
@@ -286,10 +286,10 @@ module ShellOpts
     # #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)
+    def failure(message, exit: 1)
       raise ShellOpts::Failure.new(message) if ::ShellOpts.exception
       $stderr.puts "#{name}: #{message}"
-      exit 1
+      ::ShellOpts.handle_exit(exit)
     end
 
     # Print usage
@@ -445,18 +445,24 @@ module ShellOpts
   def self.verbose?(level = 1) level <= instance.program.__verbose__ end
   def self.debug?() instance.program.__debug__ end
 
-  def self.error(message)
+  def self.error(message, exit: 1)
     raise Error.new(message) if exception
-    instance.error(message) if instance? # Never returns
-    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
-    exit 1
+    if instance?
+      instance.error(message, exit: exit)
+    else
+      $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
+      handle_exit(exit)
+    end
   end
 
-  def self.failure(message)
+  def self.failure(message, exit: 1)
     raise Error.new(message) if exception
-    instance.failure(message) if instance?
-    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
-    exit 1
+    if instance?
+      instance.failure(message, exit: exit)
+    else
+      $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
+      handle_exit(exit)
+    end
   end
 
   # Emit a message on standard error. The --silent option suppresses these messages
@@ -494,6 +500,14 @@ module ShellOpts
     end
   end
 
+private
+  # Exit program with the given status if an integer and status 1 if not. Do
+  # not exit if status is falsy
+  def self.handle_exit(value)
+    exit(value.is_a?(Integer) ? value : 1) if value
+  end
+
+public
   module Message
     @is_included = false
     def self.is_included?() @is_included end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Claus Rasmussen