vagrant-vbguest 0.3.5 → 0.4.0

data/Readme.md

@@ -52,6 +52,19 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 * `no_install` (Boolean, default: `false`) : Whether to check the correct additions version only. This will warn you about version mis-matches, but will not try to install anything.
 * `no_remote` (Boolean, default: `false`) : Whether to _not_ download the iso file from a remote location. This includes any `http` location!
 
+#### Global Configuration
+
+Using [Vagrantfile Load Order](http://vagrantup.com/v1/docs/vagrantfile.html#vagrantfile_load_order) you may change default configuration values.
+Edit (create, if missing) your `~/.vagrant.d/Vagrantfile` like this:
+
+```ruby
+# vagrant's autoloading may not have kicked in
+require 'vagrant-vbguest' unless defined? VagrantVbguest::Config
+VagrantVbguest::Config.auto_update = false
+```
+
+Settings in a project's `Vagrantfile` will overwrite those setting. When executed as a command, command line arguments will overwrite all of the above.
+
 
 ### Running as a middleware
 
@@ -153,4 +166,5 @@ Those places will be checked in order:
 
 * The installer script, which mounts and runs the GuestAdditions Installer Binary, works on linux only. Most likely it will run on most unix-like plattform. 
 * The installer script requires a directory `/mnt` on the guest system
-* On multi vm boxes, the iso file will be downloaded for each vm
+* On multi vm boxes, the iso file will be downloaded for each vm
+* The plugin installation on Windows host systems my not work as expected (using `vagrant gem install vagrant-vbguest`). Try `C:\vagrant\vagrant\embedded\bin\gem.bat install vagrant-vbguest` instead. (See issue #5)

data/lib/vagrant-vbguest/config.rb

@@ -1,15 +1,35 @@
 module VagrantVbguest
-  
+
   class Config < Vagrant::Config::Base
-    attr_accessor :iso_path
-    attr_accessor :auto_update
-    attr_accessor :no_install
-    attr_accessor :no_remote
-    
-    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
-    
+
+    module Attributes
+      attr_accessor :iso_path, :auto_update, :no_install, :no_remote
+    end
+
+    class << self
+      include Attributes
+
+      def auto_update; @auto_update.nil? ? true  : @auto_update end
+      def no_install;  @no_install.nil?  ? false : @no_install  end
+      def no_remote;   @no_remote.nil?   ? false : @no_remote   end
+
+      def iso_path
+        return nil if !@iso_path || @iso_path == :auto
+        @iso_path
+      end
+    end
+
+    include Attributes
+
+    def auto_update; @auto_update.nil? ? self.class.auto_update : @auto_update end
+    def no_install;  @no_install.nil?  ? self.class.no_install  : @no_install  end
+    def no_remote;   @no_remote.nil?   ? self.class.no_remote   : @no_remote   end
+
+    def iso_path
+      return self.class.iso_path if !@iso_path || @iso_path == :auto
+      @iso_path
+    end
+
     # explicit hash, to get symbols in hash keys
     def to_hash
       {
@@ -19,6 +39,6 @@ module VagrantVbguest
         :no_remote => no_remote
       }
     end
-    
+
   end
 end

data/lib/vagrant-vbguest/installer.rb

@@ -20,41 +20,41 @@ module VagrantVbguest
     end
 
     def run
+
+      return unless @options[:auto_update]
+
       raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
       raise Vagrant::Errors::VMInaccessible if !@vm.state == :inaccessible
       raise Vagrant::Errors::VMNotRunningError if @vm.state != :running
 
-      if @options[:auto_update]
-
-        @vm.ui.success(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
-        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.check_failed", :host => vb_version, :guest => guest_version)) if @options[:no_install]
+      @vm.ui.success(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
+      @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.check_failed", :host => vb_version, :guest => guest_version)) if @options[:no_install]
 
-        if @options[:force] || (!@options[:no_install] && needs_update?)
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
+      if @options[:force] || (!@options[:no_install] && needs_update?)
+        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
 
-          # :TODO:
-          # 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
+        # :TODO:
+        # 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)
+          @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
+          @vm.channel.upload(iso_path, iso_destination)
 
-            @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
-            @vm.channel.upload(i_script, installer_destination)
+          @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
+          @vm.channel.upload(i_script, installer_destination)
 
-            @vm.channel.sudo("chmod 0755 #{installer_destination}") do |type, data|
-              @vm.ui.info(data, :prefix => false, :new_line => false)
-            end
+          @vm.channel.sudo("chmod 0755 #{installer_destination}") do |type, data|
+            @vm.ui.info(data, :prefix => false, :new_line => false)
+          end
 
-            @vm.channel.sudo("#{installer_destination}") do |type, data|
-              @vm.ui.info(data, :prefix => false, :new_line => false)
-            end
+          @vm.channel.sudo("#{installer_destination}") do |type, data|
+            @vm.ui.info(data, :prefix => false, :new_line => false)
+          end
 
-            @vm.channel.execute("rm #{installer_destination} #{iso_destination}") do |type, data|
-              @vm.ui.error(data.chomp, :prefix => false)
-            end
+          @vm.channel.execute("rm #{installer_destination} #{iso_destination}") do |type, data|
+            @vm.ui.error(data.chomp, :prefix => false)
           end
         end
       end

data/lib/vagrant-vbguest/middleware.rb

@@ -13,7 +13,6 @@ module VagrantVbguest
 
     def call(env)
       options = @vm.config.vbguest.to_hash
-      options[:auto_update] = true if options[:auto_update].nil?
       VagrantVbguest::Installer.new(@vm, options).run
       @app.call(env)
     end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler