vagrant-vbguest 0.2.0 → 0.2.1

data/Readme.md

@@ -4,20 +4,22 @@
 
 ## Installation
 
-Requires vagrant 0.9.4 or later
+Requires vagrant 0.9.4 or later (including 1.0)    
+Since vagrant v1.0.0 the prefered installation method for vagrant is using the provided packages or installers. 
+If you installed vagrant that way, you need to use vagrant's gem wrapper:
 
-    gem install vagrant-vbguest
+    vagrant gem install vagrant-vbguest
 
-or, using vagrant's gem wrapper
+If you installed vagrant using RubyGems simply:
 
-    vagrant gem install vagrant-vbguest
+    gem install vagrant-vbguest
 
 Compatibly for vagrant 0.8 is provided by version 0.0.3 (which lacks a bunch of new options)
 
 ## Configuration / Usage
 
 If you're lucky, `vagrant-vbguest` does not require any configurations. 
-Hoever, here is an example for your `Vagrantfile`:
+However, here is an example for your `Vagrantfile`:
 
     Vagrant::Config.run do |config|
       # we will try to autodetect this path. 

data/lib/vagrant-vbguest/command.rb

@@ -1,30 +1,29 @@
 require 'optparse'
 
 module VagrantVbguest
-  
+
   class Command < Vagrant::Command::Base
-    
+
     # Executes the given rake command on the VMs that are represented
     # by this environment.
     def execute
       options = {}
       opts = OptionParser.new do |opts|
-        puts opts.inspect
         opts.banner = "Usage: vagrant vbguest [vm-name] [-f|--force] [-I|--no-install] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]"
         opts.separator ""
 
         opts.on("-f", "--force", "Whether to force the installation") do
           options[:force] = true
         end
-        
+
         opts.on("--no-install", "-I", "Only check for the installed version. Do not attempt to install anything") do
           options[:no_install] = true
         end
-        
+
         opts.on("--no-remote", "-R", "Do not attempt do download the iso file from a webserver") do
           options[:no_remote] = true
         end
-        
+
         opts.on("--iso file_or_uri", "Full path or URI to the VBoxGuestAdditions.iso") do |file_or_uri|
           options[:iso_path] = file_or_uri
         end
@@ -36,11 +35,11 @@ module VagrantVbguest
       if argv.empty?
         with_target_vms(nil) { |vm| execute_on_vm(vm, options) }
       else
-        argv.each do |vm_name| 
+        argv.each do |vm_name|
           with_target_vms(vm_name) { |vm| execute_on_vm(vm, options) }
         end
       end
-      
+
     end
 
     protected

data/lib/vagrant-vbguest/config.rb

@@ -30,10 +30,10 @@ module VagrantVbguest
     protected
     
     def autodetect_iso
-      media_magager_iso || guess_iso || web_iso
+      media_manager_iso || guess_iso || web_iso
     end
 
-    def media_magager_iso
+    def media_manager_iso
       dvd = VirtualBox::DVD.all.find do |d|
         !!(d.location =~ /VBoxGuestAdditions.iso$/)
       end
@@ -41,14 +41,14 @@ module VagrantVbguest
     end
 
     def guess_iso
-      guess_path = if Vagrant::Util::Platform.linux?
+      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?(guess_path) ? guess_path : nil
+      File.exists?(path_platform) ? path_platform : nil
     end
 
     def web_iso

data/lib/vagrant-vbguest/download.rb

@@ -1,7 +1,7 @@
 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
@@ -80,4 +80,4 @@ module VagrantVbguest
     end
 
   end
-end
+end

data/lib/vagrant-vbguest/installer.rb

@@ -13,7 +13,7 @@ module VagrantVbguest
       @options = options
       @iso_path = nil
     end
-    
+
     def run!
       @options[:auto_update] = true
       run
@@ -25,49 +25,41 @@ module VagrantVbguest
       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]
-        
+
         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: 
+
+          # :TODO:
           # the whole installation process should be put into own classes
           # like the vagrant system loading
           if (i_script = installer_script)
             @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.channel.sudo("sh #{installer_destination}") do |type, data|
-              # Print the data directly to STDOUT, not doing any newlines
-              # or any extra formatting of our own
-              $stdout.print(data) if type != :exit_status
+              @vm.ui.info(data, :prefix => false, :new_line => false)
             end
 
-            @vm.channel.execute("rm /tmp/install_vbguest.sh /tmp/VBoxGuestAdditions.iso") do |type, data|
-              # Print the data directly to STDOUT, not doing any newlines
-              # or any extra formatting of our own
-              $stdout.print(data) if type != :exit_status
+            @vm.channel.execute("rm #{installer_destination} #{iso_destination}") do |type, data|
+              @vm.ui.error(data.chomp, :prefix => false)
             end
-
-            # Puts out an ending newline just to make sure we end on a new
-            # line.
-            $stdout.puts
           end
         end
       end
     ensure
       cleanup
     end
-    
+
     def needs_update?
       !(guest_version && vb_version == guest_version)
     end
-    
+
     def guest_version
       guest_version = @vm.driver.read_guest_additions_version
       !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
@@ -78,19 +70,19 @@ module VagrantVbguest
     end
 
     def installer_script
-      plattform = @vm.guest.distro_dispatch
-      case plattform
+      platform = @vm.guest.distro_dispatch
+      case platform
       when :debian, :ubuntu
         File.expand_path("../../../files/setup_debian.sh", __FILE__)
       when :gentoo, :redhat, :suse, :arch, :linux
-        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_plattform", :plattform => plattform.to_s))
+        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_platform", :platform => platform.to_s))
         File.expand_path("../../../files/setup_linux.sh", __FILE__)
       else
-        @vm.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_plattform", :plattform => plattform.to_s))  
+        @vm.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_platform", :platform => platform.to_s))
         nil
       end
     end
-    
+
     def installer_destination
       '/tmp/install_vbguest.sh'
     end

data/lib/vagrant-vbguest/middleware.rb

@@ -1,9 +1,9 @@
 module VagrantVbguest
-  
+
   # A Vagrant middleware which checks the installed VirtualBox Guest
-  # Additions to match the installed VirtualBox installation on the 
+  # Additions to match the installed VirtualBox installation on the
   # host system.
-  
+
   class Middleware
     def initialize(app, env, options = {})
       @app = app
@@ -19,4 +19,4 @@ module VagrantVbguest
     end
   end
 
-end
+end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/locales/en.yml

@@ -8,8 +8,8 @@ en:
         installing_forced: "Forcing installation of Virtualbox Guest Additions %{host} - guest's version is %{guest}"
         start_copy_iso: "Copy iso file %{from} into the box %{to}"
         start_copy_script: "Copy installer file %{from} into the box %{to}"
-        no_install_script_for_plattform: "Sorry, don't know how to install on a %{plattform} system. Stopping installation."
-        generic_install_script_for_plattform: "%{plattform} is currently not supported, but i'll try generic linux way ... "
+        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: |-
@@ -21,4 +21,4 @@ en:
         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."
+          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.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70295089810860 !ruby/object:Gem::Requirement
+  requirement: &70316106858200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70295089810860
+  version_requirements: *70316106858200
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70295089810380 !ruby/object:Gem::Requirement
+  requirement: &70316106857700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70295089810380
+  version_requirements: *70316106857700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70295089809920 !ruby/object:Gem::Requirement
+  requirement: &70316106857220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70295089809920
+  version_requirements: *70316106857220
 description: A Vagrant plugin wich automatically installs the host's VirtualBox Guest
   Additions on the guest system.
 email: