commander-openflighthpc 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c0a592cbb12504621312f36cdddf097c323c86a950e3f7d7c37a4562c4abbf1
-  data.tar.gz: 649c690cdc63d4a0d1ce417c25c99200be22f801b413cf0ec845fcb56c556c52
+  metadata.gz: a40df29e6a019c3ff4bac1776e2752ceefd52ac7cf79f5e6d5d99ec32266c59b
+  data.tar.gz: 0fb111ee4776fd2fbcb359781e740f30572b7b0f6fb9474ddc014b11aa6c8da9
 SHA512:
-  metadata.gz: fcb2dbdcf5e576bcdca50f36630112abb7fc0ca41d6571a24ae8712356f47c776bf0da0fda254c741d59e980b08d406e6bdd634d2a0bec131741237abada85de
-  data.tar.gz: 379386f9349b2db8d3745133101fef5971cc84e2013567fb439ec01cb3ceabe17150fc219e082a9207d499254b4ff29ebab0b33e90a3b85ad2aa200430643dc0
+  metadata.gz: 27a69ae0244b52ddd67288b77a54cda2b0e54bc115c2212960fed7761d7aefe75fc86fb83114b328283c136aab097ae8cfa28f8be061d68891ed1900b87ff4d9
+  data.tar.gz: 87a25ff68ff7c522989e4c67002b6903433af6ace6a12779d23855f1be4e7d2b5257f33bd452ac708a439344f83c51ba911014b117dac90f01bfd144c8bd8714

data/lib/commander/command.rb

@@ -9,6 +9,8 @@ OptionParser.prepend Commander::Patches::ImplicitShortTags
 OptionParser.prepend Commander::Patches::DecimalInteger
 
 module Commander
+  class SubCommandGroupError < StandardError; end
+
   class Command
     prepend Patches::ValidateInputs
 
@@ -159,7 +161,7 @@ module Commander
     alias action when_called
 
     ##
-    # Handles displaying subcommand help. By default it will set the action to 
+    # Handles displaying subcommand help. By default it will set the action to
     # display the subcommand if the action hasn't already been set
 
     def sub_command_group?
@@ -168,11 +170,7 @@ module Commander
 
     def sub_command_group=(value)
       @sub_command_group = value
-      if @when_called.empty?
-        self.action {
-          exec("#{$0} #{ARGV.join(" ")} --help")
-        }
-      end
+      self.action { raise SubCommandGroupError } if value
     end
 
     def configure_sub_command(runner)

data/lib/commander/patches/validate_inputs.rb

@@ -27,7 +27,10 @@ module Commander
 
       def assert_correct_number_of_args!(args)
         return if primary_command_word == 'help'
-        if too_many_args?(args)
+        too_many = too_many_args?(args)
+        if too_many && sub_command_group?
+          raise CommandUsageError, "unrecognised command. Please select from the following:"
+        elsif too_many
           raise CommandUsageError, "excess arguments for command '#{primary_command_word}'"
         elsif too_few_args?(args)
           raise CommandUsageError, "insufficient arguments for command '#{primary_command_word}'"

data/lib/commander/runner.rb

@@ -3,20 +3,37 @@ require 'paint'
 module Commander
   class Runner
     DEFAULT_ERROR_HANDLER = lambda do |runner, e|
-      $stderr.puts "#{Paint[runner.program(:name), '#2794d8']}: #{Paint[e.to_s, :red, :bright]}"
+      error_msg = "#{Paint[runner.program(:name), '#2794d8']}: #{Paint[e.to_s, :red, :bright]}"
       case e
       when OptionParser::InvalidOption,
            Commander::Runner::InvalidCommandError,
            Commander::Patches::CommandUsageError
-        $stderr.puts "\nUsage:\n\n"
-        args = ARGV.reject{|o| o[0] == '-'}
-        if runner.command(topic = args[0..1].join(" "))
-          runner.command("help").run(topic)
-        elsif runner.command(args[0])
-          runner.command("help").run(args[0])
+        # Display the error message for a specific command. Most likely due to
+        # invalid command syntax
+        if cmd = runner.active_command
+          $stderr.puts error_msg
+          $stderr.puts "\nUsage:\n\n"
+          runner.command('help').run(cmd.name)
+        # Display the main app help text when called without `--help`
+        elsif runner.args_without_command_name.empty?
+          $stderr.puts "Usage:\n\n"
+          runner.command('help').run(:error)
+        # Display the main app help text when called with arguments. Mostly
+        # likely an invalid syntax error
         else
-          runner.command("help").run(:error)
+          $stderr.puts error_msg
+          $stderr.puts "\nUsage:\n\n"
+          runner.command('help').run(:error)
         end
+      # Display the help text for sub command groups when called without `--help`
+      when SubCommandGroupError
+        if cmd = runner.active_command
+          $stderr.puts "Usage:\n\n"
+          runner.command('help').run(cmd.name)
+        end
+      # Catch all error message for all other issues
+      else
+        $stderr.puts error_msg
       end
       exit(1)
     end

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander-openflighthpc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alces Flight Ltd
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline