shellopts 2.9.0 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c095c6dc48613d922a0e45d567422fa09d3907fb266415b5f37faab5d1d61a1
-  data.tar.gz: 76824b5dd2abfd66d919ddca7ba7d47a219d653c7ed32fb60c0a09382d9d7f88
+  metadata.gz: 66e69788996dbb1a8974cfaed3fb9bb41440af20c8e9fe2b3b01bdaa01141a2c
+  data.tar.gz: 4acccf9621525437415b118fe7011b59278cc803626103dff2dfd6ac2d06f9ba
 SHA512:
-  metadata.gz: 4a5b67e387057c0da8146ea4e65b08015a65d4834710c43a6fb42eacccad4981ad74e4760941e0d41e40b1b4f99d80b9d4f11b35d5b7c8f8d5fd048bc20d5a17
-  data.tar.gz: 72f40f34cdea62cd58ed6990f45f037b061853539d6face68e4194827f04a0895c288b12260d0f0640fa8fb3e15727894d173046a774910e7e839774af4b4fcc
+  metadata.gz: a0b9cfdb793d8761ca939dd7c9925b2fed4749996496d74eb070c9b086490d6f0cbafe536f242799cc8ba3254d8377f3f955bb62a16c4ba95b26bd894bd4da5c
+  data.tar.gz: ce8019b77f055221ebf8823dfb7dcb0268f0a3bb7893a82a1127e23901fdbda94735846f6e08a88704259951bede61a8edd627c20de18bc9e89d08a926e58ae3

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.9.0"
+  VERSION = "2.9.2"
 end

data/lib/shellopts.rb

@@ -135,6 +135,7 @@ module ShellOpts
 
     # Use exceptions instead of ShellOpts's error methods. Default is
     # ShellOpts.exception that itself defalts to false. Mostly used for debug
+    # when you want a stack trace instead of a user-readable error message
     attr_accessor :exception
 
     # Debug: Internal variables made public
@@ -163,7 +164,10 @@ module ShellOpts
       @file = file
       @help = help
       @version_number = version_number || (version && find_version_number)
+      p version
       @version = !@version_number.nil? && version
+      p @version
+      exit
       @silent = silent
       @quiet = quiet
       @verbose = verbose
@@ -243,8 +247,7 @@ module ShellOpts
       self
     end
 
-    # Compile +spec+ and interpret +argv+. Returns a tuple of a
-    # ShellOpts::Program and ShellOpts::Args object
+    # Compile +spec+ and interpret +argv+. Returns a ShellOpts object
     #
     def process(spec, argv)
       compile(spec)
@@ -317,6 +320,26 @@ module ShellOpts
       IO.readlines(version_rb).grep(/^.*VERSION\s*=\s*"(.*?)".*$/) { $1 }.first
     end
 
+    def find_version_number
+      # Uninstalled program called using 'bundle exec'
+      if version_rb = Dir.glob(File.dirname(file) + "/../lib/*/version.rb").first
+        version = IO.readlines(version_rb).grep(/^.*VERSION\s*=\s*"(.*?)".*$/) { $1 }.first
+
+      # Installed program
+      elsif spec = Gem::Specification.find_by_path($0)
+        version = spec.version.to_s
+
+      # Installed program using RVM wrappers
+      else
+        spec = Gem::Specification.find_all
+           .select { |s| s.executables.include?(File.basename($0)) }
+           .max_by { |s| s.version }
+        version = spec&.version.to_s
+      end
+
+      version
+    end
+
     def handle_exceptions(&block)
       return yield if ::ShellOpts.exception
       begin
@@ -447,16 +470,22 @@ module ShellOpts
 
   def self.error(message, exit: 1)
     raise Error.new(message) if exception
-    instance.error(message, exit: exit) if instance? # Never returns
-    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
-    handle_exit(exit)
+    if instance?
+      instance.error(message, exit: exit)
+    else
+      $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
+      handle_exit(exit)
+    end
   end
 
   def self.failure(message, exit: 1)
     raise Error.new(message) if exception
-    instance.failure(message, exit: exit) if instance?
-    $stderr.puts "#{File.basename($PROGRAM_NAME)}: #{message}"
-    handle_exit(exit)
+    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

metadata

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