vagrant-vbguest 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.1 (2012-11-30)
+
+ - Fix: Provisioning will not run twice when rebooted due
+   to incomplete GuestAdditions installation [GH-27]
+   (thanks @gregsymons for pointing)
+
 ## 0.5.0 (2012-11-19)
 
   - Box will be rebooted if the GuestAdditions installation

data/Readme.md

@@ -158,6 +158,13 @@ The `auto-reboot` is tured off by default, when running as a command. Vbguest wi
 $ vagrant vbguest --auto-reboot
 ```
 
+You can also pass vagrant's `reload` options like:
+
+```bash
+$ vagrant vbguest --auto-reboot --no-provision
+```
+
+
 
 ### ISO autodetection
 

data/lib/vagrant-vbguest/command.rb

@@ -1,8 +1,11 @@
 require 'optparse'
+require 'vagrant/command/start_mixins'
 
 module VagrantVbguest
 
   class Command < Vagrant::Command::Base
+    include Vagrant::Command::StartMixins
+    include VagrantVbguest::Helpers::Rebootable
 
     # Runs the vbguest installer on the VMs that are represented
     # by this environment.
@@ -33,6 +36,8 @@ module VagrantVbguest
         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
+
+        build_start_options(opts, options)
       end
 
       argv = parse_options(opts)
@@ -54,6 +59,13 @@ module VagrantVbguest
     def execute_on_vm(vm, options)
       options = vm.config.vbguest.to_hash.merge(options)
       VagrantVbguest::Installer.new(vm, options).run!
+      reboot(vm, options) if need_reboot?(vm)
+    end
+
+    def reboot vm, options
+      if super
+        vm.reload(options)
+      end
     end
   end
 end

data/lib/vagrant-vbguest/helpers.rb

@@ -37,5 +37,29 @@ module VagrantVbguest
       end
 
     end
+
+    module Rebootable
+      @@rebooted = {}
+
+      def rebooted?(vm)
+        !!@@rebooted[vm.name]
+      end
+
+      def need_reboot?(vm)
+        !VagrantVbguest::Helpers.kernel_module_running?(vm)
+      end
+
+      def reboot(vm, options)
+        if options[:auto_reboot]
+          vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
+          @@rebooted[vm.name] = true
+          true
+        else
+          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
+          false
+        end
+      end
+    end
+
   end
 end

data/lib/vagrant-vbguest/installer.rb

@@ -3,7 +3,6 @@ module VagrantVbguest
   # Handles the guest addins installation process
 
   class Installer
-    @@rebooted = {}
 
     def initialize(vm, options = {})
       @env = {
@@ -32,12 +31,8 @@ module VagrantVbguest
       @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?)
-        if rebooted?
-          @vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
-        else
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
-          install
-        end
+        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
+        install
       end
     ensure
       cleanup
@@ -67,26 +62,9 @@ module VagrantVbguest
         end
 
         cleanup
-        reboot
       end
     end
 
-    def reboot
-      if !VagrantVbguest::Helpers.kernel_module_running?(@vm)
-        if @options[:auto_reboot]
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.restart_vm"))
-          @@rebooted[@vm.name] = true
-          @vm.reload(@options[:run_env])
-        else
-          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => @vm.name))
-        end
-      end
-    end
-
-    def rebooted?
-      !!@@rebooted[@vm.name]
-    end
-
     def needs_update?
       !(guest_version && vb_version == guest_version)
     end

data/lib/vagrant-vbguest/middleware.rb

@@ -5,6 +5,8 @@ module VagrantVbguest
   # host system.
 
   class Middleware
+    include VagrantVbguest::Helpers::Rebootable
+
     def initialize(app, env, options = {})
       @app = app
       @env = env
@@ -13,11 +15,25 @@ module VagrantVbguest
 
     def call(env)
       options = @vm.config.vbguest.to_hash
-      options[:run_env] = env
       VagrantVbguest::Installer.new(@vm, options).run
 
+      if need_reboot?(@vm)
+        if rebooted?(@vm)
+          @vm.ui.error(I18n.t("vagrant.plugins.vbguest.restart_loop_guard_activated"))
+        else
+          reboot(@vm, options) if need_reboot?(@vm)
+        end
+      end
+
       @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.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler