commander-openflighthpc 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b5727f3d10b876b81b223b19fcac47a56cf293a66b34305b96517976b04613
-  data.tar.gz: e047187d76098db98d240770dca013806512628ad1dcd54c613dc2627a7538d7
+  metadata.gz: b083e62e1f920ec5cbd706e7fda06f9ea7377de383b36a9778c5b191e63b9fc4
+  data.tar.gz: a6de7d045ea35b3fefd4cc2ca77e64cd4bb5bd29e39eace7cd9047c372e684a0
 SHA512:
-  metadata.gz: e5e8f5850885c9bf9540b82b7a7866fdb9a317c32c94501e51cef85d65711fe5037ffc7924f68c206ff4654e2f998ae237e5fbb36b9495f9619aaba3d95418a4
-  data.tar.gz: a6840ebf11d96c875e45a468ce492e2c748f20c3298121bc338b2f565d9b8f8c3dff6d278340d609f69ca98f8c0e8b52af3e40a4b93385d99dbc5fc4ae2c3c1c
+  metadata.gz: f37c40606f5ae5d2a0d05a13d0564e2f74d0a303a813bbf11c5f09eb37bdc53bbfd2541534a73c4fa399a8498428abff8fc3edf94f647447916a996af4168e99
+  data.tar.gz: 76a7afbab9913ff565e3d745f49ee532fd11cf84ad8624e858f309cdec856a6fe58b20bb9499ed882e9d1c3701620f2e8cb2cb0683db1128dbe2235e4b6b6f86

data/lib/commander/cli.rb

@@ -5,8 +5,8 @@ module Commander
     ##
     # Wrapper run command with error handling
     def run!(*args)
-      Commander.traceable_error_handler(*args) do |new_args|
-        run(*new_args)
+      Commander::ErrorHandler.new(program(:name)).start do |handler|
+        run(*handler.parse_trace(*args))
       end
     end
 

data/lib/commander/error_handler.rb

@@ -1,3 +1,5 @@
+require 'paint'
+
 module Commander
   ##
   # Internal error class to delay rendering help text
@@ -17,56 +19,44 @@ module Commander
     end
   end
 
-  INTERRUPT_MSG = 'Received Interrupt!'
-
-  def self.traceable_error_handler(*args)
-    # Determines if there is a --trace flag before a --
-    trace_index = args.index do |a|
-      if a == '--trace'
-        true
-      elsif a == '--'
-        break
-      else
-        false
+  ErrorHandler = Struct.new(:program_name, :trace) do
+    def parse_trace(*raw_args)
+      # Do not modify the original array
+      args = raw_args.dup
+
+      # Determines if there is a --trace flag before a --
+      trace_index = args.index do |a|
+        if a == '--trace'
+          self.trace = true
+        elsif a == '--'
+          break
+        else
+          false
+        end
       end
-    end
-
-    # Removes the --trace flag if required
-    new_args = args.dup
-    new_args.delete_at(trace_index) if trace_index
 
-    # Start the actual error handler
-    error_handler(!!trace_index) do
-      yield(new_args) if block_given?
+      # Removes the --trace flag if required
+      args.tap { |a| a.delete_at(trace_index) if trace_index }
     end
 
-  rescue Interrupt
-    # Start Rescuing Interrupt Immediately
-    $stderr.puts INTERRUPT_MSG
-    exit 130
-  end
-
-  def self.error_handler(trace = false)
-    yield if block_given?
-  rescue StandardError, Interrupt => e
-    $stderr.puts e.full_message if trace
-
-    error_msg = e.message
-    exit_code = e.respond_to?(:exit_code) ?  e.exit_code.to_i : 1
-    case e
-    when InternalCallableError
-      # See: https://shapeshed.com/unix-exit-codes/
-      exit_code = 126
-      $stderr.puts error_msg
-      e.call
-    when Interrupt
-      $stderr.puts INTERRUPT_MSG
-      # See: https://shapeshed.com/unix-exit-codes/
-      exit_code = 130
-    else
-      $stderr.puts error_msg
+    def start
+      yield(self) if block_given?
+    rescue => e
+      $stderr.puts e.full_message if trace
+
+      error_msg = "#{Paint[program_name, '#2794d8']}: #{Paint[e.to_s, :red, :bright]}"
+      exit_code = e.respond_to?(:exit_code) ?  e.exit_code.to_i : 1
+      case e
+      when InternalCallableError
+        # See: https://shapeshed.com/unix-exit-codes/
+        exit_code = 126
+        $stderr.puts error_msg
+        e.call
+      else
+        $stderr.puts error_msg
+      end
+      exit(exit_code)
     end
-    exit(exit_code)
   end
 end
 

data/lib/commander/runner.rb

@@ -1,4 +1,3 @@
-require 'paint'
 require 'ostruct'
 
 module Commander
@@ -91,18 +90,16 @@ module Commander
         # Return generic help
         run_help_command('')
       end
-    rescue => e
-      msg = "#{Paint[program(:name), '#2794d8']}: #{Paint[e.to_s, :red, :bright]}"
-      new_error = e.exception(msg)
-
-      if INBUILT_ERRORS.include?(new_error.class)
-        new_error = InternalCallableError.new(e.message) do
+    rescue => original
+      error = original
+      if INBUILT_ERRORS.include?(error.class)
+        error = InternalCallableError.new(error.message) do
           $stderr.puts "\nUsage:\n\n"
           name = active_command? ? active_command.name : :error
           run_help_command([name])
         end
       end
-      raise new_error
+      raise error
     end
 
     ##

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander-openflighthpc
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Alces Flight Ltd
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline