Use ruby 3.1 by default and update use of kwargs to support it

Author: codenamev

.ruby-version

@@ -1 +1 @@
-2.6.5
+3.1.0

Gemfile.lock

@@ -7,29 +7,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.1.1)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
+    psych (4.0.3)
+      stringio
     rake (12.3.3)
-    rdoc (6.3.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    stringio (3.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug (~> 11)
   git-commander!
   rake (~> 12.3)
   rdoc (~> 6.2)

git-commander.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "byebug", "~> 11"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rdoc", "~> 6.2"
   spec.add_development_dependency "rspec", "< 4.0"

lib/git_commander/command.rb

@@ -35,13 +35,13 @@ class Command
     # @yieldparam [Array<Option>] run_options an Array of
     #   Option instances defined from the above +options+
     #
-    def initialize(name, registry: nil, **options, &block)
+    def initialize(name, options = {}, &block)
       @name = name
       @description = options[:description]
       @summary = options[:summary]
       @block = block_given? ? block : proc {}
-      @registry = registry || GitCommander::Registry.new
-      @output = options[:output] || STDOUT
+      @registry = options[:registry] || GitCommander::Registry.new
+      @output = options[:output] || $stdout
 
       define_command_options(options)
     end
@@ -52,7 +52,7 @@ def initialize(name, registry: nil, **options, &block)
     #
     def run(run_options = [])
       assign_option_values(run_options)
-      Runner.new(self).run options.map(&:to_h).reduce(:merge)
+      Runner.new(self).run(options.map(&:to_h).reduce(:merge) || {})
     end
 
     # Appends the +message+ to the Command's {#output}
@@ -107,10 +107,10 @@ def add_option(option_type, options = {})
 
     private
 
-    def define_command_options(options)
-      @arguments = options_from_hash(options[:arguments])
-      @flags = options_from_hash(options[:flags])
-      @switches = options_from_hash(options[:switches])
+    def define_command_options(new_options)
+      @arguments = options_from_hash(new_options[:arguments])
+      @flags = options_from_hash(new_options[:flags])
+      @switches = options_from_hash(new_options[:switches])
     end
 
     def options_from_hash(hash)

lib/git_commander/command/runner.rb

@@ -17,7 +17,7 @@ def initialize(command)
 
       def run(options = {})
         GitCommander.logger.info "Running '#{command.name}' with arguments: #{options.inspect}"
-        instance_exec(options, &command.block)
+        instance_exec(**options, &command.block)
       end
 
       def say(message)

spec/lib/git_commander/command/loaders/raw_spec.rb

@@ -116,15 +116,16 @@
           end
         COMMANDS
 
-        native_plugin_loader_spy = spy("Native Plugin Loader")
+        native_plugin_loader_spy = instance_double(GitCommander::Plugin::Loader)
         native_plugin_loader_result = GitCommander::LoaderResult.new
         native_plugin_loader_result.plugins << GitCommander::Plugin.new(:git, registry: registry)
         expect(loader.result.commands).to be_empty
         expect(GitCommander::Plugin::Loader).to receive(:new).with(registry).and_return(native_plugin_loader_spy)
-        expect(native_plugin_loader_spy).to receive(:load).with(:git, {}).and_return(native_plugin_loader_result)
+        expect(native_plugin_loader_spy).to receive(:load).with(:git).and_return(native_plugin_loader_result)
 
         loader.load(raw_command_string)
 
+        expect(loader.result.errors.size).to be_zero
         expect(loader.result.plugins.size).to eq 1
         expect(loader.result.commands.size).to eq 2
 

spec/lib/git_commander/plugins/git_spec.rb

@@ -18,6 +18,8 @@
     stub_const "Rugged::Config", fake_rugged_config
     stub_const "Rugged::Repository", fake_rugged_repository
     allow(fake_rugged_config).to receive(:new).with(git_commander_config_path)
+    allow(mock_system).to receive(:run)
+    allow(mock_system).to receive(:say)
     allow(loader).to receive(:system).and_return(mock_system)
   end