vagrantup 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd26596b445951778d89c3df2a9717fef063cdb4
-  data.tar.gz: 69c01579f88b14201c8b394527e3ab39697dc6c5
+  metadata.gz: e5fd92e8354e17085af61026c73e342a918adf16
+  data.tar.gz: b37319c1a035013230a1e0b74ef9a89af1fdba53
 SHA512:
-  metadata.gz: 1bea481a61138290f846ac8bbbe49dc2606db3ae0f98b7664da5ab98fda01bf4c8e43026e9762f616f9eed09883ef3bd5a7c5b0beaf8cec141b88030f7417353
-  data.tar.gz: 04418842db9cc9fcd62f96fc53271862515ef035b59ad78caf6fb2476aef7340f6b6629427d7b92c7cd0e5c894415299fb5bb2ab06cddea3d82599947d41b29d
+  metadata.gz: c9b0e06ef8166ad3b5b883dc4b137d51f438505236f31e2616e4289e7a1af90cae66afec7893d0a8216893afaf62f2c9fa9526c4728d37548c91910a846126ff
+  data.tar.gz: 8c025092300ff69f38938d38981086e1dc27129db5a4cdfc16236dd85e46790a017184e74607be5f4bc1d3e62467f46318a941176db7bf46be6183e5ec794f66

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.7 (November 3, 2010)
+
+  - Added validation to verify that a box is specified.
+  - Proper error message when box is not found for `config.vm.box`. [GH-195]
+  - Fix output of `vagrant status` with multi-vm to be correct. [GH-196]
+
 ## 0.6.6 (October 14, 2010)
 
   - `vagrant status NAME` works once again. [GH-191]

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.6)
+    vagrant (0.6.7)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)

data/lib/vagrant/command/package.rb

@@ -16,7 +16,7 @@ module Vagrant
 
       def package_base
         vm = VM.find(options[:base], env)
-        raise Errors::BaseVMNotFoundError.new(:name => options[:base]) if !vm.created?
+        raise Errors::BaseVMNotFound.new(:name => options[:base]) if !vm.created?
         package_vm(vm)
       end
 

data/lib/vagrant/command/status.rb

@@ -6,7 +6,7 @@ module Vagrant
       def route
         state = nil
         results = target_vms.collect do |vm|
-          state ||= vm.created? ? vm.vm.state.to_s : "not_created"
+          state = vm.created? ? vm.vm.state.to_s : "not_created"
           "#{vm.name.to_s.ljust(25)}#{state.gsub("_", " ")}"
         end
 

data/lib/vagrant/config/vm.rb

@@ -104,8 +104,10 @@ module Vagrant
           end
         end
 
+        errors.add(I18n.t("vagrant.config.vm.box_missing")) if !box
+        errors.add(I18n.t("vagrant.config.vm.box_not_found", :name => box)) if box && !box_url && !env.box
         errors.add(I18n.t("vagrant.config.vm.boot_mode_invalid")) if ![:vrdp, :gui].include?(boot_mode.to_sym)
-        errors.add(I18n.t("vagrant.config.vm.base_mac_invalid")) if !base_mac
+        errors.add(I18n.t("vagrant.config.vm.base_mac_invalid")) if env.box && !base_mac
       end
     end
   end

data/lib/vagrant/test_helpers.rb

@@ -25,11 +25,16 @@ module Vagrant
     def vagrantfile(*args)
       path = args.shift.join("Vagrantfile") if Pathname === args.first
       path ||= vagrant_app("Vagrantfile")
+
+      # Create this box so that it exists
+      vagrant_box("base")
+
       str  = args.shift || ""
       File.open(path.to_s, "w") do |f|
         f.puts "Vagrant::Config.run do |config|"
         f.puts "config.vagrant.home = '#{home_path}'"
         f.puts "config.vm.base_mac = 'foo' if !config.vm.base_mac"
+        f.puts "config.vm.box = 'base'"
         f.puts str
         f.puts "end"
       end

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/templates/locales/en.yml

@@ -115,6 +115,8 @@ en:
       vm:
         base_mac_invalid: "Base MAC address for eth0/NAT must be set. Contact box maintainer for more information."
         boot_mode_invalid: "Boot mode must be one of: vrdp or gui"
+        box_missing: "A box must be specified."
+        box_not_found: "The box '%{name}' could not be found."
         shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
 
 #-------------------------------------------------------------------------------
@@ -178,7 +180,9 @@ en:
           waiting: Waiting for VM to boot. This can take a few minutes.
           ready: VM booted and ready for use!
           failed: Failed to connect to VM!
-          failed_to_boot: VM failed to boot.
+          failed_to_boot: |-
+            Failed to connect to VM via SSH. Please verify the VM successfully booted
+            by looking at the VirtualBox GUI.
         check_box:
           not_found: Box %{name} was not found. Fetching box from specified URL...
           not_specified: |-

data/test/vagrant/box_collection_test.rb

@@ -13,18 +13,19 @@ class BoxCollectionTest < Test::Unit::TestCase
 
     result = @klass.new(vagrant_env)
     names = result.collect { |b| b.name }.sort
-    assert_equal 2, result.length
-    assert_equal ["bar", "foo"], names
+    assert result.length >= 2
+    assert names.include?("foo")
+    assert names.include?("bar")
   end
 
   should "reload the box list" do
     instance = @klass.new(vagrant_env)
-    assert instance.empty?
+    amount = instance.length
 
     vagrant_box("foo")
 
     instance.reload!
-    assert !instance.empty?
+    assert_equal (amount + 1), instance.length
   end
 
   should "find a specific box" do

data/test/vagrant/command/package_test.rb

@@ -0,0 +1,27 @@
+require "test_helper"
+
+class CommandPackageCommandTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Command::PackageCommand
+    @env = vagrant_env
+  end
+
+  def command(args, opts, env)
+    @klass.new(args, opts, { :env => env })
+  end
+
+  context "initialization" do
+    should "require an environment" do
+      assert_raises(Vagrant::Errors::CLIMissingEnvironment) { command([], {}, nil) }
+      assert_nothing_raised { command([], {}, @env) }
+    end
+  end
+
+  should "raise an exception if VM for supplied base option is not found" do
+    Vagrant::VM.stubs(:find).returns(Vagrant::VM.new(nil))
+
+    assert_raises(Vagrant::Errors::BaseVMNotFound) {
+      command([], { :base => "foo" }, @env).execute
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -377,6 +377,7 @@ files:
 - test/vagrant/command/base_test.rb
 - test/vagrant/command/group_base_test.rb
 - test/vagrant/command/helpers_test.rb
+- test/vagrant/command/package_test.rb
 - test/vagrant/config/base_test.rb
 - test/vagrant/config/error_recorder_test.rb
 - test/vagrant/config/ssh_test.rb