vagrant-multiprovider-snap 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d8719cab535721021bfd45b102aeea63f55826
-  data.tar.gz: da9edd7455831ed3698cec530a4194de95228c22
+  metadata.gz: 4d5a319df594314a1caed509fb42dbf244bf88b1
+  data.tar.gz: 930c0e291f896503bf3c8bb1dadfdb05f5332b1d
 SHA512:
-  metadata.gz: 42f706c6cf27eb57899f3d22dddad80c04b0de360556566d07fcb52198993e17fc9d35427fbaf21362b51b0b65c08978a736e87d79e6f405a3168a895f0154e8
-  data.tar.gz: d8b7b03dfdb15eb725ee2e2ef69d6337c145a8fbe3c1dcf9b798f9aa0bfa921867b04cb7e8376d94050c7a79f097547a93cdb7ba14b8bb1805703d0b57717ce9
+  metadata.gz: a3355d1f4e185d0181c3090594fa92e66d7e8d37b1174da0e223376b4919370f2cacf5c7356bbdf8954528fc0e9e53aedb6bead8ccc7c290b1f35a357fa2fbc0
+  data.tar.gz: 4634830d07fde3105cf4db55387836a95ef3bba9526478feb85ddc3406f897f1e260d36115bde62601fcd772ac11645a437383e1fb56975fad9b166821b135f7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.10 (April 6, 2014)
+
+ - Force autoloading of VMWare module before overriding its methods
+ - Ensure our override class has same superclass as the one we're adding methods to
+ - Ensure Virtualbox boxes are ready after snapshot rollback
+
 ## 0.0.9 (March 11, 2014)
 
  - Made plugin compatable with Vagrant 1.5 bundler approach

data/README.md

@@ -9,6 +9,7 @@ running Vagrant boxes.  It currently supports the following providers:
 
  * VirtualBox
  * VMWare Fusion (via the commercial VMWare plugin)
+ * VMWare Workstation (via the commercial VMWare plugin)
 
 
 Installation

data/lib/vagrant-multiprovider-snap/plugin.rb

@@ -11,21 +11,37 @@ module VagrantSnap
 
         begin
 
-            # Make sure the fusion plugin is installed, then
-            # include the fusion providers.
+            # Make sure the fusion plugin is installed (explicitly
+            # requiring the classes we're going to extend otherwise
+            # they don't get autloaded in time for us to do so)
+            
+            require "vagrant-vmware-fusion/action" 
+            require "vagrant-vmware-fusion/driver" 
+
+            # ...then include our overrides
             
-            require "vagrant-vmware-fusion" 
             require_relative "providers/vmware_fusion/action"
             require_relative "providers/vmware_fusion/driver/base"
 
         rescue LoadError => e
-
             # If we can't load the fusion plugin, quietly ignore it
-            # I'd like to log an info level message here, but I don't
-            # think I can get at a ui object in this scope.
+        end
+
+        begin
 
+            # Same again but for the workstation plugin
+
+            require "vagrant-vmware-workstation/action" 
+            require "vagrant-vmware-workstation/driver" 
+
+            require_relative "providers/vmware_workstation/action"
+            require_relative "providers/vmware_workstation/driver/base"
+
+        rescue LoadError => e
+            # If we can't load the workstation plugin, quietly ignore it
         end
 
+
         name "snap command"
 
         description <<-DESC

data/lib/vagrant-multiprovider-snap/providers/virtualbox/action.rb

@@ -34,6 +34,7 @@ module VagrantPlugins
                                 if env2[:result]
                                     b3.use CheckAccessible
                                     b3.use SnapshotRollback
+                                    b3.use WaitForCommunicator, [:restoring, :running]
                                 else
                                     b3.use MessageSnapshotNotCreated
                                 end

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action.rb

@@ -0,0 +1,51 @@
+require "vagrant/action/builder"
+
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Action
+
+            autoload :SnapshotTake,              File.expand_path("../action/snapshot_take.rb", __FILE__)
+            autoload :SnapshotRollback,          File.expand_path("../action/snapshot_rollback.rb", __FILE__)
+            autoload :HasSnapshot,               File.expand_path("../action/has_snapshot.rb", __FILE__)
+            autoload :MessageSnapshotNotCreated, File.expand_path("../action/message_snapshot_not_created.rb", __FILE__)
+
+            def self.action_snapshot_take
+                Vagrant::Action::Builder.new.tap do |b|
+                    b.use CheckVMware
+                    b.use Call, Created do |env, b2|
+                        if env[:result]
+                            b2.use SnapshotTake
+                        else
+                            b2.use MessageNotCreated
+                        end
+                    end
+                end
+            end
+
+            def self.action_snapshot_rollback
+                Vagrant::Action::Builder.new.tap do |b|
+                    b.use CheckVMware
+                    b.use Call, Created do |env, b2|
+                        if env[:result]
+                            b2.use Call, HasSnapshot do |env2, b3|
+                                if env2[:result]
+                                    b3.use SnapshotRollback
+                                else
+                                    b3.use MessageSnapshotNotCreated
+                                end
+                            end
+                        else
+                            b2.use MessageNotCreated
+                        end
+                    end
+                end
+            end
+       end
+
+    end
+
+end
+
+        

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/has_snapshot.rb

@@ -0,0 +1,27 @@
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Action
+
+            class HasSnapshot
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:result] = env[:machine].provider.driver.has_snapshot?
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/message_snapshot_not_created.rb

@@ -0,0 +1,27 @@
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Action
+
+            class MessageSnapshotNotCreated
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_not_created")
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_rollback.rb

@@ -0,0 +1,33 @@
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Action
+
+            class SnapshotRollback
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_rollback.rolling_back")
+
+                    # Snapshot rollback involves powering off and on the VM
+                    #  so we need to find the gui state
+                    boot_mode = env[:machine].provider_config.gui ? "gui" : "headless"
+
+                    env[:machine].provider.driver.snapshot_rollback(boot_mode)
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_take.rb

@@ -0,0 +1,28 @@
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Action
+
+            class SnapshotTake
+
+                def initialize(app, env)
+                    @app = app
+                end
+
+                def call(env)
+
+                    env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_take.taking")
+                    env[:machine].provider.driver.snapshot_take
+
+                    @app.call(env)
+
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/providers/vmware_workstation/driver/base.rb

@@ -0,0 +1,38 @@
+module HashiCorp
+
+    module VagrantVMwareworkstation
+
+        module Driver
+
+            class Base
+
+                def snapshot_take
+                    vmrun("snapshot", "#{vmx_path}", "vagrant-snap-#{Time.now.to_i}")
+                end
+
+                def snapshot_rollback(bootmode)
+                   vmrun("revertToSnapshot", "#{vmx_path}", snapshot_list.last)
+                   start
+                end
+
+                def snapshot_list
+                    snapshots = []
+                    vmrun("listSnapshots", "#{vmx_path}").stdout.split("\n").each do |line|
+                        if line =~ /^vagrant-snap-/
+                            snapshots << line
+                        end
+                    end
+                    snapshots.sort
+                end
+
+                def has_snapshot?
+                    snapshot_list.length > 0
+                end
+
+            end
+
+        end
+
+    end
+
+end

data/lib/vagrant-multiprovider-snap/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Snap
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multiprovider-snap
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies: []
 description: Multi-provider snapshots for Vagrant
 email:
@@ -39,6 +39,12 @@ files:
 - lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/snapshot_rollback.rb
 - lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/snapshot_take.rb
 - lib/vagrant-multiprovider-snap/providers/vmware_fusion/driver/base.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/action.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/has_snapshot.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/message_snapshot_not_created.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_rollback.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/action/snapshot_take.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_workstation/driver/base.rb
 - lib/vagrant-multiprovider-snap/version.rb
 - locales/en.yml
 - vagrant-multiprovider-snap.gemspec