haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commands/box: list works with the new versions

This commit is contained in:
Mitchell Hashimoto 2014-01-22 19:09:33 -08:00
parent e111b7a691
commit e8197c4e87
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/commands/box/command/list.rb
View File

@ -42,13 +42,15 @@ module VagrantPlugins
# ignore the "v1" param for now since I'm not yet sure if its # ignore the "v1" param for now since I'm not yet sure if its
# important for the user to know what boxes need to be upgraded # important for the user to know what boxes need to be upgraded
# and which don't, since we plan on doing that transparently. # and which don't, since we plan on doing that transparently.
boxes.each do |name, provider, _v1| boxes.each do |name, version, provider|
@env.ui.info("#{name.ljust(longest_box_length)} (#{provider})", :prefix => false) @env.ui.info("#{name.ljust(longest_box_length)} (#{provider})")
@env.ui.machine("box-name", name) @env.ui.machine("box-name", name)
@env.ui.machine("box-provider", provider) @env.ui.machine("box-provider", provider)
@env.ui.machine("box-version", version)
info_file = @env.boxes.find(name, provider).directory.join("info.json") info_file = @env.boxes.find(name, provider, version).
directory.join("info.json")
if info_file.file? if info_file.file?
info = JSON.parse(info_file.read) info = JSON.parse(info_file.read)
info.each do |k, v| info.each do |k, v|

2
test/unit/vagrant/box_test.rb
View File

@ -12,7 +12,7 @@ describe Vagrant::Box do
let(:name) { "foo" } let(:name) { "foo" }
let(:provider) { :virtualbox } let(:provider) { :virtualbox }
let(:version) { "1.0" } let(:version) { "1.0" }
let(:directory) { environment.box2("foo", :virtualbox) } let(:directory) { environment.box3("foo", "1.0", :virtualbox) }
subject { described_class.new(name, provider, version, directory) } subject { described_class.new(name, provider, version, directory) }
it "provides the name" do it "provides the name" do