vagrant 0.5.4 → 0.6.0

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

@@ -5,8 +5,6 @@ module Vagrant
       # installed and prints a warning if they're not detected or if the
       # version does not match the installed VirtualBox version.
       class CheckGuestAdditions
-        include Util
-
         def initialize(app, env)
           @app = app
         end
@@ -16,11 +14,11 @@ module Vagrant
           # 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.logger.error Translator.t(:vm_additions_not_detected)
+            env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
           elsif version != VirtualBox.version
-            env.logger.error Translator.t(:vm_additions_version_mismatch,
-                                          :guest_additions_version => version,
-                                          :virtualbox_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

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'forward_ports_helpers')
+require File.expand_path("../forward_ports_helpers", __FILE__)
 
 module Vagrant
   class Action
@@ -19,7 +19,7 @@ module Vagrant
 
         def clear
           if used_ports.length > 0
-            @env.logger.info "Deleting any previously set forwarded ports..."
+            @env.ui.info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
             clear_ports
             @env["vm"].reload!
           end

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'nfs_helpers')
+require File.expand_path("../nfs_helpers", __FILE__)
 
 module Vagrant
   class Action

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

@@ -16,7 +16,7 @@ module Vagrant
 
         def clear_shared_folders
           if @env["vm"].vm.shared_folders.length > 0
-            @env.logger.info "Clearing previously set shared folders..."
+            @env.ui.info I18n.t("vagrant.actions.vm.clear_shared_folders.deleting")
 
             folders = @env["vm"].vm.shared_folders.dup
             folders.each do |shared_folder|

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

@@ -8,7 +8,7 @@ module Vagrant
 
         def call(env)
           if !env.env.config.vm.proc_stack.empty?
-            env.logger.info "Running any VM customizations..."
+            env.ui.info I18n.t("vagrant.actions.vm.customize.running")
             env.env.config.vm.run_procs!(env["vm"].vm)
             env["vm"].vm.save
           end

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

@@ -7,10 +7,9 @@ module Vagrant
         end
 
         def call(env)
-          env.logger.info "Destroying VM and associated drives..."
+          env.ui.info I18n.t("vagrant.actions.vm.destroy.destroying")
           env["vm"].vm.destroy(:destroy_medium => :delete)
           env["vm"].vm = nil
-          env.env.update_dotfile
 
           @app.call(env)
         end

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

@@ -21,7 +21,7 @@ module Vagrant
             # Destroy the network interface if there is only one
             # attached VM (which must be this VM)
             if interface.attached_vms.length == 1
-              env.logger.info "Destroying unused network interface..."
+              env.ui.info I18n.t("vagrant.actions.vm.destroy_network.destroying")
               interface.destroy
             end
           end

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

@@ -10,18 +10,20 @@ module Vagrant
         end
 
         def call(env)
-          logged = false
+          if env["vm"].created?
+            logged = false
 
-          env["vm"].vm.network_adapters.each do |adapter|
-            next if adapter.attachment_type != :host_only
+            env["vm"].vm.network_adapters.each do |adapter|
+              next if adapter.attachment_type != :host_only
 
-            if !logged
-              env.logger.info "Disabling host only networks..."
-              logged = true
-            end
+              if !logged
+                env.ui.info I18n.t("vagrant.actions.vm.disable_networks.disabling")
+                logged = true
+              end
 
-            adapter.enabled = false
-            adapter.save
+              adapter.enabled = false
+              adapter.save
+            end
           end
 
           @app.call(env)

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

@@ -9,8 +9,8 @@ module Vagrant
         end
 
         def call(env)
-          if env["vm"].vm.saved?
-            env.logger.info "Discarding saved state of VM..."
+          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
 

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

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vagrant
   class Action
     module VM
@@ -12,36 +14,33 @@ module Vagrant
         def call(env)
           @env = env
 
-          return env.error!(:vm_power_off_to_package) if !@env["vm"].vm.powered_off?
-          return if env.error?
+          raise Errors::VMPowerOffToPackage.new if !@env["vm"].vm.powered_off?
 
           setup_temp_dir
           export
 
-          @app.call(env) if !env.error?
+          @app.call(env)
 
-          cleanup
+          recover(env) # called to cleanup temp directory
         end
 
-        def cleanup
+        def recover(env)
           if temp_dir && File.exist?(temp_dir)
             FileUtils.rm_rf(temp_dir)
           end
         end
 
         def setup_temp_dir
-          @env.logger.info "Creating temporary directory for export..."
-          @temp_dir = @env["export.temp_dir"] = File.join(@env.env.tmp_path, Time.now.to_i.to_s)
+          @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.logger.info "Exporting VM to #{ovf_path}..."
+          @env.ui.info I18n.t("vagrant.actions.vm.export.exporting")
           @env["vm"].vm.export(ovf_path) do |progress|
-            @env.logger.report_progress(progress.percent, 100, false)
+            @env.ui.report_progress(progress.percent, 100, false)
           end
-        ensure
-          @env.logger.clear_progress
         end
 
         def ovf_path

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

@@ -11,7 +11,7 @@ module Vagrant
           @env = env
 
           threshold_check
-          external_collision_check if !env.error?
+          external_collision_check
         end
 
         #--------------------------------------------------------------
@@ -23,7 +23,7 @@ module Vagrant
         # 1024, which causes the forwarded ports to fail.
         def threshold_check
           @env.env.config.vm.forwarded_ports.each do |name, options|
-            return @env.error!(:vm_port_below_threshold) if options[:hostport] <= 1024
+            raise Errors::ForwardPortBelowThreshold.new if options[:hostport] <= 1024
           end
         end
 
@@ -47,7 +47,9 @@ module Vagrant
           if !options[:auto]
             # Auto fixing is disabled for this port forward, so we
             # must throw an error so the user can fix it.
-            return @env.error!(:vm_port_collision, :name => name, :hostport => options[:hostport].to_s, :guestport => options[:guestport].to_s, :adapter => options[:adapter])
+            raise Errors::ForwardPortCollision.new(:name => name,
+                                                   :host_port => options[:hostport].to_s,
+                                                   :guest_port => options[:guestport].to_s)
           end
 
           # Get the auto port range and get rid of the used ports and
@@ -58,7 +60,10 @@ module Vagrant
           range -= existing_ports
 
           if range.empty?
-            return @env.error!(:vm_port_auto_empty, :vm_name => @env["vm"].name, :name => name, :options => options)
+            raise Errors::ForwardPortAutolistEmpty.new(:vm_name => @env["vm"].name,
+                                                       :name => name,
+                                                       :host_port => options[:hostport].to_s,
+                                                       :guest_port => options[:guestport].to_s)
           end
 
           # Set the port up to be the first one and add that port to
@@ -67,7 +72,9 @@ module Vagrant
           existing_ports << options[:hostport]
 
           # Notify the user
-          @env.logger.info "Fixed port collision: #{name} now on port #{options[:hostport]}"
+          @env.ui.info(I18n.t("vagrant.actions.vm.forward_ports.fixed_collision",
+                       :name => name,
+                       :new_port => options[:hostport]))
         end
 
         #--------------------------------------------------------------
@@ -82,20 +89,25 @@ module Vagrant
         end
 
         def forward_ports
-          @env.logger.info "Forwarding ports..."
+          @env.ui.info I18n.t("vagrant.actions.vm.forward_ports.forwarding")
 
           @env.env.config.vm.forwarded_ports.each do |name, options|
             adapter = options[:adapter]
+            message_attributes = {
+              :name => name,
+              :guest_port => options[:guestport],
+              :host_port => options[:hostport],
+              :adapter => adapter + 1
+            }
 
             # Assuming the only reason to establish port forwarding is because the VM is using Virtualbox NAT networking.
             # Host-only or Bridged networking don't require port-forwarding and establishing forwarded ports on these
             # attachment types has uncertain behaviour.
             if @env["vm"].vm.network_adapters[adapter].attachment_type == :nat
-              @env.logger.info "Forwarding \"#{name}\": #{options[:guestport]} on adapter \##{adapter+1} => #{options[:hostport]}"
+              @env.ui.info(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry", message_attributes))
               forward_port(name, options)
             else
-              @env.logger.info "VirtualBox adapter \##{adapter+1} not configured as \"NAT\"."
-              @env.logger.info "Skipped port forwarding \"#{name}\": #{options[:guestport]} on adapter\##{adapter+1} => #{options[:hostport]}"
+              @env.ui.info(I18n.t("vagrant.actions.vm.forward_ports.non_nat", message_attributes))
             end
           end
 

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

@@ -2,22 +2,17 @@ module Vagrant
   class Action
     module VM
       class Halt
-        include ExceptionCatcher
-
         def initialize(app, env, options=nil)
           @app = app
           env.merge!(options || {})
         end
 
         def call(env)
-          if env["vm"].vm.running?
-            if !env["force"]
-              catch_action_exception(env) { env["vm"].system.halt }
-              return if env.error?
-            end
+          if env["vm"].created? && env["vm"].vm.running?
+            env["vm"].system.halt if !env["force"]
 
             if env["vm"].vm.state(true) != :powered_off
-              env.logger.info "Forcing shutdown of VM..."
+              env.ui.info I18n.t("vagrant.actions.vm.halt.force")
               env["vm"].vm.stop
             end
 

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

@@ -7,25 +7,27 @@ module Vagrant
         end
 
         def call(env)
-          env.logger.info "Importing base VM (#{env.env.box.ovf_file})"
+          env.ui.info I18n.t("vagrant.actions.vm.import.importing", :name => env.env.box.name)
 
-          begin
-            # Import the virtual machine
-            env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file) do |progress|
-              env.logger.report_progress(progress.percent, 100, false)
-            end
-
-            # Flag as erroneous and return if import failed
-            return env.error!(:virtualbox_import_failure) if !env['vm'].vm
-          ensure
-            env.logger.clear_progress
+          # Import the virtual machine
+          env.env.vm.vm = VirtualBox::VM.import(env.env.box.ovf_file.to_s) do |progress|
+            env.ui.report_progress(progress.percent, 100, false)
           end
 
+          # Flag as erroneous and return if import failed
+          raise Errors::VMImportFailure.new if !env["vm"].vm
+
           # Import completed successfully. Continue the chain
-          @app.call(env) if !env.error?
+          @app.call(env)
+        end
 
-          # Interrupted, destroy the VM
-          env["actions"].run(:destroy) if env.interrupted?
+        def recover(env)
+          if env["vm"].created?
+            return if env["vagrant.error"].is_a?(Errors::VagrantError)
+
+            # Interrupted, destroy the VM
+            env["actions"].run(:destroy)
+          end
         end
       end
     end

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

@@ -7,7 +7,7 @@ module Vagrant
         end
 
         def call(env)
-          env.logger.info "Matching MAC addresses..."
+          env.ui.info I18n.t("vagrant.actions.vm.match_mac.matching")
           env["vm"].vm.network_adapters.first.mac_address = env.env.config.vm.base_mac
           env["vm"].vm.save
 

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

@@ -4,17 +4,12 @@ module Vagrant
       # Networking middleware for Vagrant. This enables host only
       # networking on VMs if configured as such.
       class Network
-        include ExceptionCatcher
-
         def initialize(app, env)
           @app = app
           @env = env
 
           env["config"].vm.network_options.compact.each do |network_options|
-            if !verify_no_bridge_collision(network_options)
-              env.error!(:network_collides)
-              return
-            end
+            raise Errors::NetworkCollision.new if !verify_no_bridge_collision(network_options)
           end
         end
 
@@ -24,13 +19,11 @@ module Vagrant
 
           @app.call(env)
 
-          if !env.error? && enable_network?
-            catch_action_exception(env) do
-              @env.logger.info "Enabling host only network..."
-              @env["vm"].system.prepare_host_only_network
-              @env.env.config.vm.network_options.compact.each do |network_options|
-                @env["vm"].system.enable_host_only_network(network_options)
-              end
+          if enable_network?
+            @env.ui.info I18n.t("vagrant.actions.vm.network.enabling")
+            @env["vm"].system.prepare_host_only_network
+            @env.env.config.vm.network_options.compact.each do |network_options|
+              @env["vm"].system.enable_host_only_network(network_options)
             end
           end
         end
@@ -61,7 +54,7 @@ module Vagrant
         # Enables and assigns the host only network to the proper
         # adapter on the VM, and saves the adapter.
         def assign_network
-          @env.logger.info "Preparing host only network..."
+          @env.ui.info I18n.t("vagrant.actions.vm.network.preparing")
 
           @env.env.config.vm.network_options.compact.each do |network_options|
             adapter = @env["vm"].vm.network_adapters[network_options[:adapter]]
@@ -90,10 +83,10 @@ module Vagrant
             end
           end
 
-          return @env.error!(:network_not_found, :name => net_options[:name]) if net_options[:name]
+          raise Errors::NetworkNotFound.new(:name => net_options[:name]) if net_options[:name]
 
           # One doesn't exist, create it.
-          @env.logger.info "Creating new host only network for environment..."
+          @env.ui.info I18n.t("vagrant.actions.vm.network.creating")
 
           ni = interfaces.create
           ni.enable_static(network_ip(net_options[:ip], net_options[:netmask]),

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'nfs_helpers')
+require File.expand_path("../nfs_helpers", __FILE__)
 
 module Vagrant
   class Action
@@ -16,7 +16,6 @@ module Vagrant
       #      folder.
       #
       class NFS
-        include ExceptionCatcher
         include NFSHelpers
 
         def initialize(app,env)
@@ -37,12 +36,13 @@ module Vagrant
             export_folders
           end
 
-          return if env.error?
-
           @app.call(env)
 
-          mount_folders if !folders.empty? && !env.error?
-          clear_nfs_exports(env) if env.error?
+          mount_folders if !folders.empty?
+        end
+
+        def recover(env)
+          clear_nfs_exports(env)
         end
 
         # Returns the folders which are to be synced via NFS.
@@ -91,7 +91,7 @@ module Vagrant
 
           # The options on the hash get priority, then the default
           # values
-          value = opts[key] || @env["config"].nfs.send(key)
+          value = opts.has_key?(key) ? opts[key] : @env["config"].nfs.send(key)
           return value if value != :auto
 
           # Get UID/GID from folder if we've made it this far
@@ -104,20 +104,16 @@ module Vagrant
         # involves adding a line to `/etc/exports` for this VM, but it is
         # up to the host class to define the specific behavior.
         def export_folders
-          @env.logger.info "Exporting NFS shared folders..."
+          @env.ui.info I18n.t("vagrant.actions.vm.nfs.exporting")
 
-          catch_action_exception(@env) do
-            @env["host"].nfs_export(guest_ip, folders)
-          end
+          @env["host"].nfs_export(guest_ip, folders)
         end
 
         # Uses the system class to mount the NFS folders.
         def mount_folders
-          @env.logger.info "Mounting NFS shared folders..."
+          @env.ui.info I18n.t("vagrant.actions.vm.nfs.mounting")
 
-          catch_action_exception(@env) do
-            @env["vm"].system.mount_nfs(host_ip, folders)
-          end
+          @env["vm"].system.mount_nfs(host_ip, folders)
         end
 
         # Returns the IP address of the first host only network adapter
@@ -151,9 +147,9 @@ module Vagrant
 
         # Verifies that the host is set and supports NFS.
         def verify_settings
-          return @env.error!(:nfs_host_required) if @env["host"].nil?
-          return @env.error!(:nfs_not_supported) if !@env["host"].nfs?
-          return @env.error!(:nfs_no_host_network) if @env["config"].vm.network_options.empty?
+          raise Errors::NFSHostRequired.new if @env["host"].nil?
+          raise Errors::NFSNotSupported.new if !@env["host"].nfs?
+          raise Errors::NFSNoHostNetwork.new if @env["config"].vm.network_options.empty?
         end
       end
     end