Skip to content

Fix box-name detection on argv #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2017
Merged

Fix box-name detection on argv #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b955d41
fixes box-name detection on argv
stesie Mar 12, 2017
92e2063
adapt to 3e201fa
mneudert Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/vagrant/devcommands/runner/command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module DevCommands
module Runner
# Command runner
class Command
UTIL = VagrantPlugins::DevCommands::Util

def initialize(plugin, argv, env, registry)
@plugin = plugin
@argv = argv
Expand Down Expand Up @@ -31,16 +33,18 @@ def run(command)
def run_argv
argv = @argv.dup

argv.shift if @env.machine_index.include?(argv[0].to_s)
argv.shift if UTIL.machine_name?(argv[0].to_s, @env.machine_index)
argv.shift
argv
end

def run_box(cmd)
return cmd.box.to_s if cmd.box
return @argv[0].to_s if @env.machine_index.include?(@argv[0].to_s)
box = nil
box = cmd.box.to_s if cmd.box
box = @argv[0] if UTIL.machine_name?(@argv[0].to_s,
@env.machine_index)

nil
box
end

def run_script(command, argv)
Expand Down
3 changes: 2 additions & 1 deletion lib/vagrant/devcommands/runner/internal_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class InternalCommand
NAMESPACE_CMD = VagrantPlugins::DevCommands::InternalCommand
NAMESPACE_MODEL = VagrantPlugins::DevCommands::Model
NAMESPACE_SPEC = VagrantPlugins::DevCommands::InternalSpec
UTIL = VagrantPlugins::DevCommands::Util

COMMANDS = {
'help' => NAMESPACE_MODEL::Command.new(NAMESPACE_SPEC::HELP),
Expand Down Expand Up @@ -35,7 +36,7 @@ def run(command, args = nil)
def run_argv
argv = @argv.dup

argv.shift if @env.machine_index.include?(argv[0].to_s)
argv.shift if UTIL.machine_name?(argv[0].to_s, @env.machine_index)
argv.shift
argv
end
Expand Down
6 changes: 5 additions & 1 deletion lib/vagrant/devcommands/util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def self.argv_command(argv, env)
return nil if argv.empty?

command = argv[0].to_s
command = argv[1].to_s if env.machine_index.include?(command)
command = argv[1].to_s if machine_name?(command, env.machine_index)

command
end
Expand All @@ -29,6 +29,10 @@ def self.collect_optional_params(params)
end
end

def self.machine_name?(name, machine_index)
machine_index.any? { |machine| name == machine.name }
end

def self.max_pad(items_list)
paddings = items_list.map do |items|
if items.nil? || items.empty?
Expand Down