vagrant 0.6.4 → 0.6.5

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.6.5 (October 8, 2010)
+
+  - Validations on base MAC address to avoid situation described in GH-166, GH-181
+    from ever happening again.
+  - Properly load sub-VM configuration on first-pass of config loading. Solves
+    a LOT of problems with multi-VM. [GH-166] [GH-181]
+  - Configuration now only validates on final Vagrantfile proc, so multi-VM
+    validates correctly.
+  - A nice error message is given if ".vagrant" is a directory and therefore
+    can't be accessed. [GH-172]
+  - Fix plugin loading in a Rails 2.3.x project. [GH-176]
+
 ## 0.6.4 (October 4, 2010)
 
   - Default VM name is now properly the parent folder of the working directory

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (0.6.4)
+    vagrant (0.6.5)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -58,7 +58,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
-    thor (0.14.2)
+    thor (0.14.3)
     yard (0.6.1)
 
 PLATFORMS

data/config/default.rb

@@ -16,7 +16,7 @@ Vagrant::Config.run do |config|
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_ovf = "box.ovf"
   config.vm.box_url = nil
-  config.vm.base_mac = "0800279C2E42"
+  config.vm.base_mac = nil
   config.vm.forward_port("ssh", 22, 2222, :auto => true)
   config.vm.disk_image_format = 'VMDK'
   config.vm.provisioner = nil

data/lib/vagrant/action/vm/match_mac_address.rb

@@ -7,6 +7,8 @@ module Vagrant
         end
 
         def call(env)
+          raise Errors::VMBaseMacNotSpecified if !env.env.config.vm.base_mac
+
           env.ui.info I18n.t("vagrant.actions.vm.match_mac.matching")
           env["vm"].vm.network_adapters.first.mac_address = env.env.config.vm.base_mac
           env["vm"].vm.save

data/lib/vagrant/config.rb

@@ -68,11 +68,13 @@ module Vagrant
       # and returns the final configured object. This also validates the
       # configuration by calling {Top#validate!} on every configuration
       # class.
-      def execute!(config_object=nil)
+      def execute!(validate=true)
         config_object ||= config
-
         run_procs!(config_object)
-        config_object.validate!
+
+        # Validate if we're looking at a config object which represents a
+        # real VM.
+        config_object.validate! if validate && config_object.env.vm
         config_object
       end
     end
@@ -88,7 +90,7 @@ module Vagrant
 
     # Loads the queue of files/procs, executes them in the proper
     # sequence, and returns the resulting configuration object.
-    def load!
+    def load!(validate=true)
       self.class.reset!(@env)
 
       queue.flatten.each do |item|
@@ -104,7 +106,7 @@ module Vagrant
         end
       end
 
-      return self.class.execute!
+      return self.class.execute!(validate)
     end
   end
 

data/lib/vagrant/config/vm.rb

@@ -105,6 +105,7 @@ module Vagrant
         end
 
         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
       end
     end
   end

data/lib/vagrant/data_store.rb

@@ -24,6 +24,8 @@ module Vagrant
       end
     rescue Errno::ENOENT
       clear
+    rescue Errno::EISDIR
+      raise Errors::DotfileIsDirectory
     end
 
     # Commits any changes to the data to disk. Even if the data

data/lib/vagrant/environment.rb

@@ -158,7 +158,7 @@ module Vagrant
       if parent
         parent.multivm?
       else
-        vms.length > 1
+        vms.length > 1 || vms.keys.first != DEFAULT_VM
       end
     end
 
@@ -306,14 +306,14 @@ module Vagrant
 
       # If this environment is representing a sub-VM, then we push that
       # proc on as the last configuration.
-      if !first_run && vm
+      if vm
         subvm = parent.config.vm.defined_vms[vm.name]
         loader.queue << subvm.proc_stack if subvm
       end
 
       # Execute the configuration stack and store the result as the final
       # value in the config ivar.
-      @config = loader.load!
+      @config = loader.load!(!first_run)
 
       # (re)load the logger
       @logger = nil

data/lib/vagrant/errors.rb

@@ -133,6 +133,11 @@ module Vagrant
       error_key(:config_validation)
     end
 
+    class DotfileIsDirectory < VagrantError
+      status_code(46)
+      error_key(:dotfile_is_directory)
+    end
+
     class DownloaderFileDoesntExist < VagrantError
       status_code(37)
       error_key(:file_missing, "vagrant.downloaders.file")
@@ -278,6 +283,11 @@ module Vagrant
       error_key(:virtualbox_not_detected)
     end
 
+    class VMBaseMacNotSpecified < VagrantError
+      status_code(47)
+      error_key(:no_base_mac, "vagrant.actions.vm.match_mac")
+    end
+
     class VMFailedToBoot < VagrantError
       status_code(21)
       error_key(:failed_to_boot, "vagrant.actions.vm.boot")

data/lib/vagrant/plugin.rb

@@ -21,13 +21,20 @@ module Vagrant
     # load path. This file is loaded to kick off the load sequence
     # for that plugin.
     def self.load!
+      # Stupid hack since Rails 2.3.x overrides Gem.source_index with their
+      # own incomplete replacement which causes issues.
+      index = Gem.source_index
+      index = [index.installed_source_index, index.vendor_source_index] if defined?(Rails::VendorGemSourceIndex) && index.is_a?(Rails::VendorGemSourceIndex)
+
       # Look for a vagrant_init.rb in all the gems, but only the
       # latest version of the gems.
-      Gem.source_index.latest_specs.each do |spec|
-        file = Gem.searcher.matching_files(spec, "vagrant_init.rb").first
-        next if !file
+      [index].flatten.each do |source|
+        source.latest_specs.each do |spec|
+          file = Gem.searcher.matching_files(spec, "vagrant_init.rb").first
+          next if !file
 
-        @@plugins << new(spec, file)
+          @@plugins << new(spec, file)
+        end
       end
     end
 

data/lib/vagrant/test_helpers.rb

@@ -29,6 +29,7 @@ module Vagrant
       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 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.4"
+  VERSION = "0.6.5"
 end

data/templates/locales/en.yml

@@ -15,6 +15,12 @@ en:
         are printed below:
 
         %{messages}
+      dotfile_is_directory: |-
+        The local file Vagrant uses to store data ".vagrant" already exists
+        and is a directory! If you are in your home directory, then please run
+        this command in another directory. If you aren't in a home directory,
+        then please rename ".vagrant" to something else, or configure Vagrant
+        to use another filename by modifying `config.vagrant.dotfile_name`.
       interrupted: Vagrant exited after cleanup due to external interrupt.
       multi_vm_required: A multi-vm environment is required for name specification to this command.
       multi_vm_target_required: `vagrant %{command}` requires a specific VM name to target in a multi-VM environment.
@@ -107,8 +113,9 @@ en:
       ssh:
         private_key_missing: "`private_key_path` file must exist: %{path}"
       vm:
-        shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
+        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"
+        shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
 
 #-------------------------------------------------------------------------------
 # Translations for commands. e.g. `vagrant x`
@@ -258,6 +265,11 @@ en:
             manually for more verbose error output.
         match_mac:
           matching: Matching MAC address for NAT networking...
+          no_base_mac: |-
+            No base MAC address was specified. This is required for the NAT networking
+            to work properly (and hence port forwarding, SSH, etc.). Specifying this
+            MAC address is typically up to the box and box maintiner. Please contact
+            the relevant person to solve this issue.
         network:
           collides: |-
             The specified host network collides with a non-hostonly network!

data/test/vagrant/action/vm/match_mac_address_test.rb

@@ -25,4 +25,12 @@ class MatchMACAddressVMActionTest < Test::Unit::TestCase
 
     @instance.call(@env)
   end
+
+  should "raise an exception if no base MAC address is specified" do
+    @env.env.config.vm.base_mac = nil
+
+    assert_raises(Vagrant::Errors::VMBaseMacNotSpecified) {
+      @instance.call(@env)
+    }
+  end
 end

data/test/vagrant/command/helpers_test.rb

@@ -39,11 +39,11 @@ class CommandHelpersTest < Test::Unit::TestCase
 
     context "without multivm" do
       setup do
-        @env.stubs(:vms).returns({ :one => 1 })
+        @env.stubs(:vms).returns({ :one => 1, :two => 2 })
       end
 
       should "raise an exception if a name is specified" do
-        instance = command(["foo"], @env)
+        instance = command(["foo"], vagrant_env)
         assert_raises(Vagrant::Errors::MultiVMEnvironmentRequired) {
           instance.target_vms
         }

data/test/vagrant/config_test.rb

@@ -10,7 +10,6 @@ class ConfigTest < Test::Unit::TestCase
       @env = vagrant_env
       @instance = @klass.new(@env)
 
-      # Don't want validation to occur for these tests
       @klass::Top.any_instance.stubs(:validate!)
     end
 
@@ -21,10 +20,17 @@ class ConfigTest < Test::Unit::TestCase
     should "reset the config class on load, then execute" do
       seq = sequence("sequence")
       @klass.expects(:reset!).with(@env).in_sequence(seq)
-      @klass.expects(:execute!).in_sequence(seq)
+      @klass.expects(:execute!).with(true).in_sequence(seq)
       @instance.load!
     end
 
+    should "not validate if told not to" do
+      seq = sequence("sequence")
+      @klass.expects(:reset!).with(@env).in_sequence(seq)
+      @klass.expects(:execute!).with(false).in_sequence(seq)
+      @instance.load!(false)
+    end
+
     should "run the queue in the order given" do
       @instance.queue << Proc.new { |config| config.vm.box = "foo" }
       @instance.queue << Proc.new { |config| config.vm.box = "bar" }
@@ -74,6 +80,7 @@ class ConfigTest < Test::Unit::TestCase
 
   context "resetting" do
     setup do
+      @klass.reset!(vagrant_env)
       @klass::Top.any_instance.stubs(:validate!)
       @klass.run { |config| }
       @klass.execute!
@@ -105,7 +112,7 @@ class ConfigTest < Test::Unit::TestCase
 
   context "initializing" do
     setup do
-      @klass.reset!
+      @klass.reset!(vagrant_env)
       @klass::Top.any_instance.stubs(:validate!)
     end
 
@@ -115,25 +122,34 @@ class ConfigTest < Test::Unit::TestCase
       assert_equal [proc], @klass.proc_stack
     end
 
-    should "run the proc stack with the config when execute is called" do
+    should "run the validation on an environment which represents a VM" do
+      @klass.reset!(vagrant_env.vms[:default].env)
       seq = sequence('seq')
       @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
       @klass.config.expects(:validate!).once.in_sequence(seq)
       @klass.execute!
     end
 
+    should "not run the validation on an environment that doesn't directly represent a VM" do
+      seq = sequence('seq')
+      @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
+      @klass.expects(:validate!).never
+      @klass.execute!
+    end
+
+    should "not run the validation if explicitly told not to" do
+      @klass.reset!(vagrant_env.vms[:default].env)
+      seq = sequence('seq')
+      @klass.expects(:run_procs!).with(@klass.config).once.in_sequence(seq)
+      @klass.config.expects(:validate!).never
+      @klass.execute!(false)
+    end
+
     should "return the configuration on execute!" do
       @klass.run {}
       result = @klass.execute!
       assert result.is_a?(@klass::Top)
     end
-
-    should "use given configuration object if given" do
-      fake_env = mock("env")
-      config = @klass::Top.new(fake_env)
-      result = @klass.execute!(config)
-      assert_equal config.env, result.env
-    end
   end
 
   context "top config class" do

data/test/vagrant/data_store_test.rb

@@ -1,3 +1,4 @@
+require "fileutils"
 require "test_helper"
 
 class DataStoreTest < Test::Unit::TestCase
@@ -11,7 +12,15 @@ class DataStoreTest < Test::Unit::TestCase
   end
 
   teardown do
-    File.delete(@db_file) if File.file?(@db_file)
+    File.delete(@db_file) if File.exist?(@db_file)
+  end
+
+  should "raise an exception if the db file is a directory" do
+    file = tmp_path.join("data_store_folder_test")
+    FileUtils.mkdir_p(file)
+    assert_raises (Vagrant::Errors::DotfileIsDirectory) {
+      @klass.new(file)
+    }
   end
 
   should "be a hash with indifferent access" do

data/test/vagrant/environment_test.rb

@@ -129,12 +129,16 @@ class EnvironmentTest < Test::Unit::TestCase
       assert env.multivm?
     end
 
-    should "return false if VM length is 1" do
+    should "return true if VM length is 1 and a sub-VM is defined" do
       env = vagrant_env(vagrantfile(<<-vf))
         config.vm.define :web
       vf
 
-      assert !env.multivm?
+      assert env.multivm?
+    end
+
+    should "return false if only default VM exists" do
+      assert !vagrant_env.multivm?
     end
   end
 
@@ -361,7 +365,10 @@ class EnvironmentTest < Test::Unit::TestCase
       end
 
       def create_box_vagrantfile
-        vagrantfile(vagrant_box("box"), 'config.package.name = "box.box"')
+        vagrantfile(vagrant_box("box"), <<-FILE)
+          config.package.name = "box.box"
+          config.vm.base_mac = "set"
+        FILE
       end
 
       def create_home_vagrantfile
@@ -396,15 +403,18 @@ class EnvironmentTest < Test::Unit::TestCase
 
       should "load from a sub-vm configuration if environment represents a VM" do
         create_home_vagrantfile
+        create_box_vagrantfile
         vagrantfile(@env.root_path, <<-vf)
           config.package.name = "root.box"
           config.vm.define :web do |web|
+            web.vm.box = "box"
             web.package.name = "web.box"
           end
         vf
 
         assert_equal "root.box", @env.config.package.name
         assert_equal "web.box", @env.vms[:web].env.config.package.name
+        assert_equal "set", @env.vms[:web].env.config.vm.base_mac
       end
 
       should "reload the logger after executing" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -455,7 +455,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4185578386053162887
+      hash: 2202900524961152479
       segments: 
       - 0
       version: "0"