vagrant-vbguest 0.6.0.pre2 → 0.6.0.pre3

data/lib/vagrant-vbguest/command.rb

@@ -21,6 +21,7 @@ module VagrantVbguest
 
         opts.on("--do COMMAND", [:start, :rebuild, :install], "Manually `start`, `rebuild` or `install` GueastAdditions.") do |command|
           options[:_method] = command
+          options[:force] = true
         end
 
         opts.on("--status", "Print current GuestAdditions status and exit.") do
@@ -28,22 +29,7 @@ module VagrantVbguest
           options[:_rebootable] = false
         end
 
-        # opts.on("--start", "Try to start the GuestAdditions servcice manually.") do
-        #   options[:_method] = :start
-        #   options[:_rebootable] = false
-        # end
-
-        # opts.on("--rebuild", "Rebuild the existing GuestAdditions.") do
-        #   options[:_method] = :rebuild
-        #   options[:force] = true
-        # end
-
-        # opts.on("--install", "Install GuestAdditions matching your host system.") do
-        #   options[:_method] = :install
-        #   options[:force] = true
-        # end
-
-        opts.on("-f", "--force", "Whether to force the installation. (Implied by --install and --rebuild)") do
+        opts.on("-f", "--force", "Whether to force the installation. (Implied by --do start|rebuild|install)") do
           options[:force] = true
         end
 
@@ -80,11 +66,14 @@ module VagrantVbguest
 
     # Executes a command on a specific VM.
     def execute_on_vm(vm, options)
+      raise Vagrant::Errors::VMNotCreatedError if !vm.created?
+      raise Vagrant::Errors::VMInaccessible if !vm.state == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if vm.state != :running
+
       options     = options.clone
       _method     = options.delete(:_method)
       _rebootable = options.delete(:_rebootable)
 
-
       options = vm.config.vbguest.to_hash.merge(options)
       machine = VagrantVbguest::Machine.new(vm, options)
       status  = machine.state

data/lib/vagrant-vbguest/installer.rb

@@ -108,9 +108,6 @@ module VagrantVbguest
     #
     # @return [Installers::Base]
     def guest_installer
-      raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
-      raise Vagrant::Errors::VMInaccessible if !@vm.state == :inaccessible
-      raise Vagrant::Errors::VMNotRunningError if @vm.state != :running
 
       @guest_installer ||= if @options[:installer].is_a? Class
         @options[:installer].new(@vm)

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

@@ -66,6 +66,7 @@ module VagrantVbguest
             @guest_version = v[1]
           end
         end
+        @guest_version
       end
 
 

data/lib/vagrant-vbguest/machine.rb

@@ -6,6 +6,8 @@ module VagrantVbguest
     attr_reader :installer, :vm, :options
 
     def initialize vm, options
+      @logger = Log4r::Logger.new("vagrant::plugins::vbguest-machine")
+      @logger.debug("initialize vbguest machine for VM '#{vm.name}' (#{vm.uuid})")
       @vm = vm
       @options = options
       @installer = Installer.new @vm, @options
@@ -24,12 +26,18 @@ module VagrantVbguest
     end
 
     def run
-      runlist = steps
       current_state = state
+      runlist = steps(current_state)
+      @logger.debug("Runlist for state #{current_state} is: #{runlist}")
       while (command = runlist.shift)
-        self.send(command)
+        @logger.debug("Running command #{command} from runlist")
+        if !self.send(command)
+          vm.ui.error('vagrant.plugins.vbguest.machine_loop_gard', :command => command, :state => current_state)
+          return false
+        end
         return run if current_state != state
       end
+      true
     end
 
     def install
@@ -53,7 +61,7 @@ module VagrantVbguest
     def reboot;  @box_machine.trigger :reboot end
     def reboot?; @box_machine.state == :rebooted end
 
-    def steps
+    def steps(state)
       case state
       when :clean, :unmatched
         [:install]
@@ -66,10 +74,13 @@ module VagrantVbguest
 
     def state
       guest_version = installer.guest_version(true)
+      host_version  = installer.host_version
+      running = installer.running?
+      @logger.debug("Current states for VM '#{vm.name}' are : guest_version=#{guest_version} : host_version=#{host_version} : running=#{running}")
 
       return :clean       if !guest_version
-      return :unmatched   if installer.host_version != guest_version
-      return :not_running if !installer.running?
+      return :unmatched   if host_version != guest_version
+      return :not_running if !running
       return :ok
     end
 

data/lib/vagrant-vbguest/version.rb

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

data/locales/en.yml

@@ -12,6 +12,7 @@ en:
         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}`"
         restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
+        machine_loop_gard: "Could not execute %{command} from current state %{state}. To prevent running in circles, we'll stop."
         guest_version_reports_differ: |-
           Got different reports about installed GuestAdditions version:
           Virtualbox on your host claims:   %{driver}

data/vagrant-vbguest.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
-  s.add_runtime_dependency "micromachine"
+  s.add_dependency "micromachine", "~> 1.0.4"
+  s.add_dependency "log4r", "~> 1.1.9"
 
   s.add_development_dependency "bundler", ">= 1.2.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre2
+  version: 0.6.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement