gli 2.20.1 → 2.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3bbbc287b9e950b0e466400f14518010968c40a444cfa22486a51fa734134d
-  data.tar.gz: d4414c2e6c9f981a7ccbad490fea52f0519ec45a6a7634f44d9ed4cfad3b1c24
+  metadata.gz: 0017e490227889383633bf3d4fc2f85783aa50cd86587fd35b704f4fa036d1c3
+  data.tar.gz: 96667382f9092e22abc794e6967d969cecea12339675e46d8a2990df0067810c
 SHA512:
-  metadata.gz: b432b2e5d295bf7b3cf61683b1819353bca64158c5d07ed11135cd94ae8917dd352653f169f3306e1b26fcc9bce2199a5898d889f0819961b1260ee31fe5d710
-  data.tar.gz: 60d93d19cfdc621cbfee7189140447f0fa074354153c6d840e67fff516a6bf06ebb9668d3c420b6e66e6103c4ccfd969742cf26760c68c6f091f660b8d40a6aa
+  metadata.gz: 7b76b5845f5beb5907d7c11355c5e02ba22521f124c0486f5d1d08ae75969338bc23434ac680da72306cd761cdaac986fb01c966e8eb14a664eb84db95164e82
+  data.tar.gz: 55f76b94f22cf271a93bc0e0916c1a500175fbaa5a45a01c74372042baba384da6660f5860946bf803c7db14c23712f51249ee03c6a1a2d9d52c3da05638eaeb

data/.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   # See https://circleci.com/developer/orbs/orb/circleci/ruby
-  ruby: circleci/ruby@1.1.2
+  ruby: circleci/ruby@1.4.0
 jobs:                # keyword
   test:              # my name for the job
     parameters:      # keyword
@@ -16,7 +16,7 @@ jobs:                # keyword
       - run:
           command: "bin/setup"
       - run:
-          command: "bin/ci"
+          command: "bin/ci none"
 workflows:              # keyword
   all-rubies:           # my name for the workflow
     jobs:               # keyword

data/CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Contributions are welcome as long as they are part of my vision for GLI (or can be treated as optional to the user).  I am obsessive about backwards-compatibility, so you may need to default things to disable your features.  Sorry, not ready to bump a major version any time soon.
 
 1. Fork my Repository
-2. Create a branch off of gli-2 (**master is no longer the canonical branch**)
+2. Create a branch off of main
 3. Make your changes:
    * Please include tests and watch out for reek and roodi; i.e. keep your code clean
    * If you make changes to the gli executable or the scaffolding, please update the cucumber features
@@ -19,5 +19,3 @@ Contributions are welcome as long as they are part of my vision for GLI (or can
    * Use <code># :nodoc:</code> for methods that a _user_ of GLI should not call (but still please do document all methods)
 4. Make sure your branch will merge with my gli-2 branch (or just rebase your branch from my gli-2 branch)
 5. Create a pull request explaining your change
-
-

data/Rakefile

@@ -106,5 +106,5 @@ end
 desc 'Publish rdoc on github pages and push to github'
 task :publish_rdoc => [:rdoc,:publish]
 
-task :default => [:test,:features]
+task :default => ["test:unit", "test:integraton"]
 

data/lib/gli/app_support.rb

@@ -15,6 +15,7 @@ module GLI
       switches.clear
       flags.clear
       @commands = nil
+      @command_missing_block = nil
       @commands_declaration_order = []
       @flags_declaration_order = []
       @switches_declaration_order = []
@@ -72,7 +73,8 @@ module GLI
                                                 :default_command => @default_command,
                                                 :autocomplete => autocomplete,
                                                 :subcommand_option_handling_strategy => subcommand_option_handling_strategy,
-                                                :argument_handling_strategy => argument_handling_strategy)
+                                                :argument_handling_strategy => argument_handling_strategy,
+                                                :command_missing_block => @command_missing_block)
 
         parsing_result = gli_option_parser.parse_options(args)
         parsing_result.convert_to_openstruct! if @use_openstruct

data/lib/gli/dsl.rb

@@ -201,9 +201,14 @@ module GLI
       end
       clear_nexts
       @next_arguments = []
+      command
     end
     alias :c :command
 
+    def command_missing(&block)
+      @command_missing_block = block
+    end
+
     def flags_declaration_order # :nodoc:
       @flags_declaration_order ||= []
     end

data/lib/gli/gli_option_parser.rb

@@ -16,7 +16,7 @@ module GLI
       command_finder       = CommandFinder.new(commands,
                                                :default_command => (options[:default_command] || :help),
                                                :autocomplete => options[:autocomplete])
-      @global_option_parser = GlobalOptionParser.new(OptionParserFactory.new(flags,switches,accepts),command_finder,flags)
+      @global_option_parser = GlobalOptionParser.new(OptionParserFactory.new(flags,switches,accepts),command_finder,flags, :command_missing_block => options[:command_missing_block])
       @accepts              = accepts
       if options[:argument_handling_strategy] == :strict && options[:subcommand_option_handling_strategy] != :normal
         raise ArgumentError, "To use strict argument handling, you must enable normal subcommand_option_handling, e.g. subcommand_option_handling :normal"
@@ -36,10 +36,11 @@ module GLI
   private
 
     class GlobalOptionParser
-      def initialize(option_parser_factory,command_finder,flags)
+      def initialize(option_parser_factory,command_finder,flags,options={})
         @option_parser_factory = option_parser_factory
         @command_finder        = command_finder
         @flags                 = flags
+        @options               = options
       end
 
       def parse!(parsing_result)
@@ -50,7 +51,21 @@ module GLI
                        else
                          parsing_result.arguments.shift
                        end
-        parsing_result.command        = @command_finder.find_command(command_name)
+        parsing_result.command        = begin
+          @command_finder.find_command(command_name)
+        rescue UnknownCommand => e
+          raise e unless @options[:command_missing_block]
+          command = @options[:command_missing_block].call(command_name.to_sym,parsing_result.global_options)
+          if command
+            unless command.is_a?(Command)
+              raise UnknownCommand.new("Expected the `command_missing` block to return a GLI::Command object, got a #{command.class.name} instead.")
+            end
+          else
+            raise e
+          end
+          command
+        end
+
         unless command_name == 'help'
           verify_required_options!(@flags, parsing_result.command, parsing_result.global_options)
         end
@@ -143,7 +158,7 @@ module GLI
             break
           rescue UnknownCommand
             arguments.unshift(next_command_name)
-            # Although command finder could certainy know if it should use
+            # Although command finder could certainly know if it should use
             # the default command, it has no way to put the "unknown command"
             # back into the argument stack.  UGH.
             unless command.get_default_command.nil?

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.20.1'
+    VERSION = '2.21.0'
   end
 end

data/test/unit/gli_test.rb

@@ -783,6 +783,36 @@ class GLITest < MiniTest::Test
     assert_equal %w(-f some_flag foo bar blah),argv
   end
 
+  def test_missing_command
+    @called = false
+    @app.command_missing do |command_name, global_options|
+      @app.command command_name do |c|
+        c.action do
+          @called = true
+        end
+      end
+    end
+
+    assert_equal 0, @app.run(['foobar']),"Expected exit status to be 0"
+    assert @called,"Expected missing command to be called"
+  end
+
+  def test_missing_command_not_handled
+    @app.command_missing do |command_name, global_options|
+      # do nothing, i.e. don't handle the command
+    end
+
+    assert_equal 64,@app.run(['foobar']),"Expected exit status to be 64"
+  end
+
+  def test_missing_command_returns_non_command_object
+    @app.command_missing do |command_name, global_options|
+      true
+    end
+
+    assert_equal 64,@app.run(['foobar']),"Expected exit status to be 64"
+  end
+
   private
 
   def do_test_flag_create(object)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.20.1
+  version: 2.21.0
 platform: ruby
 authors:
 - David Copeland
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-27 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake