vagrant-vbguest 0.9.0 → 0.10.0.pre0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.10.0 (UNRELEASED)
+  
+  - Cope with UbuntuCloudImage by default [GH-86], [GH-64], [GH-43]
+    On Ubuntu, always try to remove conflicting installations of
+    GuestAdditions by removing those packages:
+    virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11
+  - Fix a typo in command description [GH-84]
+  - Tweak gem dependencies [GH-82]
+    - add rake as development dependency
+    - remove version locks on gems provided by vagrant
+  - Pass plugin name when registration the action hook for vagrant ≥1.1 [GH-80]
+
 ## 0.9.0
 
   - Adds support for vagrant 1.3 [GH-71], [GH-72]

data/Readme.md

@@ -70,6 +70,16 @@ vbguest will try to autodetect the best option for your system. WTF? see below.
 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:
 
+For Vagrant >= 1.1.0 use:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vbguest.auto_update = false
+end
+```
+
+For older versions of Vagrant:
+
 ```ruby
 # vagrant's autoloading may not have kicked in
 require 'vagrant-vbguest' unless defined? VagrantVbguest::Config

data/lib/vagrant-vbguest.rb

@@ -45,8 +45,12 @@ module VagrantVbguest
 
     # hook after anything that boots:
     # that's all middlewares which will run the buildin "VM::Boot" action
-    action_hook(self::ALL_ACTIONS) do |hook|
-      hook.after(VagrantPlugins::ProviderVirtualBox::Action::Boot, VagrantVbguest::Middleware)
+    action_hook('vbguest') do |hook|
+      if defined?(VagrantPlugins::ProviderVirtualBox::Action::CheckGuestAdditions)
+        hook.before(VagrantPlugins::ProviderVirtualBox::Action::CheckGuestAdditions, VagrantVbguest::Middleware)
+      else
+        hook.after(VagrantPlugins::ProviderVirtualBox::Action::Boot, VagrantVbguest::Middleware)
+      end
     end
   end
 end

data/lib/vagrant-vbguest/command.rb

@@ -20,7 +20,7 @@ module VagrantVbguest
         opts.banner = "Usage: vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]"
         opts.separator ""
 
-        opts.on("--do COMMAND", [:start, :rebuild, :install], "Manually `start`, `rebuild` or `install` GueastAdditions.") do |command|
+        opts.on("--do COMMAND", [:start, :rebuild, :install], "Manually `start`, `rebuild` or `install` GuestAdditions.") do |command|
           options[:_method] = command
           options[:force] = true
         end

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

@@ -6,7 +6,20 @@ module VagrantVbguest
         :ubuntu == self.distro(vm)
       end
 
+      def install(opts=nil, &block)
+        remove_packaged_additions(opts=nil, &block)
+        super
+      end
+
+    protected
+
+      def remove_packaged_additions(opts=nil, &block)
+        options = (opts || {}).merge(:error_check => false)
+        command = "dpkg --list | grep virtualbox-guest && apt-get -y -q purge virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11"
+        communicate.sudo(command, options, &block)
+      end
+
     end
   end
 end
-VagrantVbguest::Installer.register(VagrantVbguest::Installers::Ubuntu, 5)
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Ubuntu, 5)

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.9.0"
+  VERSION = "0.10.0.pre0"
 end

data/vagrant-vbguest.gemspec

@@ -15,11 +15,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_dependency "micromachine", "~> 1.1.0"
-  s.add_dependency "i18n", "~> 0.6.0"
-  s.add_dependency "log4r", "~> 1.1.9"
-
   s.add_development_dependency "bundler", ">= 1.2.0"
 
+  # those should be satisfied by vagrant
+  s.add_dependency "i18n"
+  s.add_dependency "log4r"
+  s.add_development_dependency "rake"
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.10.0.pre0
+  prerelease: 7
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -27,46 +27,62 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: A Vagrant plugin which automatically installs the host's VirtualBox Guest
   Additions on the guest system.
 email:
@@ -140,6 +156,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2431188333984855511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: