Refactors command runner to call blocks with a hash of params rather than array of Command::Option

Author: codenamev

lib/git_commander/command.rb

@@ -11,10 +11,11 @@ class Option
       attr_reader :default, :description, :name
       attr_writer :value
 
-      def initialize(name:, default: nil, description: nil)
+      def initialize(name:, default: nil, description: nil, value: nil)
         @name = name.to_sym
         @default = default
         @description = description
+        @value = value
       end
 
       def value
@@ -28,6 +29,10 @@ def ==(other)
           other.description == description
       end
       alias eql? ==
+
+      def to_h
+        { name => value }
+      end
     end
 
     def initialize(name, registry: nil, **options, &block)
@@ -43,7 +48,8 @@ def initialize(name, registry: nil, **options, &block)
 
     def run(run_options = [])
       GitCommander.logger.info "Running '#{name}' with arguments: #{@options.inspect}"
-      instance_exec(run_options, &@block)
+      assign_option_values(run_options)
+      instance_exec(options.map(&:to_h).reduce(:merge), &@block)
     end
 
     def say(message)
@@ -73,6 +79,15 @@ def options_from_hash(hash)
       Array(hash).map { |v| Option.new(**v) }
     end
 
+    def assign_option_values(command_options)
+      @options.each do |option|
+        command_option = command_options.find { |o| o.name == option.name }
+        next if command_option.nil?
+
+        option.value = command_option.value
+      end
+    end
+
     def description_help
       return if description.to_s.empty?
 

spec/lib/git_commander/command_spec.rb

@@ -3,8 +3,9 @@
 require "spec_helper"
 
 describe GitCommander::Command do
+  let(:output) { spy("output") }
+
   it "runs the block registered to it" do
-    output = spy("output")
     command = described_class.new(:wtf, output: output) do
       say "I'm on a boat!"
     end
@@ -13,19 +14,30 @@
   end
 
   it "runs the block registered to it passing arguments" do
-    output = spy("output")
-    command = described_class.new(:wtf, output: output) do |vehicle:|
+    command = described_class.new(:wtf, output: output, arguments: [{ name: :vehicle }]) do |vehicle:|
       say "I'm on a #{vehicle}!"
     end
-    command.run vehicle: "T-Rex"
+    command.run [GitCommander::Command::Option.new(name: :vehicle, value: "T-Rex")]
     expect(output).to have_received(:puts).with "I'm on a T-Rex!"
   end
-  it "runs the block registered to it passing options"
+
+  it "runs the block registered to it passing options" do
+    command = described_class.new(
+      :wtf,
+      output: output,
+      flags: [{ name: :make, default: "Lotus" }],
+      switches: [{ name: :model }]
+    ) do |params|
+      say "I'm on a #{[params[:make], params[:model]].compact.join(" ")}!"
+    end
+    command.run [GitCommander::Command::Option.new(name: :model, value: "Evora")]
+    expect(output).to have_received(:puts).with "I'm on a Lotus Evora!"
+  end
+
   it "runs the block registered to it passing arguments and options"
   it "runs the block registered to it passing options with defaults"
 
   it "can add output" do
-    output = spy("output")
     command = described_class.new(:wtf, output: output)
     command.say "Ooh eeh what's up with that"
     expect(output).to have_received(:puts).with "Ooh eeh what's up with that"
@@ -34,7 +46,6 @@
   it "raises an error if no arguments, flags, or switches exist for the params passed"
 
   it "can output a help message" do
-    output = spy("output")
     full_command = described_class.new(
       :start,
       arguments: [