vagrant-vbguest 0.7.1 → 0.8.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.8.0
+
+  - Adds Vagrant 1.2 compatibility [GH-59], [GH-60], [GH-62] /
+    (thanks @Andrew8xx8 for pointing directions)
+  - Fix basic/fallback linux installer [GH-56]
+  - Guard auto-reload on broken vagrant builds.
+    Some varant 1.1.x versions have a bug regarding ssh and cleaning
+    up old connections, which results in varant crashing when a box
+    is reloaded.
+
 ## 0.7.1
 
   - Fix auto-reloading for vagrant 1.1 [GH-52]

data/lib/vagrant-vbguest.rb

@@ -8,7 +8,7 @@ end
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)
 
 require "vagrant-vbguest/errors"
-require 'vagrant-vbguest/helpers'
+require 'vagrant-vbguest/vagrant_compat'
 
 require 'vagrant-vbguest/machine'
 
@@ -24,8 +24,6 @@ require 'vagrant-vbguest/installers/redhat'
 
 require 'vagrant-vbguest/middleware'
 
-require 'vagrant-vbguest/download'
-
 module VagrantVbguest
 
   class Plugin < Vagrant.plugin("2")
@@ -42,7 +40,6 @@ module VagrantVbguest
     end
 
     command('vbguest') do
-      require File.expand_path("../vagrant-vbguest/command", __FILE__)
       Command
     end
 

data/lib/vagrant-vbguest/command.rb

@@ -73,48 +73,18 @@ module VagrantVbguest
       options = vm.config.vbguest.to_hash.merge(options)
       machine = VagrantVbguest::Machine.new(vm, options)
       status  = machine.state
-      vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
+      vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant_vbguest.status.#{status}", machine.info))
 
       if _method != :status
         machine.send(_method)
       end
 
-      reboot(vm, options) if _rebootable && machine.reboot?
+      reboot!(vm, options) if _rebootable && machine.reboot?
     end
 
-    def check_runable_on(vm); end
-  end
-
-
-  if Vagrant::VERSION < "1.1.0"
-    require 'vagrant/command/start_mixins'
-
-    class Command < Vagrant::Command::Base
-      include CommandCommons
-      include Vagrant::Command::StartMixins
-
-      def check_runable_on(vm)
-        raise Vagrant::Errors::VMNotCreatedError if !vm.created?
-        raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
-        raise Vagrant::Errors::VMNotRunningError if vm.state != :running
-      end
+    def check_runable_on(vm)
+      raise NotImplementedError
     end
-
-  else
-    require Vagrant.source_root.join("plugins/commands/up/start_mixins")
-
-    class Command < Vagrant.plugin("2", :command)
-      include CommandCommons
-      include VagrantPlugins::CommandUp::StartMixins
-
-      def check_runable_on(vm)
-        raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
-        raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
-        raise Vagrant::Errors::VMNotRunningError if vm.state.id != :running
-        raise VagrantVbguest::NoVirtualBoxMachineError if vm.provider.class != VagrantPlugins::ProviderVirtualBox::Provider
-      end
-    end
-
   end
 
 end

data/lib/vagrant-vbguest/download.rb

@@ -1,83 +1,28 @@
 module VagrantVbguest
 
-  # This implementation is based on Action::Box::Download by vagrant
-  #
-  # This adoption does not run as a action/middleware, but is called manually
-  #
-  # MIT License - Mitchell Hashimoto and John Bender - https://github.com/mitchellh/vagrant
-  #
-  #
-  #
-  class Download
+  class DownloadBase
+    attr_reader :source, :destination, :downloader
 
-    BASENAME = "vbguest"
-
-    include Vagrant::Util
-
-    attr_reader :temp_path
-
-    def initialize(env)
-      @env = env
-      @env["download.classes"] ||= []
-      @env["download.classes"] += [Vagrant::Downloaders::HTTP, Vagrant::Downloaders::File]
+    def initialize(source, destination, options=nil)
       @downloader = nil
-    end
-
-    def instantiate_downloader
-      # Assign to a temporary variable since this is easier to type out,
-      # since it is used so many times.
-      classes = @env["download.classes"]
-
-      # Find the class to use.
-      classes.each_index do |i|
-        klass = classes[i]
-
-        # Use the class if it matches the given URI or if this
-        # is the last class...
-        if classes.length == (i + 1) || klass.match?(@env[:url])
-          @env[:ui].info I18n.t("vagrant.plugins.vbguest.download.with", :class => klass.to_s)
-          @downloader = klass.new(@env[:ui])
-          break
-        end
+      @source = source
+      @destination = destination
+      if File.directory?(destination)
+        @destination = File.join(destination, "vbguest_download_#{Time.now.to_i.to_s}")
       end
-
-      # This line should never be reached, but we'll keep this here
-      # just in case for now.
-      raise Errors::BoxDownloadUnknownType if !@downloader
-
-      @downloader.prepare(@env[:url]) if @downloader.respond_to?(:prepare)
-      true
+      @ui = options[:ui]
     end
 
-    def download
-      if instantiate_downloader
-        with_tempfile do |tempfile|
-          download_to(tempfile)
-          @temp_path = @env["download.temp_path"] = tempfile.path
-        end
-      end
+    def download!
+      raise NotImplementedError
     end
 
     def cleanup
-      if temp_path && File.exist?(temp_path)
-        @env[:ui].info I18n.t("vagrant.plugins.vbguest.download.cleaning")
-        File.unlink(temp_path)
+      if destination && File.exist?(destination)
+        @ui.info I18n.t("vagrant_vbguest.download.cleaning")
+        File.unlink(destination)
       end
     end
-
-    def with_tempfile
-      File.open(temp_filename, Platform.tar_file_options) do |tempfile|
-        yield tempfile
-      end
-    end
-
-    def temp_filename
-      @env[:tmp_path].join(BASENAME + Time.now.to_i.to_s)
-    end
-
-    def download_to(f)
-      @downloader.download!(@env[:url], f)
-    end
-
   end
+
 end

data/lib/vagrant-vbguest/errors.rb

@@ -1,7 +1,7 @@
 module VagrantVbguest
 
   class VbguestError < Vagrant::Errors::VagrantError
-    def error_namespace; "vagrant.plugins.vbguest.errors"; end
+    def error_namespace; "vagrant_vbguest.errors"; end
   end
 
   class IsoPathAutodetectionError < VagrantVbguest::VbguestError

data/lib/vagrant-vbguest/hosts/base.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module VagrantVbguest
   module Hosts
     class Base
@@ -46,7 +48,7 @@ module VagrantVbguest
 
         path = versionize(path)
 
-        if Vagrant::Downloaders::File.match? path
+        if file_match? path
           @additions_file = path
         else
           # :TODO: This will also raise, if the iso_url points to an invalid local path
@@ -62,6 +64,15 @@ module VagrantVbguest
 
       protected
 
+        # fix bug when the vagrant version is higher than 1.2, by moving method Vagrant::Vagrant::File.match? here
+        def file_match?(uri)
+          extracted = ::URI.extract(uri, "file")
+
+          return true if extracted && extracted.include?(uri)
+
+          return ::File.file?(::File.expand_path(uri))
+        end
+
         # Default web URI, where "additions file" can be downloaded.
         #
         # @return [String] A URI template containing the versions placeholder.
@@ -97,14 +108,9 @@ module VagrantVbguest
         #
         # @return [String] The path to the downloaded file
         def download(path)
-          downloader_env = {
-            :ui => @env.ui,
-            :tmp_path => @env.tmp_path,
-            :url => path
-          }
-          @download = VagrantVbguest::Download.new(downloader_env)
-          @download.download
-          @download.temp_path
+          @download = VagrantVbguest::Download.new(path, @env.tmp_path, :ui => @env.ui)
+          @download.download!
+          @download.destination
         end
 
     end

data/lib/vagrant-vbguest/hosts/virtualbox.rb

@@ -20,6 +20,21 @@ module VagrantVbguest
           media_manager_iso || guess_local_iso
         end
 
+        # Kicks off +VagrantVbguest::Download+ to download the additions file
+        # into a temp file.
+        #
+        # To remove the created tempfile call +cleanup+
+        #
+        # @param [String] The path or URI to download
+        #
+        # @return [String] The path to the downloaded file
+        def download(path)
+          temp_path = File.join(@env.tmp_path, "VBoxGuestAdditions_#{version}.iso")
+          @download = VagrantVbguest::Download.new(path, temp_path, :ui => @env.ui)
+          @download.download!
+          @download.destination
+        end
+
       private
 
         # Helper method which queries the VirtualBox media manager

data/lib/vagrant-vbguest/installer.rb

@@ -6,7 +6,7 @@ module VagrantVbguest
   class Installer
 
     class NoInstallerFoundError < Vagrant::Errors::VagrantError
-      error_namespace "vagrant.plugins.vbguest.errors.installer"
+      error_namespace "vagrant_vbguest.errors.installer"
       error_key "no_install_script_for_platform"
     end
 

data/lib/vagrant-vbguest/installers/base.rb

@@ -1,7 +1,7 @@
 module VagrantVbguest
   module Installers
     class Error < Vagrant::Errors::VagrantError
-      error_namespace "vagrant.plugins.vbguest.errors.installer"
+      error_namespace "vagrant_vbguest.errors.installer"
     end
 
     # This is the base class all installers must inherit from
@@ -144,16 +144,16 @@ module VagrantVbguest
       # will start _now_.
       # The message includes the host and installer version strings.
       def yield_installation_waring(path_to_installer)
-        @env.ui.warn I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}",
+        @env.ui.warn I18n.t("vagrant_vbguest.installing#{@options[:force] ? '_forced' : ''}",
           :guest_version => guest_version,
-          :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
+          :installer_version => installer_version(path_to_installer) || I18n.t("vagrant_vbguest.unknown"))
       end
 
       # Helper to yield a warning message to the user, that the installation
       # will be rebuild using the installed GuestAdditions.
       # The message includes the host and installer version strings.
       def yield_rebuild_warning
-        @env.ui.warn I18n.t("vagrant.plugins.vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
+        @env.ui.warn I18n.t("vagrant_vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
           :guest_version => guest_version(true),
           :host_version => @host.version)
       end
@@ -165,8 +165,8 @@ module VagrantVbguest
       # knows there could be a problem. The message includles the installer
       # version.
       def yield_installation_error_warning(path_to_installer)
-        @env.ui.warn I18n.t("vagrant.plugins.vbguest.install_error",
-          :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
+        @env.ui.warn I18n.t("vagrant_vbguest.install_error",
+          :installer_version => installer_version(path_to_installer) || I18n.t("vagrant_vbguest.unknown"))
       end
 
       def iso_file
@@ -183,7 +183,7 @@ module VagrantVbguest
       #
       # @param [String] Path of the file to upload to the +tmp_path*
       def upload(file)
-        env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => file, :to => tmp_path))
+        env.ui.info(I18n.t("vagrant_vbguest.start_copy_iso", :from => file, :to => tmp_path))
         communicate.upload(file, tmp_path)
       end
 

data/lib/vagrant-vbguest/installers/linux.rb

@@ -13,7 +13,7 @@ module VagrantVbguest
       # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`
       def self.distro(vm)
         @@ditro ||= {}
-        @@ditro[ VagrantVbguest::Helpers::VmCompatible.vm_id(vm) ] ||= vm.guest.distro_dispatch
+        @@ditro[ vm_id(vm) ] ||= distro_name vm
       end
 
       # Matches if the operating system name prints "Linux"
@@ -24,7 +24,7 @@ module VagrantVbguest
       # therefore should do a more specific check.
       def self.match?(vm)
         raise Error, :_key => :do_not_inherit_match_method if self != Linux
-        communicate.test("uname | grep 'Linux'")
+        communicate_to(vm).test("uname | grep 'Linux'")
       end
 
       # defaults the temp path to "/tmp/VBoxGuestAdditions.iso" for all Linux based systems
@@ -44,7 +44,7 @@ module VagrantVbguest
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
-        env.ui.warn I18n.t("vagrant.plugins.vbguest.errors.installer.generic_linux_installer") if self.class == Linux
+        env.ui.warn I18n.t("vagrant_vbguest.errors.installer.generic_linux_installer") if self.class == Linux
         upload(iso_file)
         mount_iso(opts, &block)
         execute_installer(opts, &block)
@@ -77,7 +77,7 @@ module VagrantVbguest
 
         communicate.sudo('VBoxService --version', :error_check => false) do |type, data|
           if (v = data.to_s.match(/^(\d+\.\d+.\d+)/)) && driver_version != v[1]
-            @env.ui.warn(I18n.t("vagrant.plugins.vbguest.guest_version_reports_differ", :driver => driver_version, :service => v[1]))
+            @env.ui.warn(I18n.t("vagrant_vbguest.guest_version_reports_differ", :driver => driver_version, :service => v[1]))
             @guest_version = v[1]
           end
         end

data/lib/vagrant-vbguest/machine.rb

@@ -23,7 +23,7 @@ module VagrantVbguest
       while (command = runlist.shift)
         @logger.debug("Running command #{command} from runlist")
         if !self.send(command)
-          env.ui.error('vagrant.plugins.vbguest.machine_loop_guard', :command => command, :state => current_state)
+          env.ui.error('vagrant_vbguest.machine_loop_guard', :command => command, :state => current_state)
           return false
         end
         return run if current_state != state
@@ -32,12 +32,12 @@ module VagrantVbguest
     end
 
     def install
-      return env.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_installation")) if options[:no_install] && !options[:force]
+      return env.ui.warn(I18n.t("vagrant_vbguest.skipped_installation")) if options[:no_install] && !options[:force]
       guest_additions_state.trigger :install
     end
 
     def rebuild
-      return env.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_rebuild")) if options[:no_install] && !options[:force]
+      return env.ui.warn(I18n.t("vagrant_vbguest.skipped_rebuild")) if options[:no_install] && !options[:force]
       guest_additions_state.trigger :rebuild
     end
 

data/lib/vagrant-vbguest/middleware.rb

@@ -16,17 +16,26 @@ module VagrantVbguest
       @env    = env
       vm      = env[:vm] || env[:machine]
 
-      options = vm.config.vbguest.to_hash.freeze
+      options = override_config(vm.config.vbguest.to_hash).freeze
 
       if options[:auto_update]
         machine = VagrantVbguest::Machine.new vm, options
         status  = machine.state
-        vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info))
+        vm.env.ui.send((:ok == status ? :success : :warn), I18n.t("vagrant_vbguest.status.#{status}", machine.info))
         machine.run
         reboot(vm, options) if machine.reboot?
       end
+
       @app.call(env)
     end
 
+    def override_config(opts)
+      if opts[:auto_reboot] && Vagrant::VERSION.between?("1.1.0", "1.1.5") && Vagrant::VERSION != "1.1.4"
+        @env[:ui].warn I18n.t("vagrant_vbguest.vagrant_11_reload_issues")
+        opts.merge!({:auto_reboot => false})
+      end
+      opts
+    end
+
   end
 end

data/lib/vagrant-vbguest/rebootable.rb

