vagrant-cucumber 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57634e161f698537816146c12edbec81975b6fbe
-  data.tar.gz: 142c2e58f896134d3d9b1fbacee8e1d21ef299cd
+  metadata.gz: 0de77638a2311e90762aa7c72ea61e552383a47f
+  data.tar.gz: 4aa80e3e8498aee3d964e663de85a66f96410a56
 SHA512:
-  metadata.gz: 1abfea63a425e331044613e5d3057a83acfad59989bbdbf41e4a42fd82be97f64b5eadd71206cbcd8c26947ec4b6e7c5ab54ca59b8988033075db95aaf338795
-  data.tar.gz: 648f16d2dec025ef169e97843cc6929c9fd12b04e32c555485293c90b2479ee4c992bd325eb1ff4f725393cab85ddb5acfcb0a3ab816aad2812acbf1f9305b03
+  metadata.gz: bda45949dc846751a038e3ebb1257923c56856eb2e413146d20befcd1183df4816d9f6baa60be3ad0df1759f5bde58e2276061a1dceb158e551e144c07cb0598
+  data.tar.gz: 18ad2b90f094c62dcded36006315ec82f749e12fab9777c73c62ff6e79820bc15a29a5c7679f98d25567b4490b57dff53b92c45afa76755afa2b598374fed656

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1 (26 July, 2016)
+
+ * Retry snapshot operations on lock failure.
+
 ## 0.1.0 (21 July, 2016)
 
  * Removed `vagrant-multiprovider-snap` dependency. Vagrant now has all

data/lib/vagrant-cucumber/step_definitions.rb

@@ -1,25 +1,39 @@
 require 'to_regexp'
 
+def push_snapshot(vmname)
+    vagrant_glue.vagrant_env.cli('snapshot', 'push', vmname)
+rescue Vagrant::Errors::EnvironmentLockedError
+    sleep 0.2
+    retry
+end
+
+def pop_snapshot(vmname = nil)
+    args = [
+        'snapshot',
+        'pop',
+        '--no-provision',
+        '--no-delete',
+    ]
+    args << vmname unless vmname.nil?
+
+    vagrant_glue.vagrant_env.cli(*args)
+rescue Vagrant::Errors::EnvironmentLockedError
+    sleep 0.2
+    retry
+end
+
 Given /^there is a running VM called "([^"]*)"$/ do |vmname|
     machine = vagrant_glue.get_vm(vmname)
 
     machine.action(:up)
 
-    if machine.provider.capability(:snapshot_list).empty?
-        vagrant_glue.vagrant_env.cli('snapshot', 'push', vmname)
-    end
+    push_snapshot(vmname) if machine.provider.capability(:snapshot_list).empty?
 end
 
 When /^I roll back the VM called "([^"]*)"$/ do |vmname|
     machine = vagrant_glue.get_vm(vmname)
 
-    vagrant_glue.vagrant_env.cli(
-        'snapshot',
-        'pop',
-        '--no-provision',
-        '--no-delete',
-        vmname,
-    )
+    pop_snapshot(vmname)
 end
 
 Then /^(?:running|I run) the shell command `(.*)`(| as root)(#{VMRE})(?:|, it) should (succeed|fail)$/ do |command, as_root, vmre, condition|
@@ -82,12 +96,7 @@ end
 
 After('~@norollback') do |_scenario|
     puts 'Rolling back VM states'
-    vagrant_glue.vagrant_env.cli(
-        'snapshot',
-        'pop',
-        '--no-provision',
-        '--no-delete',
-    )
+    pop_snapshot
 end
 
 After('@norollback') do |_scenario|

data/lib/vagrant-cucumber/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module Cucumber
-        VERSION = '0.1.0'
+        VERSION = '0.1.1'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jon Topper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber