Append command line arguments after alias arguments

Alias arguments are in order of expansion while command line arguments
are always last.

Author: chall8908

lib/cli/mastermind/arg_parse.rb

@@ -22,11 +22,14 @@ def initialize(arguments=ARGV)
  end
 
  def do_command_expansion!(config)
+ @alias_arguments = []
 
  @mastermind_arguments.map! do |argument|
  expand_argument(config, argument)
  end
 
+ @plan_arguments = @alias_arguments + @plan_arguments
+
  @mastermind_arguments.flatten!
  end
 
@@ -102,7 +105,7 @@ def expand_argument(config, argument)
 
  if plan_arguments
  plan_arguments.shift # removes the --
- @plan_arguments.concat plan_arguments
+ @alias_arguments.concat plan_arguments
  end
 
  dealiased = plan_names

spec/cli/mastermind/arg_parse_spec.rb

@@ -9,6 +9,7 @@
  config.define_alias('sao', 'shorter argument option')
  config.define_alias('ssao', 'shorter sao')
  config.define_alias('swa', 'shorter with -- arguments')
+ config.define_alias('sswa', 'swa -- another')
  end
 
  it 'expands aliases from the command line' do
@@ -40,5 +41,26 @@
 
  expect(actual).to eq %w[ arguments ]
  end
+
+ it 'prepends alias arguments' do
+ parser.instance_variable_set('@mastermind_arguments', ['swa'])
+ parser.instance_variable_set('@plan_arguments', ['second'])
+
+ parser.do_command_expansion! config
+
+ actual = parser.instance_variable_get('@plan_arguments')
+
+ expect(actual).to eq %w[ arguments second ]
+ end
+
+ it 'prepends alias arguments in the order their expanded' do
+ parser.instance_variable_set('@mastermind_arguments', ['sswa'])
+
+ parser.do_command_expansion! config
+
+ actual = parser.instance_variable_get('@plan_arguments')
+
+ expect(actual).to eq %w[ arguments another ]
+ end
  end
 end