vagrantup 0.4.3.dev → 0.5.0

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.logger.info "Resuming suspended VM..."
+            env["actions"].run(:start)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/{actions/vm/shared_folders.rb → action/vm/share_folders.rb}

@@ -1,13 +1,39 @@
 module Vagrant
-  module Actions
+  class Action
     module VM
-      class SharedFolders < Base
+      class ShareFolders
+        include ExceptionCatcher
+
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          @env = env
+
+          create_metadata
+
+          @app.call(env)
+
+          if !env.error?
+            catch_action_exception(env) do
+              # Only mount and setup shared folders in the absense of an
+              # error
+              mount_shared_folders
+              setup_unison
+            end
+          end
+        end
+
         # This method returns an actual list of VirtualBox shared
         # folders to create and their proper path.
         def shared_folders
-          runner.env.config.vm.shared_folders.inject({}) do |acc, data|
+          @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
 
@@ -15,7 +41,7 @@ module Vagrant
               # Syncing this folder. Change the guestpath to reflect
               # what we're actually mounting.
               value[:original] = value.dup
-              value[:guestpath] = "#{value[:guestpath]}#{runner.env.config.unison.folder_suffix}"
+              value[:guestpath] = "#{value[:guestpath]}#{@env.env.config.unison.folder_suffix}"
             end
 
             acc[key] = value
@@ -33,23 +59,26 @@ module Vagrant
           end
         end
 
-        def before_boot
-          clear_shared_folders
-          create_metadata
-        end
+        def create_metadata
+          @env.logger.info "Creating shared folders metadata..."
 
-        def after_boot
-          mount_shared_folders
-          setup_unison
+          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
-          logger.info "Mounting shared folders..."
+          @env.logger.info "Mounting shared folders..."
 
-          @runner.ssh.execute do |ssh|
+          @env["vm"].ssh.execute do |ssh|
             shared_folders.each do |name, data|
-              logger.info "-- #{name}: #{data[:guestpath]}"
-              @runner.system.mount_shared_folder(ssh, name, data[:guestpath])
+              @env.logger.info "-- #{name}: #{data[:guestpath]}"
+              @env["vm"].system.mount_shared_folder(ssh, name, data[:guestpath])
             end
           end
         end
@@ -57,41 +86,15 @@ module Vagrant
         def setup_unison
           return if unison_folders.empty?
 
-          runner.ssh.execute do |ssh|
-            runner.system.prepare_unison(ssh)
+          @env["vm"].ssh.execute do |ssh|
+            @env["vm"].system.prepare_unison(ssh)
 
-            logger.info "Creating unison crontab entries..."
+            @env.logger.info "Creating unison crontab entries..."
             unison_folders.each do |name, data|
-              runner.system.create_unison(ssh, data)
+              @env["vm"].system.create_unison(ssh, data)
             end
           end
         end
-
-        def clear_shared_folders
-          if runner.vm.shared_folders.length > 0
-            logger.info "Clearing previously set shared folders..."
-
-            folders = @runner.vm.shared_folders.dup
-            folders.each do |shared_folder|
-              shared_folder.destroy
-            end
-
-            @runner.reload!
-          end
-        end
-
-        def create_metadata
-          logger.info "Creating shared folders metadata..."
-
-          shared_folders.each do |name, data|
-            folder = VirtualBox::SharedFolder.new
-            folder.name = name
-            folder.host_path = File.expand_path(data[:hostpath], runner.env.root_path)
-            @runner.vm.shared_folders << folder
-          end
-
-          @runner.vm.save
-        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.logger.info "Saving VM state and suspending execution..."
+            env["vm"].vm.save_state
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/box.rb

@@ -40,17 +40,13 @@ module Vagrant
   #     box = Vagrant::Box.find("foo")
   #     box.destroy
   #
-  class Box < Actions::Runner
+  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 temporary path to the downloaded or copied box. This should
-    # only be used internally.
-    attr_accessor :temp_path
-
     # The environment which this box belongs to. Although this could
     # actually be many environments, this points to the environment
     # of a specific instance.
@@ -133,12 +129,12 @@ module Vagrant
     # method requires that `name` and `uri` be set. The logic of this method
     # is kicked out to the {Actions::Box::Add add box} action.
     def add
-      execute!(Actions::Box::Add)
+      env.actions.run(:box_add, { "box" => self })
     end
 
     # Beings the process of destroying this box.
     def destroy
-      execute!(Actions::Box::Destroy)
+      env.actions.run(:box_remove, { "box" => self })
     end
 
     # Returns the directory to the location of this boxes content in the local

data/lib/vagrant/commands/base.rb

@@ -113,9 +113,7 @@ module Vagrant
 
       # Shows the version
       def puts_version
-        File.open(File.join(PROJECT_ROOT, "VERSION"), "r") do |f|
-          puts f.read
-        end
+        puts VERSION
       end
 
       # Returns the `OptionParser` instance to be used with this subcommand,

data/lib/vagrant/commands/package.rb

@@ -53,11 +53,6 @@ module Vagrant
       end
 
       def package_vm(vm)
-        if !vm.powered_off?
-          error_and_exit(:vm_power_off_to_package)
-          return # for tests
-        end
-
         vm.package(options)
       end
 
@@ -65,20 +60,20 @@ module Vagrant
         opts.banner = "Usage: vagrant package [--base BASE] [--include FILES]"
 
         # Defaults
-        options[:include] = []
         options[:base] = nil
-        options[:output] = nil
+        options["package.output"] = nil
+        options["package.include"] = []
 
         opts.on("--base BASE", "Name or UUID of VM to create a base box from") do |v|
           options[:base] = v
         end
 
         opts.on("--include x,y,z", Array, "List of files to include in the package") do |v|
-          options[:include] = v
+          options["package.include"] = v
         end
 
         opts.on("-o", "--output FILE", "File to save the package as.") do |v|
-          options[:output] = v
+          options["package.output"] = v
         end
       end
     end

data/lib/vagrant/commands/up.rb

@@ -23,8 +23,6 @@ module Vagrant
           vm.env.logger.info "VM '#{name}' already created. Booting if its not already running..."
           vm.start
         else
-          vm.env.require_box
-
           vm.env.logger.info "Creating VM '#{name}'"
           vm.up
         end

data/lib/vagrant/config.rb

@@ -67,6 +67,7 @@ module Vagrant
       attr_accessor :max_tries
       attr_accessor :timeout
       attr_accessor :private_key_path
+      attr_accessor :forward_agent
 
       # The attribute(s) below do nothing. They are just kept here to
       # prevent syntax errors for backwards compat.
@@ -85,11 +86,17 @@ module Vagrant
       attr_accessor :log_file
     end
 
+    class NFSConfig < Base
+      attr_accessor :map_uid
+      attr_accessor :map_gid
+    end
+
     class VMConfig < Base
       include Util::StackedProcRunner
 
       attr_accessor :auto_port_range
       attr_accessor :box
+      attr_accessor :box_url
       attr_accessor :box_ovf
       attr_accessor :base_mac
       attr_accessor :boot_mode
@@ -185,13 +192,13 @@ module Vagrant
 
     class PackageConfig < Base
       attr_accessor :name
-      attr_accessor :extension
     end
 
     class VagrantConfig < Base
       attr_accessor :dotfile_name
       attr_accessor :log_output
       attr_accessor :home
+      attr_accessor :host
 
       def home
         @home ? File.expand_path(@home) : nil
@@ -214,6 +221,7 @@ module Vagrant
 
       # Setup default configures
       configures :package, PackageConfig
+      configures :nfs, NFSConfig
       configures :ssh, SSHConfig
       configures :unison, UnisonConfig
       configures :vm, VMConfig
@@ -237,6 +245,12 @@ module Vagrant
       def loaded!
         @loaded = true
       end
+
+      # Deep clones the entire configuration tree using the marshalling
+      # trick. All subclasses must be able to marshal properly.
+      def deep_clone
+        Marshal.load(Marshal.dump(self))
+      end
     end
   end
 end

data/lib/vagrant/downloaders/file.rb

@@ -9,7 +9,7 @@ module Vagrant
 
       def prepare(source_url)
         if !::File.file?(source_url)
-          raise Actions::ActionException.new(:downloader_file_doesnt_exist, :source_url => source_url)
+          return env.error!(:downloader_file_doesnt_exist, :source_url => source_url)
         end
       end
 

data/lib/vagrant/downloaders/http.rb

@@ -10,7 +10,6 @@ module Vagrant
     class HTTP < Base
       def self.match?(uri)
         # URI.parse barfs on '<drive letter>:\\files \on\ windows'
-        # TODO temprorary
         extracted = URI.extract(uri).first
         extracted && extracted.include?(uri)
       end
@@ -48,6 +47,8 @@ module Vagrant
         end
 
         env.logger.clear_progress
+      rescue SocketError
+        env.error!(:box_download_http_socket_error, :box_url => source_url)
       end
     end
   end

data/lib/vagrant/environment.rb

@@ -15,12 +15,14 @@ module Vagrant
     attr_accessor :cwd
     attr_reader :root_path
     attr_reader :config
+    attr_reader :host
     attr_reader :box
     attr_accessor :vm
     attr_reader :vms
     attr_reader :active_list
     attr_reader :commands
     attr_reader :logger
+    attr_reader :actions
 
     #---------------------------------------------------------------
     # Class Methods
@@ -136,12 +138,14 @@ module Vagrant
       load_root_path!
       load_config!
       load_home_directory!
+      load_host!
       load_box!
       load_config!
       self.class.check_virtualbox!
       load_vm!
       load_active_list!
       load_commands!
+      load_actions!
       self
     end
 
@@ -216,7 +220,7 @@ module Vagrant
     # the logger will just send the log data to a black hole.
     def load_logger!
       resource = vm_name || "vagrant"
-      @logger = ResourceLogger.new(resource, self)
+      @logger = Util::ResourceLogger.new(resource, self)
     end
 
     # Loads the home directory path and creates the necessary subdirectories
@@ -235,6 +239,11 @@ module Vagrant
       end
     end
 
+    # Loads the host class for this environment.
+    def load_host!
+      @host = Hosts::Base.load(self, config.vagrant.host)
+    end
+
     # Loads the specified box for this environment.
     def load_box!
       return unless root_path
@@ -301,6 +310,13 @@ module Vagrant
       @commands = Command.new(self)
     end
 
+    # Loads the instance of {Action} for this environment. This allows
+    # users of the instance to run action sequences in the context of
+    # this environment.
+    def load_actions!
+      @actions = Action.new(self)
+    end
+
     #---------------------------------------------------------------
     # Methods to manage VM
     #---------------------------------------------------------------
@@ -318,7 +334,7 @@ module Vagrant
       end
 
       if data.empty?
-        File.delete(dotfile_path)
+        File.delete(dotfile_path) if File.exist?(dotfile_path)
       else
         File.open(dotfile_path, 'w+') do |f|
           f.write(data.to_json)
@@ -337,18 +353,6 @@ module Vagrant
       error_and_exit(:rootfile_not_found) if !root_path
     end
 
-    def require_box
-      require_root_path
-
-      if !box
-        if !config.vm.box
-          error_and_exit(:box_not_specified)
-        else
-          error_and_exit(:box_specified_doesnt_exist, :box_name => config.vm.box)
-        end
-      end
-    end
-
     def require_persisted_vm
       require_root_path