vagrant-vbguest 0.2.1 → 0.3.0.pre

data/lib/vagrant-vbguest.rb

@@ -1,5 +1,7 @@
 require 'vagrant'
+require "vagrant-vbguest/errors"
 require "vagrant-vbguest/config"
+require "vagrant-vbguest/detector"
 require "vagrant-vbguest/download"
 require "vagrant-vbguest/installer"
 require 'vagrant-vbguest/command'

data/lib/vagrant-vbguest/command.rb

@@ -4,7 +4,7 @@ module VagrantVbguest
 
   class Command < Vagrant::Command::Base
 
-    # Executes the given rake command on the VMs that are represented
+    # Runs the vbguest installer on the VMs that are represented
     # by this environment.
     def execute
       options = {}
@@ -46,7 +46,7 @@ module VagrantVbguest
 
     # Executes a command on a specific VM.
     def execute_on_vm(vm, options)
-      options.merge!(vm.config.vbguest.to_hash)
+      options = vm.config.vbguest.to_hash.merge(options)
       VagrantVbguest::Installer.new(vm, options).run!
     end
   end

data/lib/vagrant-vbguest/config.rb

@@ -1,5 +1,3 @@
-require 'virtualbox'
-
 module VagrantVbguest
   
   class Config < Vagrant::Config::Base
@@ -8,15 +6,10 @@ module VagrantVbguest
     attr_accessor :no_install
     attr_accessor :no_remote
     
-    def iso_path; @iso_path ||= autodetect_iso; end
     def auto_update; @auto_update.nil? ? (@auto_update = true) : @auto_update; end
     def no_remote; @no_remote.nil? ? (@no_remote = false) : @no_remote; end
     def no_install; @no_install.nil? ? (@no_install = false): @no_install; end
-        
-    def validate(env, errors)
-      errors.add(I18n.t("vagrant.plugins.vbguest.missing_iso_path")) unless iso_path && iso_path.is_a?(String)
-    end
-
+    
     # explicit hash, to get symbols in hash keys
     def to_hash
       {
@@ -27,33 +20,5 @@ module VagrantVbguest
       }
     end
     
-    protected
-    
-    def autodetect_iso
-      media_manager_iso || guess_iso || web_iso
-    end
-
-    def media_manager_iso
-      dvd = VirtualBox::DVD.all.find do |d|
-        !!(d.location =~ /VBoxGuestAdditions.iso$/)
-      end
-      dvd ? dvd.location : nil
-    end
-
-    def guess_iso
-      path_platform = if Vagrant::Util::Platform.linux?
-        "/usr/share/virtualbox/VBoxGuestAdditions.iso"
-      elsif Vagrant::Util::Platform.darwin?
-        "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
-      elsif Vagrant::Util::Platform.windows?
-        File.join((ENV["PROGRAM_FILES"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
-      end
-      File.exists?(path_platform) ? path_platform : nil
-    end
-
-    def web_iso
-      "http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso" unless !no_remote
-    end
-
   end
 end

data/lib/vagrant-vbguest/detector.rb

@@ -0,0 +1,42 @@
+module VagrantVbguest
+
+  class Detector
+
+    def initialize(vm, options)
+      @vm = vm
+      @options = options
+    end
+
+    def iso_path
+      @iso_path ||= autodetect_iso
+    end
+
+    private
+
+      def autodetect_iso
+        path = media_manager_iso || guess_iso || web_iso
+        raise VagrantVbguest::IsoPathAutodetectionError if !path || path.empty?
+        path
+      end
+
+      def media_manager_iso
+        (m = @vm.driver.execute('list', 'dvds').match(/^.+:\s+(?<path>.*VBoxGuestAdditions.iso)$/i)) && m[:path]
+      end
+
+      def guess_iso
+        path_platform = if Vagrant::Util::Platform.linux?
+          "/usr/share/virtualbox/VBoxGuestAdditions.iso"
+        elsif Vagrant::Util::Platform.darwin?
+          "/Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso"
+        elsif Vagrant::Util::Platform.windows?
+          File.join((ENV["PROGRAM_FILES"] || ENV["PROGRAMFILES"]), "/Oracle/VirtualBox/VBoxGuestAdditions.iso")
+        end
+        File.exists?(path_platform) ? path_platform : nil
+      end
+
+      def web_iso
+        "http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso" unless @options[:no_remote]
+      end
+
+  end
+end

data/lib/vagrant-vbguest/errors.rb

@@ -0,0 +1,14 @@
+module VagrantVbguest
+
+  class VbguestError < Vagrant::Errors::VagrantError
+    def error_namespace; "vagrant.plugins.vbguest.errors"; end
+  end
+  
+  class IsoPathAutodetectionError < VagrantVbguest::VbguestError
+    error_key :autodetect_iso_path
+  end
+
+  class DownloadingDisabledError < VagrantVbguest::VbguestError
+    error_key :downloading_disabled
+  end
+end

data/lib/vagrant-vbguest/installer.rb

@@ -10,8 +10,8 @@ module VagrantVbguest
         :tmp_path => vm.env.tmp_path
       }
       @vm = vm
-      @options = options
       @iso_path = nil
+      @options = options
     end
 
     def run!
@@ -36,6 +36,8 @@ module VagrantVbguest
           # the whole installation process should be put into own classes
           # like the vagrant system loading
           if (i_script = installer_script)
+            @options[:iso_path] ||= VagrantVbguest::Detector.new(@vm, @options).iso_path
+
             @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
             @vm.channel.upload(iso_path, iso_destination)
 
@@ -98,6 +100,8 @@ module VagrantVbguest
         if local_iso?
           @env[:iso_url]
         else
+          # :TODO: This will also raise, if the iso_url points to an invalid local path
+          raise VagrantVbguest::DownloadingDisabledError.new(:from => @env[:iso_url]) if @options[:no_remote]
           @download = VagrantVbguest::Download.new(@env)
           @download.download
           @download.temp_path

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.pre"
 end

data/locales/en.yml

@@ -10,14 +10,22 @@ en:
         start_copy_script: "Copy installer file %{from} into the box %{to}"
         no_install_script_for_platform: "Sorry, don't know how to install on a %{platform} system. Stopping installation."
         generic_install_script_for_platform: "%{platform} is currently not supported, will try generic Linux method..."
-        
-        validation_errors:
-          missing_iso_path: |-
-            Could not autodetect the correct location of the Virtualbox Guest Additions
-            ISO File. Please correct or configure using `config.vbguest.iso_path`.
-            If you think this is a bug in vbguest and we could guessed the iso_path,
+
+        errors:
+          autodetect_iso_path: |-
+            Could not autodetect a local of the 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 a bug: 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 downlownload 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.
+
         download:
           with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
           cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."

data/vagrant-vbguest.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
   
-  s.add_dependency "virtualbox", "~> 0.9.1"
   s.add_dependency "vagrant", ">= 0.9.4"
   s.add_development_dependency "bundler", ">= 1.0.0"
   

metadata

@@ -1,30 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-04-03 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: virtualbox
-  requirement: &70316106858200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70316106858200
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70316106857700 !ruby/object:Gem::Requirement
+  requirement: &70272787293680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70316106857700
+  version_requirements: *70272787293680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70316106857220 !ruby/object:Gem::Requirement
+  requirement: &70272787293160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +32,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70316106857220
+  version_requirements: *70272787293160
 description: A Vagrant plugin wich automatically installs the host's VirtualBox Guest
   Additions on the guest system.
 email:
@@ -62,7 +51,9 @@ files:
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
 - lib/vagrant-vbguest/config.rb
+- lib/vagrant-vbguest/detector.rb
 - lib/vagrant-vbguest/download.rb
+- lib/vagrant-vbguest/errors.rb
 - lib/vagrant-vbguest/installer.rb
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb