vagrant 0.6.9 → 0.7.0.beta

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.7.0.beta (December 24, 2010)
+
+  - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since
+    the API is so different. Stay with the 0.6.x series if you have VirtualBox
+    3.2.x.
+  - Changed the unused host only network destroy mechanism to check for
+    uselessness after the VM is destroyed. This should result in more accurate
+    checks.
+  - Networks are no longer disabled upon halt/destroy. With the above
+    change, its unnecessary.
+
 ## 0.6.9 (December 21, 2010)
 
   - Puppet provisioner. [GH-223]

data/README.md

@@ -54,3 +54,8 @@ be installed with a simple `gem install bundler --pre`. Afterwords, do the follo
     rake
 
 This will run the test suite, which should come back all green! Then you're good to go!
+
+If you want to run Vagrant without having to install the gem, you may use `bundle exec`,
+like so:
+
+    bundle exec bin/vagrant help

data/lib/vagrant/action/builtin.rb

@@ -30,7 +30,6 @@ module Vagrant
       register(:halt, Builder.new do
         use VM::DiscardState
         use VM::Halt
-        use VM::DisableNetworks
       end)
 
       # suspend - Suspends the VM
@@ -62,9 +61,9 @@ module Vagrant
       register(:destroy, Builder.new do
         use Action[:halt], :force => true
         use VM::ClearNFSExports
-        use VM::DestroyUnusedNetworkInterfaces
         use VM::Destroy
         use VM::CleanMachineFolder
+        use VM::DestroyUnusedNetworkInterfaces
       end)
 
       # package - Export and package the VM

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

@@ -31,7 +31,7 @@ module Vagrant
             keep = Dir["#{f}/**/*"].find do |d|
               # Find a file that doesn't have ".xml-prev" as the suffix,
               # which signals that we want to keep this folder
-              File.file?(d) && !(File.basename(d) =~ /\.xml-prev$/)
+              File.file?(d) && !(File.basename(d) =~ /\.vbox-prev$/)
             end
 
             FileUtils.rm_rf(f) if !keep

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

@@ -8,7 +8,7 @@ module Vagrant
 
         def call(env)
           env.ui.info I18n.t("vagrant.actions.vm.destroy.destroying")
-          env["vm"].vm.destroy(:destroy_medium => :delete)
+          env["vm"].vm.destroy
           env["vm"].vm = nil
 
           @app.call(env)

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

@@ -9,20 +9,15 @@ module Vagrant
         end
 
         def call(env)
-          # We need to check if the host only network specified by any
-          # of the adapters would not have any more clients if it was
-          # destroyed. And if so, then destroy the host only network
-          # itself.
-          interfaces = env["vm"].vm.network_adapters.collect do |adapter|
-            adapter.host_interface_object
-          end
+          # Destroy all the host only network adapters which are empty.
+          VirtualBox::Global.global(true).host.network_interfaces.each do |iface|
+            # We only care about host only interfaces
+            next if iface.interface_type != :host_only
 
-          interfaces.compact.uniq.each do |interface|
-            # Destroy the network interface if there is only one
-            # attached VM (which must be this VM)
-            if interface.attached_vms.length == 1
+            # Destroy it if there is nothing attached
+            if iface.attached_vms.empty?
               env.ui.info I18n.t("vagrant.actions.vm.destroy_network.destroying")
-              interface.destroy
+              iface.destroy
             end
           end
 

data/lib/vagrant/environment.rb

@@ -32,7 +32,7 @@ module Vagrant
       def check_virtualbox!
         version = VirtualBox.version
         raise Errors::VirtualBoxNotDetected if version.nil?
-        raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 3.2
+        raise Errors::VirtualBoxInvalidVersion, :version => version.to_s if version.to_f < 4.0
         raise Errors::VirtualBoxInvalidOSE, :version => version.to_s if version.to_s.downcase.include?("ose")
       rescue Errors::VirtualBoxNotDetected
         # On 64-bit Windows, show a special error. This error is a subclass

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.9"
+  VERSION = "0.7.0.beta"
 end

data/templates/locales/en.yml

@@ -96,8 +96,13 @@ en:
         to continue.
       virtualbox_invalid_version: |-
         Vagrant has detected that you have VirtualBox version %{version} installed!
-        Vagrant requires that you use at least VirtualBox version 3.2. Please install
+        Vagrant requires that you use at least VirtualBox version 4.0. Please install
         a more recent version of VirtualBox to continue.
+
+        The Vagrant 0.6.x series supports VirtualBox 3.2, so if you're stuck with that
+        version, then please use the 0.6.x series of Vagrant.
+
+        Any earlier versions of VirtualBox are completely unsupported. Please upgrade.
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently

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

@@ -37,10 +37,10 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
       @instance.clean_machine_folder
     end
 
-    should "delete directories with only .xml-prev files" do
+    should "delete directories with only .vbox-prev files" do
       folders = {
-        "sfoo" => %W[foo bar baz.xml-prev],
-        "sbar" => %W[foo.xml-prev]
+        "sfoo" => %W[foo bar baz.vbox-prev],
+        "sbar" => %W[foo.vbox-prev]
       }
 
       Dir.expects(:[]).with(@folder).returns(folders.keys)
@@ -57,7 +57,7 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
     should "delete directories with only subdirectories" do
       folders = {
         "sfoo" => %W[foo bar],
-        "sbar" => %W[foo.xml-prev]
+        "sbar" => %W[foo.vbox-prev]
       }
 
       File.stubs(:file?).returns(false)
@@ -77,6 +77,8 @@ class CleanMachineFolderVMActionTest < Test::Unit::TestCase
     should "do nothing if folder is < 10 characters" do
       VirtualBox::Global.global.system_properties.stubs(:default_machine_folder).returns("foo")
       Dir.expects(:[]).never
+
+      @instance.clean_machine_folder
     end
   end
 end

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

@@ -16,7 +16,7 @@ class DestroyVMActionTest < Test::Unit::TestCase
 
   context "destroying the VM" do
     should "destroy VM and attached images" do
-      @internal_vm.expects(:destroy).with(:destroy_medium => :delete).once
+      @internal_vm.expects(:destroy).once
       @env["vm"].expects(:vm=).with(nil).once
       @app.expects(:call).with(@env).once
       @instance.call(@env)

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

@@ -16,24 +16,27 @@ class DestroyUnusedNetworkInterfacesVMActionTest < Test::Unit::TestCase
 
   context "calling" do
     setup do
-      @network_adapters = []
-      @internal_vm.stubs(:network_adapters).returns(@network_adapters)
+      @interfaces = []
+      global = mock("global")
+      host = mock("host")
+      VirtualBox::Global.stubs(:global).returns(global)
+      global.stubs(:host).returns(host)
+      host.stubs(:network_interfaces).returns(@interfaces)
     end
 
-    def stub_interface(length=5)
+    def stub_interface(length=5, type=:host_only)
       interface = mock("interface")
-      adapter = mock("adapter")
-      adapter.stubs(:host_interface_object).returns(interface)
+      interface.stubs(:interface_type).returns(type)
       interface.stubs(:attached_vms).returns(Array.new(length))
 
-      @network_adapters << adapter
+      @interfaces << interface
       interface
     end
 
     should "destroy only the unused network interfaces" do
       stub_interface(5)
       stub_interface(7)
-      results = [stub_interface(1), stub_interface(1)]
+      results = [stub_interface(0), stub_interface(0)]
 
       results.each do |result|
         result.expects(:destroy).once

data/vagrant.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "net-scp", "~> 1.0.3"
   s.add_dependency "i18n", "~> 0.4.1"
   s.add_dependency "thor", "~> 0.14.2"
-  s.add_dependency "virtualbox", "~> 0.7.6"
+  s.add_dependency "virtualbox", "~> 0.8.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  - beta
+  version: 0.7.0.beta
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -08:00
+date: 2010-12-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,9 +148,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 6
-        version: 0.7.6
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -254,7 +255,6 @@ files:
 - lib/vagrant/action/vm/customize.rb
 - lib/vagrant/action/vm/destroy.rb
 - lib/vagrant/action/vm/destroy_unused_network_interfaces.rb
-- lib/vagrant/action/vm/disable_networks.rb
 - lib/vagrant/action/vm/discard_state.rb
 - lib/vagrant/action/vm/export.rb
 - lib/vagrant/action/vm/forward_ports.rb
@@ -367,7 +367,6 @@ files:
 - test/vagrant/action/vm/customize_test.rb
 - test/vagrant/action/vm/destroy_test.rb
 - test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
-- test/vagrant/action/vm/disable_networks_test.rb
 - test/vagrant/action/vm/discard_state_test.rb
 - test/vagrant/action/vm/export_test.rb
 - test/vagrant/action/vm/forward_ports_helpers_test.rb
@@ -442,7 +441,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1856094503640076459
+      hash: 1825032801895729631
       segments: 
       - 0
       version: "0"

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

@@ -1,34 +0,0 @@
-module Vagrant
-  class Action
-    module VM
-      # Middleware to disable all host only networks on the
-      # VM
-      class DisableNetworks
-        def initialize(app, env)
-          @app = app
-          @env = env
-        end
-
-        def call(env)
-          if env["vm"].created?
-            logged = false
-
-            env["vm"].vm.network_adapters.each do |adapter|
-              next if adapter.attachment_type != :host_only
-
-              if !logged
-                env.ui.info I18n.t("vagrant.actions.vm.disable_networks.disabling")
-                logged = true
-              end
-
-              adapter.enabled = false
-              adapter.save
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-require "test_helper"
-
-class DisableNetworksVMActionTest < Test::Unit::TestCase
-  setup do
-    @klass = Vagrant::Action::VM::DisableNetworks
-    @app, @env = action_env
-
-    @vm = mock("vm")
-    @env.env.stubs(:vm).returns(@vm)
-
-    @internal_vm = mock("internal")
-    @vm.stubs(:created?).returns(true)
-    @vm.stubs(:vm).returns(@internal_vm)
-    @internal_vm.stubs(:network_adapters).returns([])
-
-    @instance = @klass.new(@app, @env)
-  end
-
-  def mock_adapter(type)
-    adapter = mock("adapter")
-    adapter.stubs(:attachment_type).returns(type)
-
-    if type == :host_only
-      adapter.expects(:enabled=).with(false)
-      adapter.expects(:save)
-    end
-
-    @internal_vm.network_adapters << adapter
-  end
-
-  should "do nothing if VM is not created" do
-    @vm.stubs(:created?).returns(false)
-    @vm.expects(:vm).never
-
-    @app.expects(:call).with(@env).once
-    @instance.call(@env)
-  end
-
-  should "remove all network adapters and continue chain" do
-    mock_adapter(:bridged)
-    mock_adapter(:host_only)
-    mock_adapter(:host_only)
-
-    @app.expects(:call).with(@env).once
-
-    @instance.call(@env)
-  end
-end