@@ -0,0 +1,39 @@
+module VagrantVbguest
+  module Helpers
+
+    module Rebootable
+      include VmCompatible
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      @@rebooted = {}
+
+      def rebooted?(vm)
+        !!@@rebooted[ self.class.vm_id(vm) ]
+      end
+
+      def reboot?(vm, options)
+        if rebooted?(vm)
+          vm.env.ui.error(I18n.t("vagrant_vbguest.restart_loop_guard_activated"))
+          false
+        elsif options[:auto_reboot]
+          vm.env.ui.warn(I18n.t("vagrant_vbguest.restart_vm"))
+          @@rebooted[ self.class.vm_id(vm) ] = true
+        else
+          vm.env.ui.warn(I18n.t("vagrant_vbguest.suggest_restart", :name => vm.name))
+          false
+        end
+      end
+
+      def reboot(vm, options)
+        raise NotImplementedError
+      end
+
+      def reboot!(vm, options)
+        raise NotImplementedError
+      end
+    end
+
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat.rb

@@ -0,0 +1,18 @@
+vagrant_version = Gem::Version.new(Vagrant::VERSION)
+supported_version = {
+  "< 1.1.0"  => "1_0",
+  "~> 1.1.0" => "1_1",
+  "~> 1.2.0" => "1_2"
+}
+compat_version = supported_version.find { |requirement, version|
+  Gem::Requirement.new(requirement).satisfied_by?(vagrant_version)
+}[1]
+
+if !compat_version
+  # @TODO: yield warning
+  compat_version = supported_version.to_a.last[1]
+end
+
+%w{vm_compatible rebootable command download}.each do |r|
+  require File.expand_path("../vagrant_compat/vagrant_#{compat_version}/#{r}", __FILE__)
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/command.rb

@@ -0,0 +1,17 @@
+require 'vagrant-vbguest/command'
+require 'vagrant/command/start_mixins'
+
+module VagrantVbguest
+
+  class Command < Vagrant::Command::Base
+    include CommandCommons
+    include Vagrant::Command::StartMixins
+
+    def check_runable_on(vm)
+      raise Vagrant::Errors::VMNotCreatedError if !vm.created?
+      raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if vm.state != :running
+    end
+  end
+
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/download.rb

@@ -0,0 +1,51 @@
+require 'vagrant-vbguest/download'
+module VagrantVbguest
+  # This implementation is based on Action::Box::Download by vagrant
+  #
+  # This adoption does not run as a action/middleware, but is called manually
+  #
+  # MIT License - Mitchell Hashimoto and John Bender - https://github.com/mitchellh/vagrant
+  #
+  #
+  #
+  class Download < DownloadBase
+
+    include Vagrant::Util
+
+    def download!
+      if instantiate_downloader
+        File.open(@destination, Platform.tar_file_options) do |destination_file|
+          @downloader.download!(@source, destination_file)
+        end
+      end
+      @destination
+    end
+
+    def instantiate_downloader
+      # Assign to a temporary variable since this is easier to type out,
+      # since it is used so many times.
+      classes = [Vagrant::Downloaders::HTTP, Vagrant::Downloaders::File]
+
+      # Find the class to use.
+      classes.each_index do |i|
+        klass = classes[i]
+
+        # Use the class if it matches the given URI or if this
+        # is the last class...
+        if classes.length == (i + 1) || klass.match?(@source)
+          @ui.info I18n.t("vagrant_vbguest.download.with", :class => klass.to_s)
+          @downloader = klass.new(@ui)
+          break
+        end
+      end
+
+      # This line should never be reached, but we'll keep this here
+      # just in case for now.
+      raise Errors::BoxDownloadUnknownType if !@downloader
+
+      @downloader.prepare(@source) if @downloader.respond_to?(:prepare)
+      true
+    end
+
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/rebootable.rb

@@ -0,0 +1,23 @@
+require 'vagrant-vbguest/rebootable'
+
+module VagrantVbguest
+  module Helpers
+
+    module Rebootable
+      def reboot(vm, options)
+        if reboot? vm, options
+          @env[:action_runner].run(Vagrant::Action::VM::Halt, @env)
+          @env[:action_runner].run(Vagrant::Action::VM::Boot, @env)
+        end
+      end
+
+      # executes the whole reboot process
+      def reboot!(vm, options)
+        if reboot? vm, options
+          vm.reload(options)
+        end
+      end
+    end
+
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/vm_compatible.rb

@@ -0,0 +1,31 @@
+module VagrantVbguest
+  module Helpers
+    module VmCompatible
+      def communicate
+        vm.channel
+      end
+
+      def driver
+        vm.driver
+      end
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def vm_id(vm)
+          vm.uuid
+        end
+
+        def communicate_to(vm)
+          vm.channel
+        end
+
+        def distro_name(vm)
+          vm.guest.distro_dispatch
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/command.rb

@@ -0,0 +1,18 @@
+require 'vagrant-vbguest/command'
+require Vagrant.source_root.join("plugins/commands/up/start_mixins")
+
+module VagrantVbguest
+
+  class Command < Vagrant.plugin("2", :command)
+    include CommandCommons
+    include VagrantPlugins::CommandUp::StartMixins
+
+    def check_runable_on(vm)
+      raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
+      raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if vm.state.id != :running
+      raise VagrantVbguest::NoVirtualBoxMachineError if vm.provider.class != VagrantPlugins::ProviderVirtualBox::Provider
+    end
+  end
+
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/download.rb

@@ -0,0 +1 @@
+require File.expand_path("../../vagrant_1_0/download", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/rebootable.rb

@@ -0,0 +1,30 @@
+require 'vagrant-vbguest/rebootable'
+
+module VagrantVbguest
+  module Helpers
+
+    module Rebootable
+      def reboot(vm, options)
+        if reboot? vm, options
+          simle_reboot = Vagrant::Action::Builder.new.tap do |b|
+            b.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :poweroff, :running do |env2, b2|
+              if !env2[:result]
+                b2.use VagrantPlugins::ProviderVirtualBox::Action::ForcedHalt
+              end
+            end
+            b.use VagrantPlugins::ProviderVirtualBox::Action::Boot
+          end
+          @env[:action_runner].run(simle_reboot, @env)
+        end
+      end
+
+      # executes the whole reboot process
+      def reboot!(vm, options)
+        if reboot? vm, options
+          vm.action(:reload, options)
+        end
+      end
+    end
+
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/vm_compatible.rb

@@ -0,0 +1,31 @@
+module VagrantVbguest
+  module Helpers
+    module VmCompatible
+      def communicate
+        vm.communicate
+      end
+
+      def driver
+        vm.provider.driver
+      end
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def vm_id(vm)
+          vm.id
+        end
+
+        def communicate_to(vm)
+          vm.communicate
+        end
+
+        def distro_name(vm)
+          vm.guest.distro_dispatch
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/command.rb

@@ -0,0 +1 @@
+require File.expand_path("../../vagrant_1_1/command", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/download.rb

@@ -0,0 +1,18 @@
+require 'vagrant-vbguest/download'
+require "vagrant/util/downloader"
+
+module VagrantVbguest
+
+  class Download < DownloadBase
+
+    def download!
+      downloader_options = {}
+      downloader_options[:ui] = @ui
+      @ui.info(I18n.t("vagrant_vbguest.download.started", :source => @source))
+      @downloader = Vagrant::Util::Downloader.new(@source, @destination, downloader_options)
+      @downloader.download!
+    end
+
+  end
+
+end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/rebootable.rb

@@ -0,0 +1 @@
+require File.expand_path("../../vagrant_1_1/rebootable", __FILE__)

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/vm_compatible.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../../vagrant_1_1/vm_compatible", __FILE__)
+module VagrantVbguest
+  module Helpers
+    module VmCompatible
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      module ClassMethods
+        def distro_name(vm)
+          vm.guest.name
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/lib/vagrant_init.rb

@@ -9,7 +9,7 @@ end
 require 'vagrant-vbguest/core_ext/string/interpolate'
 
 require "vagrant-vbguest/errors"
-require 'vagrant-vbguest/helpers'
+require 'vagrant-vbguest/vagrant_compat'
 
 require 'vagrant-vbguest/machine'
 
@@ -27,8 +27,6 @@ require 'vagrant-vbguest/config'
 require 'vagrant-vbguest/command'
 require 'vagrant-vbguest/middleware'
 
-require 'vagrant-vbguest/download'
-
 Vagrant.config_keys.register(:vbguest) { VagrantVbguest::Config }
 
 Vagrant.commands.register(:vbguest) { VagrantVbguest::Command }

data/locales/en.yml

@@ -1,59 +1,61 @@
 en:
-  vagrant:
-    plugins:
-      vbguest:
-        skipped_installation: "Updating GuestAdditions skipped."
-        skipped_rebuild: "Rebuilding GuestAdditions skipped."
-        installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
-        installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
-        rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
-        rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
-        install_error: "An error occurred during installation of VirtualBox Guest Additions %{installer_version}. Some functionality may not work as intended."
-        start_copy_iso: "Copy iso file %{from} into the box %{to}"
-        restart_vm: "Restarting VM to apply changes..."
-        suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box running `vagrant reload %{name}`"
-        restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
-        machine_loop_guard: "Could not execute %{command} from current state %{state}. To prevent running in circles, we'll stop."
-        guest_version_reports_differ: |-
-          Got different reports about installed GuestAdditions version:
-          Virtualbox on your host claims:   %{driver}
-          VBoxService inside the vm claims: %{service}
-          Going on, assuming VBoxService is correct...
-        unknown: unknown
+  vagrant_vbguest:
+    skipped_installation: "Updating GuestAdditions skipped."
+    skipped_rebuild: "Rebuilding GuestAdditions skipped."
+    installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
+    installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
+    rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
+    rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
+    install_error: "An error occurred during installation of VirtualBox Guest Additions %{installer_version}. Some functionality may not work as intended."
+    start_copy_iso: "Copy iso file %{from} into the box %{to}"
+    restart_vm: "Restarting VM to apply changes..."
+    suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box running `vagrant reload %{name}`"
+    restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
+    machine_loop_guard: "Could not execute %{command} from current state %{state}. To prevent running in circles, we'll stop."
+    guest_version_reports_differ: |-
+      Got different reports about installed GuestAdditions version:
+      Virtualbox on your host claims:   %{driver}
+      VBoxService inside the vm claims: %{service}
+      Going on, assuming VBoxService is correct...
+    vagrant_11_reload_issues: |-
+      This version of vagrant has issues with reloading boxes. `auto_reboot` got disabled as a precaution.
+      Expect errors and run `vagrant halt` and `vagrant up` instead of `vagrant reload`!
+    unknown: unknown
 
-        status:
-          clean: "No installation found."
-          unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
-          not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
-          ok: "GuestAdditions %{guest_version} running --- OK."
+    status:
+      clean: "No installation found."
+      unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
+      not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
+      ok: "GuestAdditions %{guest_version} running --- OK."
 
-        errors:
-          autodetect_iso_path: |-
-            Could not locate a local Virtualbox Guest Additions iso file.
-            Please configure a local path to the iso using `config.vbguest.iso_path`
-            in your Vagrantfile or the `--iso` command line option.
-            If you think this is a bug and vbguest could have guessed the iso_path,
-            please file an issue at: https://github.com/dotless-de/vagrant-vbguest/issues
+    errors:
+      autodetect_iso_path: |-
+        Could not locate a local Virtualbox Guest Additions iso file.
+        Please configure a local path to the iso using `config.vbguest.iso_path`
+        in your Vagrantfile or the `--iso` command line option.
+        If you think this is a bug and vbguest could have guessed the iso_path,
+        please file an issue at: https://github.com/dotless-de/vagrant-vbguest/issues
 
-          downloading_disabled: |-
-            Could not locate a local Virtualbox Guest Additions iso file.
-            However, the no_remote option was set and thus I will not download it from
-            %{from}
-            Please configure a local path to the iso using `config.vbguest.iso_path`
-            in your Vagrantfile or the `--iso` command line option.
+      downloading_disabled: |-
+        Could not locate a local Virtualbox Guest Additions iso file.
+        However, the no_remote option was set and thus I will not download it from
+        %{from}
+        Please configure a local path to the iso using `config.vbguest.iso_path`
+        in your Vagrantfile or the `--iso` command line option.
 
-          no_virtualbox_machine: |-
-            The VBGuest plugin must be used with VirtualBox Machines only.
+      no_virtualbox_machine: |-
+        The VBGuest plugin must be used with VirtualBox Machines only.
 
-          installer:
-            no_installer_for_platform: |-
-              Sorry, don't know how to %{method} Virtualbox Guest Additions on this platform. Stopping installation.
-            generic_linux_installer: |-
-              The guest's platform is currently not supported, will try generic Linux method...
-            do_not_inherit_match_method: |-
-              Installer classes must provide their own `match?` method.
+      installer:
+        no_installer_for_platform: |-
+          Sorry, don't know how to %{method} Virtualbox Guest Additions on this platform. Stopping installation.
+        generic_linux_installer: |-
+          The guest's platform is currently not supported, will try generic Linux method...
+        do_not_inherit_match_method: |-
+          Installer classes must provide their own `match?` method.
 
-        download:
-          with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
-          cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."
-          unknown_type: "Unknown or unsupported URI type given for VirtualBox Guest Additions ISO download."
+    download:
+      started: "Downloading VirtualBox Guest Additions ISO from %{source}"
+      with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
+      cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."
+      unknown_type: "Unknown or unsupported URI type given for VirtualBox Guest Additions ISO download."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -95,7 +95,6 @@ files:
 - lib/vagrant-vbguest/core_ext/string/interpolate.rb
 - lib/vagrant-vbguest/download.rb
 - lib/vagrant-vbguest/errors.rb
-- lib/vagrant-vbguest/helpers.rb
 - lib/vagrant-vbguest/hosts/base.rb
 - lib/vagrant-vbguest/hosts/virtualbox.rb
 - lib/vagrant-vbguest/installer.rb
@@ -106,6 +105,20 @@ files:
 - lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/machine.rb
 - lib/vagrant-vbguest/middleware.rb
+- lib/vagrant-vbguest/rebootable.rb
+- lib/vagrant-vbguest/vagrant_compat.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/command.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/download.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/rebootable.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_0/vm_compatible.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/command.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/download.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/rebootable.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/vm_compatible.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/command.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/download.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/rebootable.rb
+- lib/vagrant-vbguest/vagrant_compat/vagrant_1_2/vm_compatible.rb
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml
@@ -125,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3661598601384978746
+      hash: -1570498090693693149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/vagrant-vbguest/helpers.rb

@@ -1,61 +0,0 @@
-module VagrantVbguest
-  module Helpers
-
-    module Rebootable
-      @@rebooted = {}
-
-      def rebooted?(vm)
-        !!@@rebooted[ VmCompatible.vm_id(vm) ]
-      end
-
-      def reboot(vm, options)
-        run_reboot = if rebooted?(vm)
-          vm.env.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
-          false
-        elsif options[:auto_reboot]
-          vm.env.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
-          @@rebooted[ VmCompatible.vm_id(vm) ] = true
-        else
-          vm.env.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
-          false
-        end
-        return unless run_reboot
-
-        if Vagrant::VERSION < '1.1.0'
-          vm.reload(options)
-        else
-          vm.action(:reload, options)
-        end
-      end
-    end
-
-    module VmCompatible
-
-      if Vagrant::VERSION < '1.1.0'
-        def communicate
-          vm.channel
-        end
-
-        def driver
-          vm.driver
-        end
-
-        def self.vm_id(vm)
-          vm.uuid
-        end
-      else # Vagrant 1.1, and hopefully upwards
-        def communicate
-          vm.communicate
-        end
-
-        def driver
-          vm.provider.driver
-        end
-
-        def self.vm_id(vm)
-          vm.id
-        end
-      end
-    end
-  end
-end