vagrant-vbguest 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.1
+
+  - Fix auto-reloading for vagrant 1.1 [GH-52]
+    Also changes the reload method for vagrant 1.0 when ran
+    as middleware (to not run buildin actions manually).
+
 ## 0.7.0
 
   - When looking for a GuestAdditions iso file in media manager
@@ -31,7 +37,7 @@
     Installers, when executing shell commands on the guest system,
     should use vbguests `communicate` wrapper. e.g.:
         A call like `vm.channel.sudo 'apt-get update'` should be
-        changed to `channel.sudo 'apt-get update'`
+        changed to `communicate.sudo 'apt-get update'`
     The old `vm.channel` syntax will continue to work on vagrant 1.0.x
     but will fail on vagrant 1.1.x.
 

data/Readme.md

@@ -6,7 +6,7 @@
 
 Requires vagrant 0.9.4 or later (including 1.0 and 1.1)    
 
-On Vagrant 1.1.x use:
+### Vagrant 1.1
 
 ```bash
 $ vagrant plugin install vagrant-vbguest
@@ -249,7 +249,7 @@ end
 
 ## Knows Issues
 
-* 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, 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
 * 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 #19](https://github.com/dotless-de/vagrant-vbguest/issues/19#issuecomment-7040304))

data/lib/vagrant-vbguest/command.rb

@@ -82,12 +82,6 @@ module VagrantVbguest
       reboot(vm, options) if _rebootable && machine.reboot?
     end
 
-    def reboot vm, options
-      if super
-        vm.reload(options)
-      end
-    end
-
     def check_runable_on(vm); end
   end
 

data/lib/vagrant-vbguest/helpers.rb

@@ -9,16 +9,23 @@ module VagrantVbguest
       end
 
       def reboot(vm, options)
-        if rebooted?(vm)
-          vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
+        run_reboot = if rebooted?(vm)
+          vm.env.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
           false
         elsif options[:auto_reboot]
-          vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
+          vm.env.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
           @@rebooted[ VmCompatible.vm_id(vm) ] = true
         else
-          vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
+          vm.env.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
           false
         end
+        return unless run_reboot
+
+        if Vagrant::VERSION < '1.1.0'
+          vm.reload(options)
+        else
+          vm.action(:reload, options)
+        end
       end
     end
 

data/lib/vagrant-vbguest/middleware.rb

@@ -28,12 +28,5 @@ module VagrantVbguest
       @app.call(env)
     end
 
-    def reboot vm, options
-      if super
-        @env[:action_runner].run(Vagrant::Action::VM::Halt, @env)
-        @env[:action_runner].run(Vagrant::Action::VM::Boot, @env)
-      end
-    end
-
   end
 end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 412328394721376976
+      hash: -3661598601384978746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: