fixed-vagrant 0.7.4.dev

data/lib/vagrant/action/general/validate.rb

@@ -0,0 +1,19 @@
+module Vagrant
+  class Action
+    module General
+      # Simply validates the configuration of the current Vagrant
+      # environment.
+      class Validate
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env["config"].validate! if !@env.has_key?("validate") || @env["validate"]
+          @app.call(@env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/vm.rb

@@ -0,0 +1,31 @@
+module Vagrant
+  class Action
+    module VM
+      autoload :Boot,                'vagrant/action/vm/boot'
+      autoload :CheckBox,            'vagrant/action/vm/check_box'
+      autoload :CheckGuestAdditions, 'vagrant/action/vm/check_guest_additions'
+      autoload :CleanMachineFolder,  'vagrant/action/vm/clean_machine_folder'
+      autoload :ClearForwardedPorts, 'vagrant/action/vm/clear_forwarded_ports'
+      autoload :ClearNFSExports,     'vagrant/action/vm/clear_nfs_exports'
+      autoload :ClearSharedFolders,  'vagrant/action/vm/clear_shared_folders'
+      autoload :Customize,           'vagrant/action/vm/customize'
+      autoload :Destroy,             'vagrant/action/vm/destroy'
+      autoload :DestroyUnusedNetworkInterfaces, 'vagrant/action/vm/destroy_unused_network_interfaces'
+      autoload :DiscardState,        'vagrant/action/vm/discard_state'
+      autoload :Export,              'vagrant/action/vm/export'
+      autoload :ForwardPorts,        'vagrant/action/vm/forward_ports'
+      autoload :Halt,                'vagrant/action/vm/halt'
+      autoload :HostName,            'vagrant/action/vm/host_name'
+      autoload :Import,              'vagrant/action/vm/import'
+      autoload :MatchMACAddress,     'vagrant/action/vm/match_mac_address'
+      autoload :Network,             'vagrant/action/vm/network'
+      autoload :NFS,                 'vagrant/action/vm/nfs'
+      autoload :Package,             'vagrant/action/vm/package'
+      autoload :PackageVagrantfile,  'vagrant/action/vm/package_vagrantfile'
+      autoload :Provision,           'vagrant/action/vm/provision'
+      autoload :Resume,              'vagrant/action/vm/resume'
+      autoload :ShareFolders,        'vagrant/action/vm/share_folders'
+      autoload :Suspend,             'vagrant/action/vm/suspend'
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Vagrant
+  class Action
+    module VM
+      class Boot
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+
+          # Start up the VM and wait for it to boot.
+          boot
+          raise Errors::VMFailedToBoot if !wait_for_boot
+
+          @app.call(env)
+        end
+
+        def boot
+          @env.ui.info I18n.t("vagrant.actions.vm.boot.booting")
+          @env["vm"].vm.start(@env.env.config.vm.boot_mode)
+        end
+
+        def wait_for_boot
+          @env.ui.info I18n.t("vagrant.actions.vm.boot.waiting")
+
+          @env["config"].ssh.max_tries.to_i.times do |i|
+            if @env["vm"].ssh.up?
+              @env.ui.info I18n.t("vagrant.actions.vm.boot.ready")
+              return true
+            end
+
+            # Return true so that the vm_failed_to_boot error doesn't
+            # get shown
+            return true if @env.interrupted?
+
+            sleep 2 if !@env["vagrant.test"]
+          end
+
+          @env.ui.error I18n.t("vagrant.actions.vm.boot.failed")
+          false
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,28 @@
+module Vagrant
+  class Action
+    module VM
+      class CheckBox
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          box_name = env["config"].vm.box
+          raise Errors::BoxNotSpecified if !box_name
+
+          if !env.env.boxes.find(box_name)
+            box_url = env["config"].vm.box_url
+            raise Errors::BoxSpecifiedDoesntExist, :name => box_name if !box_url
+
+            env.ui.info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
+            Vagrant::Box.add(env.env, box_name, box_url)
+            env["boxes"].reload!
+            env.env.reload_config!
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Vagrant
+  class Action
+    module VM
+      # Middleware which verifies that the VM has the proper guest additions
+      # installed and prints a warning if they're not detected or if the
+      # version does not match the installed VirtualBox version.
+      class CheckGuestAdditions
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Use the raw interface for now, while the virtualbox gem
+          # doesn't support guest properties (due to cross platform issues)
+          version = env["vm"].vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
+          if version.empty?
+            env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
+          elsif version != VirtualBox.version
+            env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
+                        :guest_version => version,
+                        :virtualbox_version => VirtualBox.version))
+          end
+
+          # Continue
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+require 'fileutils'
+
+module Vagrant
+  class Action
+    module VM
+      # Cleans up the VirtualBox machine folder for any ".xml-prev"
+      # files which VirtualBox may have left over. This is a bug in
+      # VirtualBox. As soon as this is fixed, this middleware can and
+      # will be removed.
+      class CleanMachineFolder
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          clean_machine_folder
+          @app.call(env)
+        end
+
+        def clean_machine_folder
+          folder = File.join(VirtualBox::Global.global.system_properties.default_machine_folder, "*")
+
+          # Small safeguard against potentially unwanted rm-rf, since the default
+          # machine folder will typically always be greater than 10 characters long.
+          # For users with it < 10, out of luck?
+          return if folder.length < 10
+
+          Dir[folder].each do |f|
+            next unless File.directory?(f)
+
+            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) =~ /\.vbox-prev$/)
+            end
+
+            FileUtils.rm_rf(f) if !keep
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require File.expand_path("../forward_ports_helpers", __FILE__)
+
+module Vagrant
+  class Action
+    module VM
+      class ClearForwardedPorts
+        include ForwardPortsHelpers
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+          clear
+          @app.call(env)
+        end
+
+        def clear
+          if used_ports.length > 0
+            @env.ui.info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
+            clear_ports
+            @env["vm"].reload!
+          end
+        end
+
+        # Deletes existing forwarded ports.
+        def clear_ports
+          @env["vm"].vm.network_adapters.each do |na|
+            na.nat_driver.forwarded_ports.dup.each do |fp|
+              fp.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+require File.expand_path("../nfs_helpers", __FILE__)
+
+module Vagrant
+  class Action
+    module VM
+      class ClearNFSExports
+        include NFSHelpers
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          clear_nfs_exports(env)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Vagrant
+  class Action
+    module VM
+      class ClearSharedFolders
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+
+          clear_shared_folders
+          @app.call(env)
+        end
+
+        def clear_shared_folders
+          if @env["vm"].vm.shared_folders.length > 0
+            @env.ui.info I18n.t("vagrant.actions.vm.clear_shared_folders.deleting")
+
+            folders = @env["vm"].vm.shared_folders.dup
+            folders.each do |shared_folder|
+              shared_folder.destroy
+            end
+
+            @env["vm"].reload!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Vagrant
+  class Action
+    module VM
+      class Customize
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if !env.env.config.vm.proc_stack.empty?
+            env.ui.info I18n.t("vagrant.actions.vm.customize.running")
+            env.env.config.vm.run_procs!(env["vm"].vm)
+            env["vm"].vm.save
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Vagrant
+  class Action
+    module VM
+      class Destroy
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env.ui.info I18n.t("vagrant.actions.vm.destroy.destroying")
+          env["vm"].vm.destroy
+          env["vm"].vm = nil
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Vagrant
+  class Action
+    module VM
+      # Destroys the unused host only interfaces. This middleware cleans
+      # up any created host only networks.
+      class DestroyUnusedNetworkInterfaces
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # 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
+
+            # Destroy it if there is nothing attached
+            if iface.attached_vms.empty?
+              env.ui.info I18n.t("vagrant.actions.vm.destroy_network.destroying")
+              iface.destroy
+            end
+          end
+
+          # Continue along
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Vagrant
+  class Action
+    module VM
+      # Discards the saved state of the VM if its saved. If its
+      # not saved, does nothing.
+      class DiscardState
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env["vm"].created? && env["vm"].vm.saved?
+            env.ui.info I18n.t("vagrant.actions.vm.discard_state.discarding")
+            env["vm"].vm.discard_state
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'fileutils'
+
+module Vagrant
+  class Action
+    module VM
+      class Export
+        attr_reader :temp_dir
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+
+          raise Errors::VMPowerOffToPackage if !@env["vm"].vm.powered_off?
+
+          setup_temp_dir
+          export
+
+          @app.call(env)
+
+          recover(env) # called to cleanup temp directory
+        end
+
+        def recover(env)
+          if temp_dir && File.exist?(temp_dir)
+            FileUtils.rm_rf(temp_dir)
+          end
+        end
+
+        def setup_temp_dir
+          @env.ui.info I18n.t("vagrant.actions.vm.export.create_dir")
+          @temp_dir = @env["export.temp_dir"] = @env.env.tmp_path.join(Time.now.to_i.to_s)
+          FileUtils.mkpath(@env["export.temp_dir"])
+        end
+
+        def export
+          @env.ui.info I18n.t("vagrant.actions.vm.export.exporting")
+          @env["vm"].vm.export(ovf_path) do |progress|
+            @env.ui.report_progress(progress.percent, 100, false)
+          end
+        end
+
+        def ovf_path
+          File.join(@env["export.temp_dir"], @env.env.config.vm.box_ovf)
+        end
+      end
+    end
+  end
+end