vagrant 0.8.10 → 0.9.0

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

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       class Destroy
         def initialize(app, env)
@@ -10,8 +10,12 @@ module Vagrant
         end
 
         def call(env)
-          env.ui.info I18n.t("vagrant.actions.box.destroy.destroying", :name => env["box"].name)
-          FileUtils.rm_rf(env["box"].directory)
+          # Delete the existing box
+          env[:ui].info I18n.t("vagrant.actions.box.destroy.destroying", :name => env[:box_name])
+          FileUtils.rm_rf(env[:box_directory])
+
+          # Reload the box collection
+          env[:box_collection].reload!
 
           @app.call(env)
         end

data/lib/vagrant/action/box/download.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     module Box
       class Download
         BASENAME = "box"
@@ -36,9 +36,9 @@ module Vagrant
 
             # Use the class if it matches the given URI or if this
             # is the last class...
-            if classes.length == (i + 1) || klass.match?(@env["box"].uri)
-              @env.ui.info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
-              @downloader = klass.new(@env)
+            if classes.length == (i + 1) || klass.match?(@env["box_url"])
+              @env[:ui].info I18n.t("vagrant.actions.box.download.with", :class => klass.to_s)
+              @downloader = klass.new(@env[:ui])
               break
             end
           end
@@ -47,7 +47,7 @@ module Vagrant
           # just in case for now.
           raise Errors::BoxDownloadUnknownType if !@downloader
 
-          @downloader.prepare(@env["box"].uri)
+          @downloader.prepare(@env["box_url"])
           true
         end
 
@@ -60,7 +60,7 @@ module Vagrant
 
         def recover(env)
           if temp_path && File.exist?(temp_path)
-            env.ui.info I18n.t("vagrant.actions.box.download.cleaning")
+            env[:ui].info I18n.t("vagrant.actions.box.download.cleaning")
             File.unlink(temp_path)
           end
         end
@@ -72,11 +72,11 @@ module Vagrant
         end
 
         def box_temp_path
-          @env.env.tmp_path.join(BASENAME + Time.now.to_i.to_s)
+          @env[:tmp_path].join(BASENAME + Time.now.to_i.to_s)
         end
 
         def download_to(f)
-          @downloader.download!(@env["box"].uri, f)
+          @downloader.download!(@env["box_url"], f)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 require 'vagrant/action/general/package'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       # Packages a box which has already been unpackaged (such as
       # for the `vagrant box repackage` command) by leveraging the
@@ -10,7 +10,7 @@ module Vagrant
         # Alias instead of calling super for testability
         alias_method :general_call, :call
         def call(env)
-          env["package.directory"] = env["box"].directory
+          env["package.directory"] = env["box_directory"]
           general_call(env)
         end
       end

data/lib/vagrant/action/box/unpackage.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'archive/tar/minitar'
 
 module Vagrant
-  class Action
+  module Action
     module Box
       # Unpackages a downloaded box to a given directory with a given
       # name.
@@ -37,16 +37,22 @@ module Vagrant
         end
 
         def setup_box_directory
-          raise Errors::BoxAlreadyExists, :name => @env["box"].name if File.directory?(@env["box"].directory)
+          if File.directory?(@env["box_directory"])
+            raise Errors::BoxAlreadyExists, :name => @env["box_name"]
+          end
 
-          FileUtils.mkdir_p(@env["box"].directory)
-          @box_directory = @env["box"].directory
+          FileUtils.mkdir_p(@env["box_directory"])
+          @box_directory = @env["box_directory"]
         end
 
         def decompress
-          Dir.chdir(@env["box"].directory) do
-            @env.ui.info I18n.t("vagrant.actions.box.unpackage.extracting")
-            Archive::Tar::Minitar.unpack(@env["download.temp_path"], @env["box"].directory.to_s)
+          Dir.chdir(@env["box_directory"]) do
+            @env[:ui].info I18n.t("vagrant.actions.box.unpackage.extracting")
+            begin
+              Archive::Tar::Minitar.unpack(@env["download.temp_path"], @env["box_directory"].to_s)
+            rescue SystemCallError
+              raise Errors::BoxUnpackageFailure
+            end
           end
         end
       end

data/lib/vagrant/action/box/verify.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     module Box
       class Verify
         def initialize(app, env)
@@ -8,10 +8,10 @@ module Vagrant
         end
 
         def call(env)
