vagrant-multiprovider-snap 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc2a043450ab4350c0d45503dfc522de033e2141
-  data.tar.gz: 61872d1d00b817b1625abe20d37f5174f2c9dfba
+  metadata.gz: 02da544bcb07fe508d365dc393528b7a7b656318
+  data.tar.gz: c9d8a12e14ab03ebe0423f53fe947501044f4f9f
 SHA512:
-  metadata.gz: 361ed7cc56cf1f7b4332c6d21308204387c48af1052f8b1af95673eac991e6a996ccb83a492eed9a2c727cdf650c1456eb5b21ee418a141b8809328b01b11a93
-  data.tar.gz: 88020e159880b6f1207ea52ae609ce3639cb39d5022bd86adebf6aa34e73fcf465511618dcaac153364950120b56a7986f74f52afb820922046a8a2bb93d9a1d
+  metadata.gz: 2a21eed86cf3b8d3d3a3d487d9021d78f46d504694477ad37b56bec79d548c7e9b11d8039a23b1c67c752a169f4685f6b4f891e9c67f4b27e875ef303cf7eb4d
+  data.tar.gz: 42954d9edf17c022c715ff5013b06fdfe5af9e762e6a292a981c7fde93916d6315498546cc6a75086c66aeae1a907fa28167d462ca8eb5de212475e54dd9315f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.12 (August 10, 2014)
+
+ - Support named snapshots and arbitrary rollback
+ - Ensure GUI-enabled VMWare VMs roll back with the GUI active
+
 ## 0.0.11 (April 28, 2014)
 
  - Wait for SSH readiness on rolled-back VMWare VMs

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2013 The Scale Factory Ltd
+Copyright (c) 2010-2014 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

data/README.md

@@ -25,27 +25,34 @@ vagrant plugin install vagrant-multiprovider-snap
 Usage
 -----
 
-Typical usage:
+Take a new snapshot:
 
-  * Take a new snapshot
-    ```vagrant snap take [vm]```
+    vagrant snap take [vm]
 
-  * Roll back to the last snapshot
-    ```vagrant snap rollback [vm]```
+Roll back to the last snapshot:
 
-  * List snapshots
-    ```vagrant snap list [vm]```
+    vagrant snap rollback [vm]
+
+List snapshots:
+
+    vagrant snap list [vm]
+
+Take a custom-named snapshot:
+
+    vagrant snap take [vm] --name=snap01
+
+Roll back to a named snapshot:
+
+    vagrant snap rollback [vm] --name=snap01
 
 Limitations
 -----------
 
 It's currently not possible to do any of the following:
 
- * Give a custom snapshot name
- * Roll back to a specific named snapshot
  * Disable snapshotting
 
-My own requirements don't include these features, but I could be tempted to
+My own requirements don't include this feature, but I could be tempted to
 add them if anyone would find them useful.
 
 
@@ -80,8 +87,13 @@ vagrant-multiprovider-snap is licensed under the MIT license.
 Thanks
 ------
 
+vagrant-multiprovider-snap was written, and is maintained by Jon Topper of [The Scale Factory](http://www.scalefactory.com/)
+
 Many thanks to the following people for contributing to vagrant-multiprovider-snap:
 
  - Reid Vandewiele
  - James Sweeny
  - Steven De Coeyer
+ - Andrew Stangl
+ - Stefan Scherer
+

data/lib/vagrant-multiprovider-snap/command/rollback.rb

@@ -10,10 +10,17 @@ module VagrantSnap
             def execute
 
                 options = {}
+                options[:snap_name] = nil
 
                 opts = OptionParser.new do |o|
-                    o.banner    = "Usage: vagrant snap rollback [vm-name]"
+
+                    o.banner    = "Usage: vagrant snap rollback [vm-name] [--name=<snapname>]"
                     o.separator ""
+
+                    o.on("--name SNAPNAME", "Roll back to the named snapshot (defaults to last taken)") do |n|
+                        options[:snap_name] = n
+                    end
+
                 end
 
                 argv = parse_options(opts)
@@ -21,7 +28,7 @@ module VagrantSnap
 
                 with_target_vms(argv) do |vm|
 
-                    vm.action(:snapshot_rollback)
+                    vm.action(:snapshot_rollback, :snap_name => options[:snap_name])
 
                 end
 

data/lib/vagrant-multiprovider-snap/command/take.rb

@@ -10,10 +10,17 @@ module VagrantSnap
             def execute
 
                 options = {}
+                options[:snap_name] = nil
 
                 opts = OptionParser.new do |o|
-                    o.banner    = "Usage: vagrant snap take [vm-name]"
+
+                    o.banner    = "Usage: vagrant snap take [vm-name] [--name=<snapname>]"
                     o.separator ""
+
+                    o.on("--name SNAPNAME", "Use the given name for this snapshot") do |n|
+                        options[:snap_name] = n
+                    end
+
                 end
 
                 argv = parse_options(opts)
@@ -21,7 +28,7 @@ module VagrantSnap
 
                 with_target_vms(argv) do |vm|
 
-                    vm.action(:snapshot_take)
+                    vm.action(:snapshot_take, :snap_name => options[:snap_name])
 
                 end
 

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

@@ -18,7 +18,7 @@ module VagrantPlugins
                     #  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)
+                    env[:machine].provider.driver.snapshot_rollback(boot_mode,env[:snap_name])
 
                     @app.call(env)
 

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

@@ -13,7 +13,7 @@ module VagrantPlugins
                 def call(env)
 
                     env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_take.taking")
-                    env[:machine].provider.driver.snapshot_take
+                    env[:machine].provider.driver.snapshot_take(env[:snap_name])
 
                     @app.call(env)
 

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

@@ -6,17 +6,17 @@ module VagrantPlugins
 
             class Base
 
-                def snapshot_take
-                    execute("snapshot", @uuid, "take", "vagrant-snap-#{Time.now.to_i}", "--pause")
+                def snapshot_take(name)
+                    execute("snapshot", @uuid, "take", name || "vagrant-snap-#{Time.now.to_i}", "--pause")
                 end
 
-                def snapshot_rollback(bootmode)
+                def snapshot_rollback(bootmode, name)
                     # don't try to power off if we're already off
                     unless [:poweroff, :aborted].include?(read_state)
                         halt
                         sleep 2 # race condition on locked VMs otherwise?
                     end
-                    execute("snapshot",  @uuid, "restore", snapshot_list.last)
+                    execute("snapshot",  @uuid, "restore", name || snapshot_list.last)
                     start(bootmode)
                 end
 
@@ -24,11 +24,11 @@ module VagrantPlugins
                     info = execute("showvminfo", @uuid, "--machinereadable")
                     snapshots = []
                     info.split("\n").each do |line|
-                        if line =~ /^SnapshotName[^=]*="(vagrant-snap-.+?)"$/
+                        if line =~ /^SnapshotName[^=]*="(.+?)"$/
                             snapshots << $1.to_s
                         end
                     end
-                    snapshots.sort
+                    snapshots
                 end
 
                 def has_snapshot?

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

@@ -16,9 +16,9 @@ module HashiCorp
 
                     # 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"
+                    boot_mode = env[:machine].provider_config.gui ? "gui" : "nogui"
 
-                    env[:machine].provider.driver.snapshot_rollback(boot_mode)
+                    env[:machine].provider.driver.snapshot_rollback(boot_mode, env[:snap_name])
 
                     @app.call(env)
 

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

@@ -13,7 +13,7 @@ module HashiCorp
                 def call(env)
 
                     env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_take.taking")
-                    env[:machine].provider.driver.snapshot_take
+                    env[:machine].provider.driver.snapshot_take(env[:snap_name])
 
                     @app.call(env)
 

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

@@ -6,23 +6,23 @@ module HashiCorp
 
             class Fusion
 
-                def snapshot_take
-                    vmrun("snapshot", "#{vmx_path}", "vagrant-snap-#{Time.now.to_i}")
+                def snapshot_take(name)
+                    vmrun("snapshot", "#{vmx_path}", name || "vagrant-snap-#{Time.now.to_i}")
                 end
 
-                def snapshot_rollback(bootmode)
-                   vmrun("revertToSnapshot", "#{vmx_path}", snapshot_list.last)
-                   start
+                def snapshot_rollback(bootmode, name)
+                    vmrun("revertToSnapshot", "#{vmx_path}", name || snapshot_list.last)
+                    start(bootmode)
                 end
 
                 def snapshot_list
                     snapshots = []
                     vmrun("listSnapshots", "#{vmx_path}").stdout.split("\n").each do |line|
-                        if line =~ /^vagrant-snap-/
+                        if line !~ /Total snapshot/
                             snapshots << line
                         end
                     end
-                    snapshots.sort
+                    snapshots
                 end
 
                 def has_snapshot?

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

@@ -16,9 +16,9 @@ module HashiCorp
 
                     # 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"
+                    boot_mode = env[:machine].provider_config.gui ? "gui" : "nogui"
 
-                    env[:machine].provider.driver.snapshot_rollback(boot_mode)
+                    env[:machine].provider.driver.snapshot_rollback(boot_mode,env[:snap_name])
 
                     @app.call(env)
 

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

@@ -13,7 +13,7 @@ module HashiCorp
                 def call(env)
 
                     env[:ui].info I18n.t("vagrant_snap.actions.vm.snapshot_take.taking")
-                    env[:machine].provider.driver.snapshot_take
+                    env[:machine].provider.driver.snapshot_take(env[:snap_name])
 
                     @app.call(env)
 

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

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

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

@@ -1,5 +1,5 @@
 module Vagrant
   module Snap
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-multiprovider-snap
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Multi-provider snapshots for Vagrant
 email: