vagrant-zz-multiprovider-snap 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 0.0.2 (June 27, 2013)
+
+ - Adds has_snapshot? method to drivers
+ - Uses proper error messages when attempting to rollback on VMs with no snapshots
+ - Makes sure VirtualBox driver only deals with its own snapshots.
+
+## 0.0.1 (June 12, 2013)
+
+Initial release - supports Virtualbox and VMWare Fusion

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2013 The Scale Factory Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-Vagrant Multi-Provder Snap
+Vagrant Multi-Provider Snap
 ==========================
 
 Description
@@ -61,7 +61,7 @@ running - although it's a bundler environment, you'll also need a packaged
 Vagrant install in order to get access to the rgloader libraries.
 
 ```
-git@github.com:scalefactory/vagrant-multiprovider-snap.git
+git clone git@github.com:scalefactory/vagrant-multiprovider-snap.git
 cd vagrant-multiprovider-snap
 cp ~/.vagrant.d/license-vagrant-vmware-fusion.lic .
 bundle install
@@ -76,3 +76,7 @@ Once you've made changes that you're happy with, I'd recommend using
 Vagrant install since some things which work in the bundler environment might
 not work as expected in the packaged copy due to differences in how the plugins
 are handled.
+
+License
+-------
+vagrant-multiprovider-snap is licensed under the MIT license.

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

@@ -0,0 +1,27 @@
+module VagrantPlugins
+
+    module ProviderVirtualBox
+
+        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/virtualbox/action/message_snapshot_not_created.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+
+    module ProviderVirtualBox
+
+        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/virtualbox/action.rb

@@ -6,8 +6,10 @@ module VagrantPlugins
 
         module Action
 
-            autoload :SnapshotTake,     File.expand_path("../action/snapshot_take.rb", __FILE__)
-            autoload :SnapshotRollback, File.expand_path("../action/snapshot_rollback.rb", __FILE__)
+            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|
@@ -28,8 +30,14 @@ module VagrantPlugins
                     b.use CheckVirtualbox
                     b.use Call, Created do |env, b2|
                         if env[:result]
-                            b2.use CheckAccessible
-                            b2.use SnapshotRollback
+                            b2.use Call, HasSnapshot do |env2, b3|
+                                if env2[:result]
+                                    b3.use CheckAccessible
+                                    b3.use SnapshotRollback
+                                else
+                                    b3.use MessageSnapshotNotCreated
+                                end
+                            end
                         else
                             b2.use MessageNotCreated
                         end

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

@@ -18,17 +18,20 @@ module VagrantPlugins
                 end
 
                 def snapshot_list
-                    # XXX blows up if no snapshots on the VM - how to prevent this?
                     info = execute("showvminfo", @uuid, "--machinereadable")
                     snapshots = []
                     info.split("\n").each do |line|
-                        if line =~ /^SnapshotName="(.+?)"$/
+                        if line =~ /^SnapshotName="(vagrant-snap-.+?)"$/
                             snapshots << $1.to_s
                         end
                     end
                     snapshots
                 end
 
+                def has_snapshot?
+                    snapshot_list.length > 0
+                end
+
             end
 
         end

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

@@ -0,0 +1,27 @@
+module HashiCorp
+
+    module VagrantVMwarefusion
+
+        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_fusion/action/message_snapshot_not_created.rb

@@ -0,0 +1,27 @@
+module HashiCorp
+
+    module VagrantVMwarefusion
+
+        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_fusion/action.rb

@@ -6,8 +6,10 @@ module HashiCorp
 
         module Action
 
-            autoload :SnapshotTake,     File.expand_path("../action/snapshot_take.rb", __FILE__)
-            autoload :SnapshotRollback, File.expand_path("../action/snapshot_rollback.rb", __FILE__)
+            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|
@@ -27,14 +29,19 @@ module HashiCorp
                     b.use CheckVMware
                     b.use Call, Created do |env, b2|
                         if env[:result]
-                            b2.use SnapshotRollback
+                            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

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

@@ -25,6 +25,10 @@ module HashiCorp
                     snapshots.sort
                 end
 
+                def has_snapshot?
+                    snapshot_list.length > 0
+                end
+
             end
 
         end

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

@@ -1,5 +1,5 @@
 module Vagrant
   module Snap
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/locales/en.yml

@@ -15,5 +15,7 @@ en:
         snapshot_rollback:
           rolling_back: |-
             Rolling back to previous snapshot
+        snapshot_not_created: |-
+            Snapshot not created for this VM
 
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zz-multiprovider-snap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Multi-provider snapshots for Vagrant
 email:
@@ -18,6 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
 - README.md
 - lib/vagrant-multiprovider-snap.rb
 - lib/vagrant-multiprovider-snap/command/list.rb
@@ -26,10 +28,14 @@ files:
 - lib/vagrant-multiprovider-snap/command/take.rb
 - lib/vagrant-multiprovider-snap/plugin.rb
 - lib/vagrant-multiprovider-snap/providers/virtualbox/action.rb
+- lib/vagrant-multiprovider-snap/providers/virtualbox/action/has_snapshot.rb
+- lib/vagrant-multiprovider-snap/providers/virtualbox/action/message_snapshot_not_created.rb
 - lib/vagrant-multiprovider-snap/providers/virtualbox/action/snapshot_rollback.rb
 - lib/vagrant-multiprovider-snap/providers/virtualbox/action/snapshot_take.rb
 - lib/vagrant-multiprovider-snap/providers/virtualbox/driver/base.rb
 - lib/vagrant-multiprovider-snap/providers/vmware_fusion/action.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/has_snapshot.rb
+- lib/vagrant-multiprovider-snap/providers/vmware_fusion/action/message_snapshot_not_created.rb
 - 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