-          begin
-            env.ui.info I18n.t("vagrant.actions.box.verify.verifying")
-            VirtualBox::Appliance.new(env["box"].ovf_file.to_s)
-          rescue Exception
+          @env[:ui].info I18n.t("vagrant.actions.box.verify.verifying")
+
+          driver = Driver::VirtualBox.new(nil)
+          if !driver.verify_image(env["box_directory"].join("box.ovf").to_s)
             raise Errors::BoxVerificationFailed
           end
 

data/lib/vagrant/action/builder.rb

@@ -1,5 +1,5 @@
 module Vagrant
-  class Action
+  module Action
     # Action builder which provides a nice DSL for building up
     # a middleware sequence for Vagrant actions. This code is based
     # heavily off of `Rack::Builder` and `ActionDispatch::MiddlewareStack`
@@ -23,14 +23,6 @@ module Vagrant
         instance_eval(&block) if block_given?
       end
 
-      # Returns the current stack of middlewares. You probably won't
-      # need to use this directly, and it's recommended that you don't.
-      #
-      # @return [Array]
-      def stack
-        @stack ||= []
-      end
-
       # Returns a mergeable version of the builder. If `use` is called with
       # the return value of this method, then the stack will merge, instead
       # of being treated as a separate single middleware.
@@ -46,10 +38,12 @@ module Vagrant
       #
       # @param [Class] middleware The middleware class
       def use(middleware, *args, &block)
-        if middleware.kind_of?(Builder)
-          # Prepend with a environment setter if args are given
-          self.use(Env::Set, *args, &block) if !args.empty? && args.first.is_a?(Hash)
+        # Prepend with a environment setter if args are given
+        if !args.empty? && args.first.is_a?(Hash) && middleware != Env::Set
+          self.use(Env::Set, args.shift, &block)
+        end
 
+        if middleware.kind_of?(Builder)
           # Merge in the other builder's stack into our own
           self.stack.concat(middleware.stack)
         else
@@ -75,9 +69,9 @@ module Vagrant
         insert(index + 1, middleware, *args, &block)
       end
 
-      # Swaps out the given middlware object or index with the new
+      # Replaces the given middlware object or index with the new
       # middleware.
-      def swap(index, middleware, *args, &block)
+      def replace(index, middleware, *args, &block)
         if index.is_a?(Integer)
           delete(index)
           insert(index, middleware, *args, &block)
@@ -93,6 +87,13 @@ module Vagrant
         stack.delete_at(index)
       end
 
+      # Runs the builder stack with the given environment.
+      def call(env)
+        to_app(env).call(env)
+      end
+
+      protected
+
       # Returns the numeric index for the given middleware object.
       #
       # @param [Object] object The item to find the index for
@@ -105,6 +106,14 @@ module Vagrant
         nil
       end
 
+      # Returns the current stack of middlewares. You probably won't
+      # need to use this directly, and it's recommended that you don't.
+      #
+      # @return [Array]
+      def stack
+        @stack ||= []
+      end
+
       # Converts the builder stack to a runnable action sequence.
       #
       # @param [Vagrant::Action::Environment] env The action environment
@@ -114,11 +123,6 @@ module Vagrant
         # and predictable behavior upon exceptions.
         Warden.new(stack.dup, env)
       end
-
-      # Runs the builder stack with the given environment.
-      def call(env)
-        to_app(env).call(env)
-      end
     end
   end
 end

data/lib/vagrant/action/builtin.rb

@@ -1,108 +1,146 @@
 module Vagrant
-  class Action
-    # Registers the builtin actions. These are locked away in a
-    # method so that their definition can be deferred until after
-    # all the necessary Vagrant libraries are loaded. Hopefully
-    # in the future this will no longer be necessary with autoloading.
-    def self.builtin!
+  module Action
+    # Registers the builtin actions with a specific registry.
+    #
+    # These are the pre-built action sequences that are shipped with
+    # Vagrant itself.
+    def self.builtin!(registry)
       # provision - Provisions a running VM
-      register(:provision, Builder.new do
-        use VM::Provision
-      end)
+      registry.register(:provision) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::Provision
+        end
+      end
 
       # start - Starts a VM, assuming it already exists on the
       # environment.
-      register(:start, Builder.new do
-        use VM::CleanMachineFolder
-        use VM::ClearForwardedPorts
-        use VM::ForwardPorts
-        use VM::Provision
-        use VM::NFS
-        use VM::ClearSharedFolders
-        use VM::ShareFolders
-        use VM::HostName
-        use VM::Network
-        use VM::Customize
-        use VM::Modify
-        use VM::Boot
-      end)
+      registry.register(:start) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::CleanMachineFolder
+          use VM::ClearForwardedPorts
+          use VM::CheckPortCollisions, :port_collision_handler => :correct
+          use VM::ForwardPorts
+          use VM::Provision
+          use VM::PruneNFSExports
+          use VM::NFS
+          use VM::ClearSharedFolders
+          use VM::ShareFolders
+          use VM::HostName
+          use VM::ClearNetworkInterfaces
+          use VM::Network
+          use VM::Customize
+          use VM::Boot
+        end
+      end
 
       # halt - Halts the VM, attempting gracefully but then forcing
       # a restart if fails.
-      register(:halt, Builder.new do
-        use VM::DiscardState
-        use VM::Halt
-      end)
+      registry.register(:halt) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::DiscardState
+          use VM::Halt
+        end
+      end
 
       # suspend - Suspends the VM
-      register(:suspend, Builder.new do
-        use VM::Suspend
-      end)
+      registry.register(:suspend) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::Suspend
+        end
+      end
 
       # resume - Resume a VM
-      register(:resume, Builder.new do
-        use VM::Resume
-      end)
+      registry.register(:resume) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::CheckPortCollisions
+          use VM::Resume
+        end
+      end
 
       # reload - Halts then restarts the VM
-      register(:reload, Builder.new do
-        use Action[:halt]
-        use Action[:start]
-      end)
+      registry.register(:reload) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use registry.get(:halt)
+          use registry.get(:start)
+        end
+      end
 
       # up - Imports, prepares, then starts a fresh VM.
-      register(:up, Builder.new do
-        use VM::CheckBox
-        use VM::Import
-        use VM::MatchMACAddress
-        use VM::CheckGuestAdditions
-        use Action[:start]
-      end)
+      registry.register(:up) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use VM::CheckBox
+          use VM::Import
+          use VM::CheckGuestAdditions
+          use VM::MatchMACAddress
+          use registry.get(:start)
+        end
+      end
 
       # destroy - Halts, cleans up, and destroys an existing VM
-      register(:destroy, Builder.new do
-        use Action[:halt], :force => true
-        use VM::ProvisionerCleanup
-        use VM::ClearNFSExports
-        use VM::Destroy
-        use VM::CleanMachineFolder
-        use VM::DestroyUnusedNetworkInterfaces
-      end)
+      registry.register(:destroy) do
+        Builder.new do
+          use General::Validate
+          use VM::CheckAccessible
+          use registry.get(:halt), :force => true
+          use VM::ProvisionerCleanup
+          use VM::PruneNFSExports
+          use VM::Destroy
+          use VM::CleanMachineFolder
+          use VM::DestroyUnusedNetworkInterfaces
+        end
+      end
 
       # package - Export and package the VM
-      register(:package, Builder.new do
-        use Action[:halt]
-        use VM::ClearForwardedPorts
-        use VM::ClearSharedFolders
-        use VM::Modify
-        use VM::Export
-        use VM::PackageVagrantfile
-        use VM::Package
-      end)
+      registry.register(:package) do
+        Builder.new do
+          use General::Validate
+          use VM::SetupPackageFiles
+          use VM::CheckAccessible
+          use registry.get(:halt)
+          use VM::ClearForwardedPorts
+          use VM::ClearSharedFolders
+          use VM::Export
+          use VM::PackageVagrantfile
+          use VM::Package
+        end
+      end
 
       # box_add - Download and add a box.
-      register(:box_add, Builder.new do
-        use Box::Download
-        use Box::Unpackage
-        use Box::Verify
-      end)
+      registry.register(:box_add) do
+        Builder.new do
+          use Box::Download
+          use Box::Unpackage
+          use Box::Verify
+        end
+      end
 
       # box_remove - Removes/deletes a box.
-      register(:box_remove, Builder.new do
-        use Box::Destroy
-      end)
+      registry.register(:box_remove) do
+        Builder.new do
+          use Box::Destroy
+        end
+      end
 
       # box_repackage - Repackages a box.
-      register(:box_repackage, Builder.new do
-        use Box::Package
-      end)
-
-      # Other callbacks. There will be more of these in the future. For
-      # now, these are limited to what are needed internally.
-      register(:before_action_run, Builder.new do
-        use General::Validate
-        use VM::CheckAccessible
-      end)
+      registry.register(:box_repackage) do
+        Builder.new do
+          use Box::Package
+        end
+      end
     end
   end
 end