vagrant-vbguest 0.6.0.pre3 → 0.6.0.pre4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0 (unreleased)
+
+
+
 ## 0.5.1 (2012-11-30)
 
  - Fix: Provisioning will not run twice when rebooted due

data/Readme.md

@@ -133,7 +133,7 @@ When everything is fine, and no update is needed, you see log like:
 When you switched off the middleware auto update, or you have a box up and running you may also run the installer manually.
 
 ```bash
-$ vagrant vbguest [vm-name] [-f|--force] [--auto-reboot] [-I|--no-install] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]
+$ vagrant vbguest [vm-name] [--do start|rebuild|install] [--status] [-f|--force] [-b|--auto-reboot] [-R|--no-remote] [--iso VBoxGuestAdditions.iso]
 ```
 
 For example, when you just updated Virtual Box on your host system, you should update the gust additions right away. However, you may need to reload the box to get the guest additions working.
@@ -141,14 +141,14 @@ For example, when you just updated Virtual Box on your host system, you should u
 If you want to check the guest additions versions, without installing them, you may run:
 
 ```bash
-$ vagrant vbguest --no-install
+$ vagrant vbguest --status
 ```
 
 Telling you either about a version mismatch:
 
     [default] Virtualbox Guest Additions on host: 4.1.14 - guest's version is 4.1.0
 
-or a match: 
+or a match:
 
     [default] Detected Virtualbox Guest Additions 4.1.14 --- OK
 
@@ -193,6 +193,11 @@ Installers take care of the whole installation process, that includes where to s
 
 ```ruby
 class MyInstaller < VagrantVbguest::Installers::Linux
+
+  def self.match?(vm)
+    super && vm.channel.test("test -d /temp")
+  end
+
   # use /temp instead of /tmp
   def tmp_path
     '/temp/VBoxGuestAdditions.iso'

data/lib/vagrant-vbguest/helpers.rb

@@ -4,7 +4,7 @@ module VagrantVbguest
       @@rebooted = {}
 
       def rebooted?(vm)
-        !!@@rebooted[vm.name]
+        !!@@rebooted[vm.uuid]
       end
 
       def reboot(vm, options)
@@ -13,9 +13,9 @@ module VagrantVbguest
           false
         elsif options[:auto_reboot]
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
-          @@rebooted[vm.name] = true
+          @@rebooted[vm.uuid] = true
         else
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
+          vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
           false
         end
       end

data/lib/vagrant-vbguest/middleware.rb

@@ -7,20 +7,22 @@ module VagrantVbguest
   class Middleware
     include VagrantVbguest::Helpers::Rebootable
 
-    def initialize(app, env, options = {})
+    def initialize(app, env)
       @app = app
       @env = env
-      @vm  = env[:vm]
     end
 
     def call(env)
-      options = @vm.config.vbguest.to_hash
+      @env    = env
+      vm      = env[:vm]
+      options = vm.config.vbguest.to_hash
+
       if options[:auto_update]
-        machine = VagrantVbguest::Machine.new @vm, options
+        machine = VagrantVbguest::Machine.new vm, options
         status  = machine.state
-        @vm.ui.send (:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info)
+        vm.ui.send (:ok == status ? :success : :warn), I18n.t("vagrant.plugins.vbguest.status.#{status}", machine.info)
         machine.run
-        reboot(@vm, options) if machine.reboot?
+        reboot(vm, options) if machine.reboot?
       end
       @app.call(env)
     end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.6.0.pre3"
+  VERSION = "0.6.0.pre4"
 end

data/locales/en.yml

@@ -4,10 +4,10 @@ en:
       vbguest:
         skiped_installation: "Updating GuestAdditions skipped."
         skiped_rebuild: "Rebuilding GuestAdditions skipped."
-        installing: "Installing Virtualbox Guest Additions %{installer_version} - guest's version is %{guest_version}"
-        installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest's version is %{guest_version}"
-        rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host's version is %{host_version})"
-        rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host's version is %{host_version})"
+        installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
+        installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
+        rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
+        rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
         start_copy_iso: "Copy iso file %{from} into the box %{to}"
         restart_vm: "Restarting VM to apply changes..."
         suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box runing `vagrant reload %{name}`"
@@ -21,8 +21,8 @@ en:
 
         status:
           clean: "No installation found."
-          unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) does not match."
-          not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but don't run."
+          unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
+          not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
           ok: "GuestAdditions %{guest_version} running --- OK."
 
         errors:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre3
+  version: 0.6.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine