vagrant-vbguest 0.7.0.pre1 → 0.7.0.pre2

data/Gemfile

@@ -7,5 +7,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.1.2'
-end
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+end

data/lib/vagrant-vbguest.rb

@@ -12,6 +12,9 @@ require 'vagrant-vbguest/helpers'
 
 require 'vagrant-vbguest/machine'
 
+require 'vagrant-vbguest/hosts/base'
+require 'vagrant-vbguest/hosts/virtualbox'
+
 require 'vagrant-vbguest/installer'
 require 'vagrant-vbguest/installers/base'
 require 'vagrant-vbguest/installers/linux'

data/lib/vagrant-vbguest/download.rb

@@ -34,7 +34,7 @@ module VagrantVbguest
 
         # Use the class if it matches the given URI or if this
         # is the last class...
-        if classes.length == (i + 1) || klass.match?(@env[:iso_url])
+        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
@@ -45,7 +45,7 @@ module VagrantVbguest
       # just in case for now.
       raise Errors::BoxDownloadUnknownType if !@downloader
 
-      @downloader.prepare(@env[:iso_url])
+      @downloader.prepare(@env[:url]) if @downloader.respond_to?(:prepare)
       true
     end
 
@@ -66,17 +66,17 @@ module VagrantVbguest
     end
 
     def with_tempfile
-      File.open(iso_temp_path, Platform.tar_file_options) do |tempfile|
+      File.open(temp_filename, Platform.tar_file_options) do |tempfile|
         yield tempfile
       end
     end
 
-    def iso_temp_path
+    def temp_filename
       @env[:tmp_path].join(BASENAME + Time.now.to_i.to_s)
     end
 
     def download_to(f)
-      @downloader.download!(@env[:iso_url], f)
+      @downloader.download!(@env[:url], f)
     end
 
   end

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

@@ -0,0 +1,112 @@
+module VagrantVbguest
+  module Hosts
+    class Base
+      include VagrantVbguest::Helpers::VmCompatible
+
+      attr_reader :env, :vm, :options
+
+      def initialize(vm, options=nil)
+        @vm = vm
+        @env = vm.env
+        @options = options
+      end
+
+      # Determinates the host's version
+      #
+      # @return [String] The version code of the *host*'s virtualisation
+      def version
+        @version ||= driver.version
+      end
+
+
+      # Additions-file-detection-magig.
+      #
+      # Detection runs in those stages:
+      # 1. Uses the +iso_path+ config option, if present and not set to +:auto+
+      # 2. Look out for a local additions file
+      # 3. Use the default web URI
+      #
+      # If the detected or configured path is not a local file and remote downloads
+      # are allowed (the config option +:no_remote+ is NOT set) it will try to
+      # download that file into a temp file using Vagrants Downloaders.
+      # If remote downloads are prohibited (the config option +:no_remote+ IS set)
+      # a +VagrantVbguest::IsoPathAutodetectionError+ will be thrown
+      #
+      # @return [String] A absolute path to the GuestAdditions iso file.
+      #                  This might be a temp-file, e.g. when downloaded from web.
+      def additions_file
+        return @additions_file if @additions_file
+
+        path = options[:iso_path]
+        if !path || path.empty? || path == :auto
+          path = local_path
+          path = web_path if !options[:no_remote] && !path
+        end
+        raise VagrantVbguest::IsoPathAutodetectionError if !path || path.empty?
+
+        path = versionize(path)
+
+        if Vagrant::Downloaders::File.match? path
+          @additions_file = path
+        else
+          # :TODO: This will also raise, if the iso_url points to an invalid local path
+          raise VagrantVbguest::DownloadingDisabledError.new(:from => path) if options[:no_remote]
+          @additions_file = download path
+        end
+      end
+
+      # If needed, remove downloaded temp file
+      def cleanup
+        @download.cleanup if @download
+      end
+
+      protected
+
+        # Default web URI, where "additions file" can be downloaded.
+        #
+        # @return [String] A URI template containing the versions placeholder.
+        def web_path
+          raise NotImplementedError
+        end
+
+        # Finds the "additions file" on the host system.
+        # Returns +nil+ if none found.
+        #
+        # @return [String] Absolute path to the local "additions file", or +nil+ if not found.
+        def local_path
+          raise NotImplementedError
+        end
+
+        # replaces the veriosn placeholder with the additions
+        # version string
+        #
+        # @param [String] A path or URL (or any other String)
+        #
+        # @retrun [String] A copy of the passed string, with verision
+        #                  placeholder replaced
+        def versionize(path)
+          path % {:version => version}
+        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)
+          downloader_env = {
+            :ui => @env.ui,
+            :tmp_path => @env.tmp_path,
+            :url => path
+          }
+          @download = VagrantVbguest::Download.new(downloader_env)
+          @download.download
+          @download.temp_path
+        end
+
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+module VagrantVbguest
+  module Hosts
+    class VirtualBox < Base
+
+      protected
+
+        # Default web URI, where GuestAdditions iso file can be downloaded.
+        #
+        # @return [String] A URI template containing the versions placeholder.
+        def web_path
+          "http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso"
+        end
+
+
+        # Finds GuestAdditions iso file on the host system.
+        # Returns +nil+ if none found.
+        #
+        # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
+        def local_path
+          media_manager_iso || guess_local_iso
+        end
+
+      private
+
+        # Helper method which queries the VirtualBox media manager
+        # for a +VBoxGuestAdditions.iso+ file.
+        # Returns +nil+ if none found.
+        #
+        # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
+        def media_manager_iso
+          (m = driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions(?:_#{version})?\.iso)$/i)) && m[1]
+        end
+
+        # Find the first GuestAdditions iso file which exists on the host system
+        #
+        # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
+        def guess_local_iso
+          Array(platform_path).find do |path|
+            path && File.exists?(path)
+          end
+        end
+
+        # Makes an educated guess where the GuestAdditions iso file
+        # could be found on the host system depending on the OS.
+        # Returns +nil+ if no the file is not in it's place.
+        def platform_path
+          [:linux, :darwin, :cygwin, :windows].each do |sys|
+            return self.send("#{sys}_path") if Vagrant::Util::Platform.respond_to?("#{sys}?") && Vagrant::Util::Platform.send("#{sys}?")
+          end
+          nil
+        end
+
+        # Makes an educated guess where the GuestAdditions iso file
+        # on linux based systems
+        def linux_path
+          paths = ["/usr/share/virtualbox/VBoxGuestAdditions.iso"]
+          paths.unshift(File.join(ENV['HOME'], '.VirtualBox', "VBoxGuestAdditions_#{version}.iso")) if ENV['HOME']
+          paths
+        end
+
+        # Makes an educated guess where the GuestAdditions iso file
+        # on Macs
+        def darwin_path
+          "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
+        end
+
+        # Makes an educated guess where the GuestAdditions iso file
+        # on windows systems
+        def windows_path
+          if (p = ENV["VBOX_INSTALL_PATH"]) && !p.empty?
+            File.join(p, "VBoxGuestAdditions.iso")
+          elsif (p = ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]) && !p.empty?
+            File.join(p, "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
+          end
+        end
+        alias_method :cygwin_path, :windows_path
+
+        # overwrite the default version string to allow lagacy
+        # '$VBOX_VERSION' as a placerholder
+        def versionize(path)
+          super(path.gsub('$VBOX_VERSION', version))
+        end
+
+    end
+  end
+end

data/lib/vagrant-vbguest/installer.rb

@@ -91,7 +91,7 @@ module VagrantVbguest
     def host_version
       installer = guest_installer
       raise NoInstallerFoundError, :method => 'check host version of' if !installer
-      installer.host_version
+      installer.host.version
     end
 
     def running?

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

@@ -25,12 +25,14 @@ module VagrantVbguest
         false
       end
 
-      attr_reader :env, :vm, :options
+      attr_reader :env, :vm, :options, :host
 
       def initialize(vm, options=nil)
         @vm = vm
         @env = vm.env
         @options = options
+
+        @host = VagrantVbguest::Hosts::VirtualBox.new(vm, options)
       end
 
       # The absolute file path of the GuestAdditions iso file should
@@ -124,12 +126,6 @@ module VagrantVbguest
         @guest_version = guest_version
       end
 
-      # Determinates the host's version
-      #
-      # @return [String] The version code of the Virtual Box *host*
-      def host_version
-        driver.version
-      end
 
       # Determinates the version of the GuestAdditions installer in use
       #
@@ -159,7 +155,7 @@ module VagrantVbguest
       def yield_rebuild_warning
         @env.ui.warn I18n.t("vagrant.plugins.vbguest.rebuild#{@options[:force] ? '_forced' : ''}",
           :guest_version => guest_version(true),
-          :host_version => host_version)
+          :host_version => @host.version)
       end
 
       # Helper to yield a warning message to the user in the event that the
@@ -173,102 +169,17 @@ module VagrantVbguest
           :installer_version => installer_version(path_to_installer) || I18n.t("vagrant.plugins.vbguest.unknown"))
       end
 
-      # GuestAdditions-iso-file-detection-magig.
-      #
-      # Detectio runs in those stages:
-      # 1. Uses the +iso_path+ config option, if present and not set to +:auto+
-      # 2. Look out for a local iso file
-      # 3. Use the default web URI
-      #
-      # If the detected or configured path is not a local file and remote downloads
-      # are allowed (the config option +:no_remote+ is NOT set) it will try to
-      # download that file into a temp file using Vagrants Downloaders.
-      # If remote downloads are prohibited (the config option +:no_remote+ IS set)
-      # a +VagrantVbguest::IsoPathAutodetectionError+ will be thrown
-      #
-      # @return [String] A absolute path to the GuestAdditions iso file.
-      #                  This might be a temp-file, e.g. when downloaded from web.
       def iso_file
-        @iso_file ||= begin
-          iso_path = options[:iso_path]
-          if !iso_path || iso_path.empty? || iso_path == :auto
-            iso_path = local_iso_path
-            iso_path = web_iso_path if !iso_path || iso_path.empty? && !options[:no_remote]
-          end
-          raise VagrantVbguest::IsoPathAutodetectionError if !iso_path || iso_path.empty?
-
-          version = host_version
-          iso_path = iso_path.gsub('$VBOX_VERSION', version) % {:version => version}
-          if Vagrant::Downloaders::File.match? iso_path
-            iso_path
-          else
-            # :TODO: This will also raise, if the iso_url points to an invalid local path
-            raise VagrantVbguest::DownloadingDisabledError.new(:from => iso_path) if options[:no_remote]
-            downloader_env = {
-              :ui => @env.ui,
-              :tmp_path => @env.tmp_path,
-              :iso_url => iso_path
-            }
-            @download = VagrantVbguest::Download.new(downloader_env)
-            @download.download
-            @download.temp_path
-          end
-        end
-      end
-
-      # Default web URI, where GuestAdditions iso file can be downloaded.
-      #
-      # @return [String] A URI template containing the versions placeholder.
-      def web_iso_path
-        "http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso"
-      end
-
-      # Finds GuestAdditions iso file on the host system.
-      # Returns +nil+ if none found.
-      #
-      # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
-      def local_iso_path
-        media_manager_iso || guess_iso
-      end
-
-      # Helper method which queries the VirtualBox media manager
-      # for a +VBoxGuestAdditions.iso+ file.
-      # Returns +nil+ if none found.
-      #
-      # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
-      def media_manager_iso
-        (m = driver.execute('list', 'dvds').match(/^.+:\s+(.*VBoxGuestAdditions(?:_#{guest_version})?\.iso)$/i)) && m[1]
-      end
-
-      # Makes an educated guess where the GuestAdditions iso file
-      # could be found on the host system depending on the OS.
-      # Returns +nil+ if no the file is not in it's place.
-      #
-      # @return [String] Absolute path to the local GuestAdditions iso file, or +nil+ if not found.
-      def guess_iso
-        paths = if Vagrant::Util::Platform.linux?
-          [
-            (File.join(ENV['HOME'], '.VirtualBox', "VBoxGuestAdditions_#{guest_version}.iso") if ENV['HOME']),
-            "/usr/share/virtualbox/VBoxGuestAdditions.iso"
-          ]
-        elsif Vagrant::Util::Platform.darwin?
-          "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
-        elsif Vagrant::Util::Platform.windows?
-          if (p = ENV["VBOX_INSTALL_PATH"]) && !p.empty?
-            File.join(p, "VBoxGuestAdditions.iso")
-          elsif ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]
-            File.join((ENV["PROGRAM_FILES"] || ENV["ProgramW6432"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
-          end
-        end
-        Array(paths).find { |path| path && File.exists?(path) }
+        @host.additions_file
       end
+      alias_method :additions_file, :iso_file
 
       # A helper method to handle the GuestAdditions iso file upload
       # into the guest box.
       # The file will uploaded to the location given by the +temp_path+ method.
       #
       # @example Default upload
-      #    upload(iso_file)
+      #    upload(file)
       #
       # @param [String] Path of the file to upload to the +tmp_path*
       def upload(file)
@@ -279,7 +190,7 @@ module VagrantVbguest
       # A helper method to delete the uploaded GuestAdditions iso file
       # from the guest box
       def cleanup
-        @download.cleanup if @download
+        @host.cleanup
         communicate.execute("test -f #{tmp_path} && rm #{tmp_path}", :error_check => false) do |type, data|
           env.ui.error(data.chomp, :prefix => false)
         end

data/lib/vagrant-vbguest/machine.rb

@@ -14,20 +14,6 @@ module VagrantVbguest
       @logger.debug("initialize vbguest machine for VM '#{vm.name}' (#{vm.to_s})")
 
       @installer = Installer.new vm, options
-
-      @ga_machine = MicroMachine.new(:pending).tap { |m|
-        m.when :install, :pending => :installed
-        m.when :start,   :pending => :started
-        m.when :rebuild, :pending => :rebuilt, :started => :rebuilt
-
-        m.on(:installed) { installer.install }
-        m.on(:started)   { installer.start }
-        m.on(:rebuilt)   { installer.rebuild }
-      }
-
-      @box_machine = MicroMachine.new(:first_boot).tap { |m|
-        m.when :reboot, :first_boot => :rebooted
-      }
     end
 
     def run
@@ -47,24 +33,24 @@ module VagrantVbguest
 
     def install
       return env.ui.warn(I18n.t("vagrant.plugins.vbguest.skipped_installation")) if options[:no_install] && !options[:force]
-      @ga_machine.trigger :install
+      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]
-      @ga_machine.trigger :rebuild
+      guest_additions_state.trigger :rebuild
     end
 
     def start
-      @ga_machine.trigger :start
+      guest_additions_state.trigger :start
     end
 
-    def installation_ran?; @ga_machine == :installed end
-    def started?; @ga_machine == :started end
-    def rebuilt?; @ga_machine == :rebuilt end
+    def installation_ran?; guest_additions_state == :installed end
+    def started?; guest_additions_state == :started end
+    def rebuilt?; guest_additions_state == :rebuilt end
 
-    def reboot;  @box_machine.trigger :reboot end
-    def reboot?; @box_machine.state == :rebooted end
+    def reboot;  box_state.trigger :reboot end
+    def reboot?; box_state.state == :rebooted end
 
     def steps(state)
       case state
@@ -95,5 +81,25 @@ module VagrantVbguest
         :guest_version => installer.guest_version
       }
     end
+
+    protected
+
+      def guest_additions_state
+        @guest_additions_state ||= MicroMachine.new(:pending).tap { |m|
+          m.when :install, :pending => :installed
+          m.when :start,   :pending => :started
+          m.when :rebuild, :pending => :rebuilt, :started => :rebuilt
+
+          m.on(:installed) { installer.install }
+          m.on(:started)   { installer.start }
+          m.on(:rebuilt)   { installer.rebuild }
+        }
+      end
+
+      def box_state
+        @box_state ||= MicroMachine.new(:first_boot).tap { |m|
+          m.when :reboot, :first_boot => :rebooted
+        }
+      end
   end
 end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.7.0.pre1"
+  VERSION = "0.7.0.pre2"
 end

data/lib/vagrant_init.rb

@@ -13,6 +13,9 @@ require 'vagrant-vbguest/helpers'
 
 require 'vagrant-vbguest/machine'
 
+require 'vagrant-vbguest/hosts/base'
+require 'vagrant-vbguest/hosts/virtualbox'
+
 require 'vagrant-vbguest/installer'
 require 'vagrant-vbguest/installers/base'
 require 'vagrant-vbguest/installers/linux'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre1
+  version: 0.7.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -96,6 +96,8 @@ files:
 - 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
 - lib/vagrant-vbguest/installers/base.rb
 - lib/vagrant-vbguest/installers/debian.rb
@@ -123,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1097977286854134739
+      hash: 3162000350700078297
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: