fixed-vagrant 0.7.4.dev

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

@@ -0,0 +1,11 @@
+module Vagrant
+  class Action
+    module VM
+      module NFSHelpers
+        def clear_nfs_exports(env)
+          env["host"].nfs_cleanup if env["host"]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'vagrant/action/general/package'
+
+module Vagrant
+  class Action
+    module VM
+      # A subclass of {General::Package} which simply makes sure that
+      # the package directory is set to the directory which the VM
+      # was exported to.
+      class Package < General::Package
+        # Doing this so that we can test that the parent is properly
+        # called in the unit tests.
+        alias_method :general_call, :call
+        def call(env)
+          # Just match up a couple environmental variables so that
+          # the superclass will do the right thing. Then, call the
+          # superclass
+          env["package.directory"] = env["export.temp_dir"]
+          general_call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Vagrant
+  class Action
+    module VM
+      # Puts a generated Vagrantfile into the package directory so that
+      # it can be included in the package.
+      class PackageVagrantfile
+        include Util
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+          create_vagrantfile
+          @app.call(env)
+        end
+
+        # This method creates the auto-generated Vagrantfile at the root of the
+        # box. This Vagrantfile contains the MAC address so that the user doesn't
+        # have to worry about it.
+        def create_vagrantfile
+          File.open(File.join(@env["export.temp_dir"], "Vagrantfile"), "w") do |f|
+            f.write(TemplateRenderer.render("package_Vagrantfile", {
+              :base_mac => @env["vm"].vm.network_adapters.first.mac_address
+            }))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Vagrant
+  class Action
+    module VM
+      class Provision
+        attr_reader :provisioners
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+          @env["provision.enabled"] = true if !@env.has_key?("provision.enabled")
+          @provisioners = []
+
+          load_provisioners if provisioning_enabled?
+        end
+
+        def call(env)
+          @app.call(env)
+
+          @provisioners.each do |instance|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.beginning", :provisioner => instance.class)
+            instance.provision!
+          end
+        end
+
+        def provisioning_enabled?
+          !@env["config"].vm.provisioners.empty? && @env["provision.enabled"]
+        end
+
+        def load_provisioners
+          @env["config"].vm.provisioners.each do |provisioner|
+            @env.ui.info I18n.t("vagrant.actions.vm.provision.enabled", :provisioner => provisioner.shortcut)
+
+            instance = provisioner.provisioner.new(@env, provisioner.config)
+            instance.prepare
+            @provisioners << instance
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Vagrant
+  class Action
+    module VM
+      class Resume
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env["vm"].vm.saved?
+            env.ui.info I18n.t("vagrant.actions.vm.resume.resuming")
+            env["actions"].run(Boot)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,70 @@
+module Vagrant
+  class Action
+    module VM
+      class ShareFolders
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+
+          create_metadata
+
+          @app.call(env)
+
+          mount_shared_folders
+        end
+
+        # This method returns an actual list of VirtualBox shared
+        # folders to create and their proper path.
+        def shared_folders
+          @env.env.config.vm.shared_folders.inject({}) do |acc, data|
+            key, value = data
+
+            next acc if value[:disabled]
+
+            # This to prevent overwriting the actual shared folders data
+            value = value.dup
+            acc[key] = value
+            acc
+          end
+        end
+
+        def create_metadata
+          @env.ui.info I18n.t("vagrant.actions.vm.share_folders.creating")
+
+          shared_folders.each do |name, data|
+            folder = VirtualBox::SharedFolder.new
+            folder.name = name
+            folder.host_path = File.expand_path(data[:hostpath], @env.env.root_path)
+            @env["vm"].vm.shared_folders << folder
+          end
+
+          @env["vm"].vm.save
+        end
+
+        def mount_shared_folders
+          @env.ui.info I18n.t("vagrant.actions.vm.share_folders.mounting")
+
+          @env["vm"].ssh.execute do |ssh|
+            shared_folders.each do |name, data|
+              if data[:guestpath]
+                # Guest path specified, so mount the folder to specified point
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
+                                    :name => name,
+                                    :guest_path => data[:guestpath]))
+                @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
+              else
+                # If no guest path is specified, then automounting is disabled
+                @env.ui.info(I18n.t("vagrant.actions.vm.share_folders.nomount_entry",
+                                    :name => name))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Vagrant
+  class Action
+    module VM
+      class Suspend
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env["vm"].vm.running?
+            env.ui.info I18n.t("vagrant.actions.vm.suspend.suspending")
+            env["vm"].vm.save_state
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/warden.rb

@@ -0,0 +1,79 @@
+module Vagrant
+  class Action
+    # The action warden is a middleware which injects itself between
+    # every other middleware, watching for exceptions which are raised
+    # and performing proper cleanup on every action by calling the `recover`
+    # method. The warden therefore allows middlewares to not worry about
+    # exceptional events, and by providing a simple callback, can clean up
+    # in any erroneous case.
+    #
+    # Warden will "just work" behind the scenes, and is not of particular
+    # interest except to those who are curious about the internal workings
+    # of Vagrant.
+    class Warden
+      attr_accessor :actions, :stack
+
+      def initialize(actions, env)
+        @stack = []
+        @actions = actions.map { |m| finalize_action(m, env) }
+      end
+
+      def call(env)
+        return if @actions.empty?
+
+        begin
+          # Call the next middleware in the sequence, appending to the stack
+          # of "recoverable" middlewares in case something goes wrong!
+          raise Errors::VagrantInterrupt if env.interrupted?
+          @stack.unshift(@actions.shift).first.call(env)
+          raise Errors::VagrantInterrupt if env.interrupted?
+        rescue SystemExit
+          # This means that an "exit" or "abort" was called. In these cases,
+          # we just exit immediately.
+          raise
+        rescue Exception => e
+          env["vagrant.error"] = e
+
+          # Something went horribly wrong. Start the rescue chain then
+          # reraise the exception to properly kick us out of limbo here.
+          begin_rescue(env)
+          raise
+        end
+      end
+
+      # Begins the recovery sequence for all middlewares which have run.
+      # It does this by calling `recover` (if it exists) on each middleware
+      # which has already run, in reverse order.
+      def begin_rescue(env)
+        @stack.each do |act|
+          act.recover(env) if act.respond_to?(:recover)
+        end
+
+        # Clear stack so that warden down the middleware chain doesn't
+        # rescue again.
+        @stack.clear
+      end
+
+      # A somewhat confusing function which simply initializes each
+      # middleware properly to call the next middleware in the sequence.
+      def finalize_action(action, env)
+        klass, args, block = action
+
+        if klass.is_a?(Class)
+          # A action klass which is to be instantiated with the
+          # app, env, and any arguments given
+          klass.new(self, env, *args, &block)
+        elsif klass.respond_to?(:call)
+          # Make it a lambda which calls the item then forwards
+          # up the chain
+          lambda do |e|
+            klass.call(e)
+            self.call(e)
+          end
+        else
+          raise "Invalid action: #{action.inspect}"
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/box.rb

@@ -0,0 +1,90 @@
+module Vagrant
+  # Represents a "box," which is simply a packaged vagrant environment.
+  # Boxes are simply `tar` files which contain an exported VirtualBox
+  # virtual machine, at the least. They are created with `vagrant package`
+  # and may contain additional files if specified by the creator. This
+  # class serves to help manage these boxes, although most of the logic
+  # is kicked out to middlewares.
+  class Box
+    # The name of the box.
+    attr_accessor :name
+
+    # The URI for a new box. This is not available for existing boxes.
+    attr_accessor :uri
+
+    # The environment which this box belongs to. Although this could
+    # actually be many environments, this points to the environment
+    # of a specific instance.
+    attr_reader :env
+
+    class << self
+      # Adds a new box with given name from the given URI. This method
+      # begins the process of adding a box from a given URI by setting up
+      # the {Box} instance and calling {#add}.
+      #
+      # @param [String] name The name of the box
+      # @param [String] uri URI to the box file
+      def add(env, name, uri)
+        box = new(env, name)
+        box.uri = uri
+        box.add
+      end
+    end
+
+    # Creates a new box instance. Given an optional `name` parameter,
+    # newly created instance will have that name, otherwise it defaults
+    # to `nil`.
+    #
+    # **Note:** This method does not actually _create_ the box, but merely
+    # returns a new, abstract representation of it. To add a box, see {#add}.
+    def initialize(env=nil, name=nil)
+      @name = name
+      @env = env
+    end
+
+    # Returns path to the OVF file of the box. The OVF file is an open
+    # virtual machine file which contains specifications of the exported
+    # virtual machine this box contains.
+    #
+    # This will only be valid once the box is imported.
+    #
+    # @return [String]
+    def ovf_file
+      directory.join(env.config.vm.box_ovf)
+    end
+
+    # Begins the process of adding a box to the vagrant installation. This
+    # method requires that `name` and `uri` be set. The logic of this method
+    # is kicked out to the `box_add` registered middleware.
+    def add
+      raise Errors::BoxAlreadyExists, :name => name if File.directory?(directory)
+      env.actions.run(:box_add, { "box" => self, "validate" => false })
+    end
+
+    # Begins the process of destroying this box. This cannot be undone!
+    def destroy
+      env.actions.run(:box_remove, { "box" => self, "validate" => false })
+    end
+
+    # Begins sequence to repackage this box.
+    def repackage(options=nil)
+      env.actions.run(:box_repackage, { "box" => self, "validate" => false }.merge(options || {}))
+    end
+
+    # Returns the directory to the location of this boxes content in the local
+    # filesystem. Note that if the box isn't imported yet, then the path may not
+    # yet exist, but still represents where the box will be imported to.
+    #
+    # @return [String]
+    def directory
+      env.boxes_path.join(name)
+    end
+
+    # Implemented for comparison with other boxes. Comparison is implemented
+    # by simply comparing name.
+    def <=>(other)
+      return super if !other.is_a?(self.class)
+      name <=> other.name
+    end
+  end
+end

data/lib/vagrant/box_collection.rb

@@ -0,0 +1,53 @@
+require 'forwardable'
+
+module Vagrant
+  # Represents a collection of boxes, providing helpful methods for
+  # finding boxes. An instance of this is returned by {Environment#boxes}.
+  #
+  # # Finding a Box
+  #
+  # To find a box, use the {#find} method with the name of the box. The name
+  # is an exact match search.
+  #
+  #     env.boxes.find("base") # => #<Vagrant::Box>
+  #
+  class BoxCollection
+    include Enumerable
+    extend Forwardable
+    def_delegators :@boxes, :length, :each
+
+    # The environment this box collection belongs to
+    attr_reader :env
+
+    def initialize(env)
+      @env = env
+      @boxes = []
+
+      reload!
+    end
+
+    # Find a box in the collection by the given name. The name must
+    # be a string, for now.
+    def find(name)
+      @boxes.each do |box|
+        return box if box.name == name
+      end
+
+      nil
+    end
+
+    # Loads the list of all boxes from the source. This modifies the
+    # current array.
+    def reload!
+      @boxes.clear
+
+      Dir.open(env.boxes_path) do |dir|
+        dir.each do |d|
+          next if d == "." || d == ".." || !File.directory?(env.boxes_path.join(d))
+          @boxes << Box.new(env, d)
+        end
+      end
+    end
+  end
+end
+