vagrant-parallels 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c838025184a0d6acdfbb7c6434427e3730fe16f
-  data.tar.gz: 88541ff940262fefdf1602ab2753ad73c5c8ce8e
+  metadata.gz: 7d0df49aa2a8f022bfe2918179f34f185e991566
+  data.tar.gz: 7e31ce9a5505febbd9d277dd60b50ebbf65cfd46
 SHA512:
-  metadata.gz: bd23145472fdfb85da1abbea1d89fdf3d673ad4f74853bdfe9afe52c59a62a89245102ad6b806dd123ef266f293ed3afac4f739985ef0489081890f461223854
-  data.tar.gz: 272b8cbf4d71909b58f3bce0f33b6a3b3f77f07da3a3c5e355eea2244bd1028ca42310bf7c9db55f3d0491c14875d7517e59f347d6ac997bebe11d7ebdf36e21
+  metadata.gz: 2f1178440b0b9a8f81eefe23a6ba557dcc0f74de988716bb35b659746aa7524c84f8f26e497714b10362f2656bed6aedfea4c553d32e86bed1763d3d907252da
+  data.tar.gz: 5ff89e1b90270540a21cf0baedab86b11eaac25951e39f96b9a11e4e97fb8a4905d0296009f589eb54de7ac14ad792db2333dcb2ed137a8c1f41a00f36599fd1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.2 (March 23, 2016)
+BUG FIXES:
+  - Fix unsupported action error for `vagrant snapshot` commands [[GH-254](https://github.com/Parallels/vagrant-parallels/pull/254)]
+
+IMPROVEMENTS:
+  - action/destroy: Destroy suspended VMs without resuming
+  
 ## 1.6.1 (January 13, 2016)
 
 BUG FIXES:

data/Gemfile

@@ -9,6 +9,6 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
   gem 'vagrant-spec', git: 'git://github.com/mitchellh/vagrant-spec.git'
 end

data/README.md

@@ -49,7 +49,7 @@ Having problems while using the provider? Ask your question on the official foru
 ["Parallels Provider for Vagrant" forum branch](http://forum.parallels.com/forumdisplay.php?737-Parallels-Provider-for-Vagrant)
 
 If you get an error while using the Parallels provider or discover a bug,
-please report it on the [IssueTracker](https://github.com/Parallels/vagrant-parallels).
+please report it on the [Issue Tracker](https://github.com/Parallels/vagrant-parallels/issues).
 
 ## License and Authors
 

data/lib/vagrant-parallels/action.rb

@@ -51,8 +51,14 @@ module VagrantPlugins
                 next
               end
 
-              b2.use EnvSet, :force_halt => true
-              b2.use action_halt
+              # Do not resume && halt the suspended VM, just delete it
+              b2.use Call, IsState, :suspended do |env3, b3|
+                if !env3[:result]
+                  b3.use EnvSet, :force_halt => true
+                  b3.use action_halt
+                end
+              end
+
               b2.use Destroy
               b2.use DestroyUnusedNetworkInterfaces
               b2.use ProvisionerCleanup
@@ -173,6 +179,50 @@ module VagrantPlugins
         end
       end
 
+      def self.action_snapshot_delete
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsState, :not_created do |env1, b1|
+            if env1[:result]
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
+            else
+              b1.use SnapshotDelete
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for saving a snapshot
+      def self.action_snapshot_restore
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsState, :not_created do |env1, b1|
+            if env1[:result]
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
+              next
+            end
+
+            b1.use SnapshotRestore
+            b1.use Call, IsEnvSet, :snapshot_delete do |env2, b2|
+              if env2[:result]
+                b2.use action_snapshot_delete
+              end
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for saving a snapshot
+      def self.action_snapshot_save
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsState, :not_created do |env1, b1|
+            if env1[:result]
+              b1.use Message, I18n.t('vagrant.commands.common.vm_not_created')
+            else
+              b1.use SnapshotSave
+            end
+          end
+        end
+      end
+
       # This is the action that will exec into an SSH shell.
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
@@ -359,6 +409,9 @@ module VagrantPlugins
       autoload :SaneDefaults, File.expand_path('../action/sane_defaults',__FILE__)
       autoload :SetupPackageFiles, File.expand_path('../action/setup_package_files', __FILE__)
       autoload :SetName, File.expand_path('../action/set_name', __FILE__)
+      autoload :SnapshotDelete, File.expand_path('../action/snapshot_delete', __FILE__)
+      autoload :SnapshotRestore, File.expand_path('../action/snapshot_restore', __FILE__)
+      autoload :SnapshotSave, File.expand_path('../action/snapshot_save', __FILE__)
       autoload :Suspend, File.expand_path('../action/suspend', __FILE__)
     end
   end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.6.1'
+    VERSION = '1.6.2'
   end
 end

data/tasks/acceptance.rake

@@ -11,6 +11,7 @@ namespace :acceptance do
       linked_clone
       network/forwarded_port
       network/private_network
+      snapshot
       synced_folder
       synced_folder/nfs
       synced_folder/rsync

data/test/acceptance/provider/snapshot_spec.rb

@@ -0,0 +1,63 @@
+shared_examples 'provider/snapshot' do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+      "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    assert_execute('vagrant', 'box', 'add', 'box', options[:box])
+    assert_execute('vagrant', 'init', 'box')
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'can save, list and delete machine snapshots' do
+    status('Test: two snapshots could be created')
+    assert_execute('vagrant', 'snapshot', 'save', 'foo')
+    assert_execute('vagrant', 'snapshot', 'save', 'bar')
+
+    status('Test: snapshots show up in list')
+    result = execute('vagrant', 'snapshot', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/^foo$/)
+    expect(result.stdout).to match(/^bar$/)
+
+    status('Test: snapshots could be restored')
+    assert_execute('vagrant', 'snapshot', 'restore', 'foo')
+    assert_execute('vagrant', 'snapshot', 'restore', 'bar')
+
+    status('Test: snapshots could be deleted')
+    assert_execute('vagrant', 'snapshot', 'delete', 'foo')
+    assert_execute('vagrant', 'snapshot', 'delete', 'bar')
+
+    result = execute('vagrant', 'snapshot', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).not_to match(/^foo$/)
+    expect(result.stdout).not_to match(/^bar$/)
+  end
+
+  it 'can push and pop snapshots' do
+    status('Test: snapshot push')
+    result = execute('vagrant', 'snapshot', 'push')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/push_/)
+
+    status('Test: pushed snapshot shows up in list')
+    result = execute('vagrant', 'snapshot', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/^push_/)
+
+    status('Test: snapshot pop')
+    assert_execute('vagrant', 'snapshot', 'pop')
+
+    status('Test: popped snapshot has been deleted')
+    result = execute('vagrant', 'snapshot', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).not_to match(/push_/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - tasks/test.rake
 - test/acceptance/base.rb
 - test/acceptance/provider/linked_clone_spec.rb
+- test/acceptance/provider/snapshot_spec.rb
 - test/acceptance/shared/context_parallels.rb
 - test/acceptance/skeletons/linked_clone/Vagrantfile
 - test/unit/base.rb