vagrant-vbguest 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.1 (2012-01-13)
+
+  - Fix missing command output block and parameters for
+    installation process [GH-37]
+  - Update README to reflect new wording for status informations
+
 ## 0.6.0 (2012-01-13)
 
  - Debian installer now cope with missing `dkms` package [GH-30]

data/Readme.md

@@ -79,24 +79,29 @@ This is a per box settings. On multi vm environments you need to set that for ea
 
 When *vagrant-vbguest* is running it will provide you some logs:
 
-    ...
+    [...]
+    [default] Booting VM...
     [default] Booting VM...
     [default] Waiting for VM to boot. This can take a few minutes.
     [default] VM booted and ready for use!
-    [default] Installing Virtualbox Guest Additions 4.1.14 - guest's version is 4.1.12
-    [default] Copy iso file /Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso into the box /tmp/VBoxGuestAdditions.iso
-    [default] Copy installer file setup_debian.sh into the box /tmp/install_vbguest.sh
+    [default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
     stdin: is not a tty
     Reading package lists...
     Building dependency tree...
     Reading state information...
-    linux-headers-2.6.32-30-server is already the newest version.
-    dkms is already the newest version.
-    0 upgraded, 0 newly installed, 0 to remove and 142 not upgraded.
+    The following extra packages will be installed:
+      fakeroot linux-headers-2.6.32-33 patch
+
+    [...]
+
+    [default] Copy iso file /Applications/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso into the box /tmp/VBoxGuestAdditions.iso
+    stdin: is not a tty
+    [default] Installing Virtualbox Guest Additions 4.2.6 - guest version is 4.1.0
+    stdin: is not a tty
     Verifying archive integrity... All good.
-    Uncompressing VirtualBox 4.1.14 Guest Additions for Linux..........
+    Uncompressing VirtualBox 4.2.6 Guest Additions for Linux...........
     VirtualBox Guest Additions installer
-    Removing installed version 4.1.12 of VirtualBox Guest Additions...
+    Removing installed version 4.1.0 of VirtualBox Guest Additions...
     tar: Record size = 8 blocks
     Removing existing VirtualBox DKMS kernel modules ...done.
     Removing existing VirtualBox non-DKMS kernel modules ...done.
@@ -106,7 +111,21 @@ When *vagrant-vbguest* is running it will provide you some logs:
 
     Installing the Window System drivers ...fail!
     (Could not find the X.Org or XFree86 Window System.)
-    ...
+    stdin: is not a tty
+    [default] Restarting VM to apply changes...
+    [default] Attempting graceful shutdown of VM...
+    [default] Booting VM...
+    [default] Waiting for VM to boot. This can take a few minutes.
+    [default] VM booted and ready for use!
+    [default] Configuring and enabling network interfaces...
+    [default] Setting host name...
+    [default] Mounting shared folders...
+    [default] -- v-root: /vagrant
+    [default] -- v-csc-1: /tmp/vagrant-chef-1/chef-solo-1/cookbooks
+    [default] Running provisioner: Vagrant::Provisioners::ChefSolo...
+    [default] Generating chef JSON and uploading...
+    [default] Running chef-solo...
+    [...]
 
 
 The plugin's part starts at `[default] Installing Virtualbox Guest Additions 4.1.14 - guest's version is 4.1.1`, telling you that:
@@ -124,7 +143,7 @@ When everything is fine, and no update is needed, you see log like:
     [default] Booting VM...
     [default] Waiting for VM to boot. This can take a few minutes.
     [default] VM booted and ready for use!
-    [default] Detected Virtualbox Guest Additions 4.1.14 --- OK.
+    [default] GuestAdditions 4.2.6 running --- OK.
     ...
 
 
@@ -146,11 +165,11 @@ $ 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
+    [default] GuestAdditions versions on your host (4.2.6) and guest (4.1.0) do not match.
 
 or a match:
 
-    [default] Detected Virtualbox Guest Additions 4.1.14 --- OK
+    [default] GuestAdditions 4.2.6 running --- OK.
 
 
 The `auto-reboot` is tured off by default, when running as a command. Vbguest will suggest you to reboot the box when needed. To turn it on simply pass the `--auto-reboot` parameter:

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

@@ -50,14 +50,14 @@ module VagrantVbguest
       # All necessary steps for an installation must be defined here.
       # This includes uploading the iso into the box, mounting,
       # installing and cleaning up.
+      # The path to the local iso file should be obtained by calling +iso_file+
       # Subclasses must override this method!
       #
-      # @param [String] iso_file Optional path to the local GuestAdditions iso file
       # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
       # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
-      def install(iso_fileO=nil, opts=nil, &block)
+      def install(opts=nil, &block)
       end
 
       # Handels the rebuild of allready running GuestAdditions

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

@@ -8,6 +8,10 @@ module VagrantVbguest
 
       # installes the correct linux-headers package
       # installes `dkms` package for dynamic kernel module loading
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
         begin
           vm.channel.sudo(install_dependencies_cmd, opts, &block)

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

@@ -39,14 +39,22 @@ module VagrantVbguest
 
       # a generic way of installing GuestAdditions assuming all
       # dependencies on the guest are installed
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def install(opts=nil, &block)
         vm.ui.warn I18n.t("vagrant.plugins.vbguest.installer.generic_linux_installer") if self.class == Linux
         upload(iso_file)
-        mount_iso
-        execute_installer
-        unmount_iso
+        mount_iso(opts, &block)
+        execute_installer(opts, &block)
+        unmount_iso(opts, &block)
       end
 
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def running?(opts=nil, &block)
         opts = {
           :sudo => true
@@ -69,10 +77,18 @@ module VagrantVbguest
         @guest_version
       end
 
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def rebuild(opts=nil, &block)
         vm.channel.sudo('/etc/init.d/vboxadd setup', opts, &block)
       end
 
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def start(opts=nil, &block)
         opts = {:error_check => false}.merge(opts || {})
         vm.channel.sudo('/etc/init.d/vboxadd start', opts, &block)
@@ -82,6 +98,11 @@ module VagrantVbguest
       # A generic helper method to execute the installer. The iso file
       # has to be mounted on +mount_point+.
       # This also yields a installation warning to the user.
+      #
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def execute_installer(opts=nil, &block)
         installer = File.join(mount_point, 'VBoxLinuxAdditions.run')
         yield_installation_waring(installer)
@@ -91,6 +112,11 @@ module VagrantVbguest
       # A generic helper method for mounting the GuestAdditions iso file
       # on most linux system.
       # Mounts the given uploaded file from +tmp_path+ on +mount_point+.
+      #
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def mount_iso(opts=nil, &block)
         vm.channel.sudo("mount #{tmp_path} -o loop #{mount_point}", opts, &block)
       end
@@ -98,6 +124,11 @@ module VagrantVbguest
       # A generic helper method for un-mounting the GuestAdditions iso file
       # on most linux system
       # Unmounts the +mount_point+.
+      #
+      # @param [Hash] opts Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
+      # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
+      # @yieldparam [String] data Data for the given output.
       def unmount_iso(opts=nil, &block)
         vm.channel.sudo("umount #{mount_point}", opts, &block)
       end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors: