vagrant-vbguest 0.0.3 → 0.1.0

data/Gemfile

@@ -1,8 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in vagrant-rake.gemspec
-# gem "vagrant-vbguest", :path => "."
-# 
-# gem "vagrant", "~> 0.8.0"
-
 gemspec

data/Readme.md

@@ -4,10 +4,12 @@
 
 ## Installation
 
-Requires vagrant 0.8 (well, did not tested on others. feel free)
+Requires vagrant 0.8 (well, did not tested on earlier versions. feel free)
 
     gem install vagrant-vbguest
-    
+
+Compatibly for vagrant 0.9 is currently under development and __will drop support for vagrant 0.8__.
+
 ## Configuration / Usage
 
 In your `Vagrantfile`:

data/lib/vagrant-vbguest.rb

@@ -1,17 +1,14 @@
 require 'vagrant'
 require "vagrant-vbguest/config"
+require "vagrant-vbguest/installer"
 require 'vagrant-vbguest/command'
 require 'vagrant-vbguest/middleware'
 
-vbguest = Vagrant::Action::Builder.new do
-  use VagrantVbguest::Middleware
-end
+Vagrant.config_keys.register(:vbguest) { VagrantVbguest::Config }
 
-Vagrant::Action.register(:vbguest, vbguest)
+Vagrant.commands.register(:vbguest) { VagrantVbguest::Command }
 
-[:start, :up, :reload].each do |level|
-  Vagrant::Action[level].use VagrantVbguest::Middleware, :run_level => level
-end
+Vagrant.actions[:start].use VagrantVbguest::Middleware
 
 # Add our custom translations to the load path
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)

data/lib/vagrant-vbguest/command.rb

@@ -1,20 +1,41 @@
+require 'optparse'
+
 module VagrantVbguest
   
   class Command < Vagrant::Command::Base
-    register "vbguest", "Check and Update the VirtualBox Guest Additions"
-    class_option :force, :type => :boolean, :required => false, :default => false, :desc => "Whether to force the installation"
-
+    
     # Executes the given rake command on the VMs that are represented
     # by this environment.
     def execute
-      target_vms.each { |vm| execute_on_vm(vm) }
+      options = {}
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: vagrant vbguest [vm-name] [-f|--force]"
+        opts.separator ""
+
+        opts.on("-f", "--force", "Whether to force the installation") do |f|
+          options[:force] = f
+        end
+      end
+
+      argv = parse_options(opts)
+      return if !argv
+
+      if argv.empty?
+        with_target_vms(nil) { |vm| execute_on_vm(vm, options) }
+      else
+        argv.each do |vm_name| 
+          with_target_vms(vm_name) { |vm| execute_on_vm(vm, options) }
+        end
+      end
+      
     end
 
     protected
 
     # Executes a command on a specific VM.
-    def execute_on_vm(vm)
-      vm.env.actions.run(:vbguest, "vbguest.force.install" => options[:force])
+    def execute_on_vm(vm, options)
+      options.merge!(vm.config.vbguest.to_hash)
+      VagrantVbguest::Installer.new(vm, options).run!
     end
   end
-end
+end

data/lib/vagrant-vbguest/config.rb

@@ -1,7 +1,8 @@
+require 'virtualbox'
+
 module VagrantVbguest
   
   class Config < Vagrant::Config::Base
-    configures :vbguest
     attr_accessor :iso_path
     attr_accessor :auto_update
     
@@ -14,7 +15,14 @@ module VagrantVbguest
     def validate(errors)
       errors.add(I18n.t("vagrant.plugins.vbguest.missing_iso_path")) unless iso_path && iso_path.is_a?(String) && File.exists?(iso_path)
     end
-    
+
+    # explicit hash, to get symbols in hash keys
+    def to_hash
+      {
+        :iso_path => iso_path,
+        :auto_update => auto_update
+      }
+    end
     
     protected
     
@@ -25,5 +33,4 @@ module VagrantVbguest
       @iso_path = dvd.location if dvd
     end
   end
-  
-end
+end

data/lib/vagrant-vbguest/installer.rb

@@ -0,0 +1,99 @@
+module VagrantVbguest
+
+  # Handles the guest addins installation process
+
+  class Installer
+
+    def initialize(vm, options = {})
+      @vm = vm
+      @options = options
+    end
+    
+    def run!
+      @options[:auto_update] = true
+      run
+    end
+
+    def run
+      raise Vagrant::Errors::VMNotCreatedError if !@vm.created?
+      raise Vagrant::Errors::VMInaccessible if !@vm.state == :inaccessible
+      raise Vagrant::Errors::VMNotRunningError if @vm.state != :running
+
+      if @options[:auto_update]
+        @vm.ui.success(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
+        
+        if @options[:force] || needs_update?
+          @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{@options[:force] ? '_forced' : ''}", :host => vb_version, :guest => guest_version))
+          
+          # :TODO: 
+          # the whole installation process should be put into own classes
+          # like the vagrant system loading
+          if i_script = installer_script
+            @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
+            @vm.channel.upload(iso_path, iso_destination)
+            
+            @vm.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
+            @vm.channel.upload(i_script, installer_destination)
+            
+            @vm.channel.sudo("sh #{installer_destination}") do |type, data|
+              # Print the data directly to STDOUT, not doing any newlines
+              # or any extra formatting of our own
+              $stdout.print(data) if type != :exit_status
+            end
+
+            @vm.channel.execute("rm /tmp/install_vbguest.sh /tmp/VBoxGuestAdditions.iso") do |type, data|
+              # Print the data directly to STDOUT, not doing any newlines
+              # or any extra formatting of our own
+              $stdout.print(data) if type != :exit_status
+            end
+
+            # Puts out an ending newline just to make sure we end on a new
+            # line.
+            $stdout.puts
+          end
+        end
+        
+      end
+    end
+    
+    def needs_update?
+      !(guest_version && vb_version == guest_version)
+    end
+    
+    def guest_version
+      guest_version = @vm.driver.read_guest_additions_version
+      !guest_version ? nil : guest_version.gsub(/[-_]ose/i, '')
+    end
+
+    def vb_version
+      @vm.driver.version
+    end
+
+    def installer_script
+      plattform = @vm.guest.distro_dispatch
+      case plattform
+      when :debian, :ubuntu
+        return File.expand_path("../../../files/setup_debian.sh", __FILE__)
+      when :gentoo, :redhat, :suse, :arch, :linux
+        @vm.ui.warn(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_plattform", :plattform => plattform.to_s))
+        return File.expand_path("../../../files/setup_linux.sh", __FILE__)
+      end
+      @vm.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_plattform", :plattform => plattform.to_s))
+      
+      nil
+    end
+    
+    def installer_destination
+      '/tmp/install_vbguest.sh'
+    end
+
+    def iso_destination
+      '/tmp/VBoxGuestAdditions.iso'
+    end
+
+    def iso_path
+      @options[:iso_path]
+    end
+  end
+
+end

data/lib/vagrant-vbguest/middleware.rb

@@ -8,102 +8,15 @@ module VagrantVbguest
     def initialize(app, env, options = {})
       @app = app
       @env = env
-      @vm = version = env["vm"]
-      @run_level = options.delete(:run_level)
-      @force = options.delete(:force) || env["vbguest.force.install"]
+      @vm  = env[:vm]
     end
 
     def call(env)
-      
-      if shall_run? 
-        
-        env.ui.confirm(I18n.t("vagrant.plugins.vbguest.guest_ok", :version => guest_version)) unless needs_update?
-        
-        if forced_run? || needs_update?
-          env.ui.warn(I18n.t("vagrant.plugins.vbguest.installing#{forced_run? ? '_forced' : ''}", :host => VirtualBox.version, :guest => guest_version))
-          
-          # :TODO: 
-          # the whole istallation process should be put into own classes
-          # like the vagrant system loading
-          if i_script = installer_script
-            env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_iso", :from => iso_path, :to => iso_destination))
-            @vm.ssh.upload!(iso_path, iso_destination)
-            
-            env.ui.info(I18n.t("vagrant.plugins.vbguest.start_copy_script", :from => File.basename(i_script), :to => installer_destination))
-            @vm.ssh.upload!(i_script, installer_destination)
-            
-            @vm.ssh.execute do |ssh|
-              ssh.sudo!("sh /tmp/install_vbguest.sh") do |channel, type, data|
-                # Print the data directly to STDOUT, not doing any newlines
-                # or any extra formatting of our own
-                $stdout.print(data) if type != :exit_status
-              end
-              
-              ssh.exec!("rm /tmp/install_vbguest.sh /tmp/VBoxGuestAdditions.iso") do |channel, type, data|
-                # Print the data directly to STDOUT, not doing any newlines
-                # or any extra formatting of our own
-                $stdout.print(data) if type != :exit_status
-              end
-              
-              # Puts out an ending newline just to make sure we end on a new
-              # line.
-              $stdout.puts
-            end
-          end
-        end
-      end
-      
+      options = @vm.config.vbguest.to_hash
+      options[:auto_update] = true if options[:auto_update].nil?
+      VagrantVbguest::Installer.new(@vm, options).run
       @app.call(env)
     end
-    
-    protected
-
-    def forced_run?
-      @force
-    end
-    
-    def needs_update?
-      gv = guest_version
-      !(gv && VirtualBox.version == gv)
-    end
-
-    def vm_up?
-      @vm.created? && @env["vm"].vm.running?
-    end
-    
-    def shall_run?
-      vm_up? && (forced_run? || !@run_level || @env["config"].vbguest.auto_update)
-    end
-    
-    def guest_version
-      guest_version = @vm.vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
-      guest_version.empty? ? nil : guest_version.gsub(/[-_]ose/i, '')
-    end
-
-    def iso_path
-      @env["config"].vbguest.iso_path
-    end
-    
-    def iso_destination
-      '/tmp/VBoxGuestAdditions.iso'
-    end
-    
-    def installer_script
-      plattform = @env["vm"].system.distro_dispatch
-      case @env["vm"].system.distro_dispatch
-      when :debian, :ubuntu
-        return File.expand_path("../../../files/setup_debian.sh", __FILE__)
-      when :gentoo, :redhat, :suse, :arch, :linux
-        @env.ui.error(I18n.t("vagrant.plugins.vbguest.generic_install_script_for_plattform", :plattform => plattform.to_s))
-        return File.expand_path("../../../files/setup_linux.sh", __FILE__)
-      end
-      @env.ui.error(I18n.t("vagrant.plugins.vbguest.no_install_script_for_plattform", :plattform => plattform.to_s))
-      nil
-    end
-    
-    def installer_destination
-      '/tmp/install_vbguest.sh'
-    end
   end
-  
-end
+
+end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/vagrant-vbguest.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.homepage    = "https://github.com/dotless-de/vagrant-vbguest"
   s.summary     = %q{A Vagrant plugin to install the VirtualBoxAdditions into the guest VM}
-  s.description = %q{A Vagrant plugin to install the VirtualBoxAdditions into the guest VM}
+  s.description = %q{A Vagrant plugin wich automatically installs the host's VirtualBox Guest Additions on the guest system.}
 
   s.required_rubygems_version = ">= 1.3.6"
   #s.rubyforge_project = "vagrant-vbguest"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # s.add_runtime_dependency "rest-client"
   
   s.add_dependency "virtualbox", "~> 0.9.1"
-  s.add_dependency "vagrant", "~> 0.8.2"
+  s.add_dependency "vagrant", "~> 0.9.0"
   s.add_development_dependency "bundler", ">= 1.0.0"
   
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,61 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-vbguest
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Robert Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: virtualbox
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70189468584860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vagrant
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70189468584860
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: &70189468582520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.2
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70189468582520
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70189468582000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
-description: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM
-email: 
+  prerelease: false
+  version_requirements: *70189468582000
+description: A Vagrant plugin wich automatically installs the host's VirtualBox Guest
+  Additions on the guest system.
+email:
 - robert@dotless.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -66,38 +62,35 @@ files:
 - lib/vagrant-vbguest.rb
 - lib/vagrant-vbguest/command.rb
 - lib/vagrant-vbguest/config.rb
+- lib/vagrant-vbguest/installer.rb
 - lib/vagrant-vbguest/middleware.rb
 - lib/vagrant-vbguest/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml
 - vagrant-vbguest.gemspec
-has_rdoc: true
 homepage: https://github.com/dotless-de/vagrant-vbguest
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin to install the VirtualBoxAdditions into the guest VM
 test_files: []
-