lib/vagrant-vbguest/helpers.rb in vagrant-vbguest-0.7.0.pre0 vs lib/vagrant-vbguest/helpers.rb in vagrant-vbguest-0.7.0.pre1

@@ -1,25 +1,54 @@
 module VagrantVbguest
   module Helpers
+
     module Rebootable
       @@rebooted = {}
 
       def rebooted?(vm)
-        !!@@rebooted[vm.uuid]
+        !!@@rebooted[ VmCompatible.vm_id(vm) ]
       end
 
       def reboot(vm, options)
         if rebooted?(vm)
           vm.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"))
-          @@rebooted[vm.uuid] = true
+          @@rebooted[ VmCompatible.vm_id(vm) ] = true
         else
           vm.ui.warn(I18n.t("vagrant.plugins.vbguest.suggest_restart", :name => vm.name))
           false
         end
       end
     end
 
+    module VmCompatible
+
+      if Vagrant::VERSION < '1.1.0'
+        def communicate
+          vm.channel
+        end
+
+        def driver
+          vm.driver
+        end
+
+        def self.vm_id(vm)
+          vm.uuid
+        end
+      else # Vagrant 1.1, and hopefully upwards
+        def communicate
+          vm.communicate
+        end
+
+        def driver
+          vm.provider.driver
+        end
+
+        def self.vm_id(vm)
+          vm.id
+        end
+      end
+    end
   end
-end
\ No newline at end of file
+end