vagrant-screenshot 0.1 → 0.2

data/lib/vagrant-screenshot.rb

@@ -1,4 +1,3 @@
-require "vagrant-screenshot/errors"
 require "vagrant-screenshot/screenshot_command"
 
 Vagrant.commands.register(:screenshot) { Vagrant::Command::ScreenshotCommand }

data/lib/vagrant-screenshot/screenshot_command.rb

@@ -3,14 +3,10 @@ module Vagrant
   module Command
     class ScreenshotCommand < Base
 
-      VBOX_MANAGE = 'VBoxManage'
-
       def execute
         options = {}
         filenames = []
 
-        raise Errors::VBoxManageCommandNotFound if vbox_manage_command.empty?
-
         opts = build_screenshot_options options
         argv = parse_options(opts)
         return if !argv
@@ -18,11 +14,11 @@ module Vagrant
         vm_name = argv[0]
         with_target_vms(vm_name) do |vm|
           if vm.state != :running
-            notify "Skiping #{vm.name}. VM not running"
+            notify :warn, "Skiping #{vm.name}. VM not running"
           else
-            notify "Taking screenshot for #{vm.name}"
+            notify :info, "Taking screenshot for #{vm.name}"
             filename = create_output_filename vm.name
-            take_screenshot vm.uuid, filename
+            take_screenshot vm, filename
             filenames << filename
             open_generated_files(filenames) if options[:open]
           end
@@ -32,10 +28,6 @@ module Vagrant
 
       protected
 
-      def vbox_manage_command
-        %x[which VBoxManage].chomp
-      end
-
       def open_command
         # Currently just Mac's 'open' command is supported, if it's
         # not found the -o option is not provided
@@ -61,17 +53,17 @@ module Vagrant
         "screenshot-#{vm_name}.png"
       end
 
-      def take_screenshot(vm_uuid, filename)
-        %x[#{VBOX_MANAGE} controlvm #{vm_uuid} screenshotpng #{filename}]
-        notify "Screenshot saved on #{filename}"
+      def take_screenshot(vm, filename)
+        vm.driver.execute_command ["controlvm", vm.uuid, "screenshotpng", filename]
+        notify :success, "Screenshot saved on #{filename}"
       end
 
       def open_generated_files(filenames)
-        %x[open #{filenames.join(' ')}]
+        %x[#{open_command} #{filenames.join(' ')}]
       end
 
-      def notify(msg)
-        puts msg
+      def notify(level, msg)
+        @env.ui.send(level, msg)
       end
 
     end

data/lib/vagrant_init.rb

@@ -0,0 +1,4 @@
+
+# This file is automatically loaded by Vagrant.
+
+require 'vagrant-screenshot'

data/vagrant-screenshot.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "vagrant-screenshot"
-  s.version     = "0.1"
+  s.version     = "0.2"
   s.authors     = ["Igor Sobreira"]
   s.email       = ["igor@igorsobreira.com"]
   s.homepage    = "https://github.com/igorsobreira/vagrant-screenshot"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-screenshot
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin to take screenshots of VMs
 email:
@@ -23,8 +23,8 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-screenshot.rb
-- lib/vagrant-screenshot/errors.rb
 - lib/vagrant-screenshot/screenshot_command.rb
+- lib/vagrant_init.rb
 - vagrant-screenshot.gemspec
 homepage: https://github.com/igorsobreira/vagrant-screenshot
 licenses: []

data/lib/vagrant-screenshot/errors.rb

@@ -1,14 +0,0 @@
-module Vagrant
-
-  module Errors
-
-    class VBoxManageCommandNotFound < VagrantError
-      def initialize
-        message = "VBoxManage command not found"
-        super
-      end
-    end
-
-  end
-
-end