daptiv-chef-ci 0.0.5 → 0.0.6

data/daptiv-chef-ci.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "daptiv-chef-ci"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.5'
+  gem.version       = '0.0.6'
   
   gem.add_runtime_dependency "log4r", "~> 1.1.10"
   gem.add_runtime_dependency "mixlib-shellout", "~> 1.2.0"

data/lib/daptiv-chef-ci/vagrant_driver.rb

@@ -1,4 +1,5 @@
 require 'log4r'
+require 'mixlib/shellout/exceptions'
 require_relative 'shell'
 
 module DaptivChefCI
@@ -12,24 +13,60 @@ module DaptivChefCI
       @shell = shell
     end
     
-    def destroy()
-      @shell.exec_cmd('vagrant destroy -f')
+    def destroy(opts={})
+      opts = {
+        :cmd_timeout_in_seconds => 180,
+        :retry_attempts => 2,
+        :retry_wait_in_seconds => 20
+      }.merge(opts)
+      exec_cmd_with_retry('vagrant destroy -f', opts)
     end
     
-    def halt()
-      @shell.exec_cmd('vagrant halt')
+    def halt(opts={})
+      opts = {
+        :cmd_timeout_in_seconds => 180,
+        :retry_attempts => 2,
+        :retry_wait_in_seconds => 20
+      }.merge(opts)
+      exec_cmd_with_retry('vagrant halt', opts)
     end
     
-    def up(timeout=7200)
-      @shell.exec_cmd('vagrant up', timeout)
+    def up(opts={})
+      opts = {
+        :cmd_timeout_in_seconds => 7200,
+        :retry_attempts => 0
+      }.merge(opts)
+      exec_cmd_with_retry('vagrant up', opts)
     end
     
-    def provision(timeout=7200)
-      @shell.exec_cmd('vagrant provision', timeout)
+    def provision(opts={})
+      opts = {
+        :cmd_timeout_in_seconds => 7200,
+        :retry_attempts => 0
+      }.merge(opts)
+      exec_cmd_with_retry('vagrant provision', opts)
     end
     
-    def reload()
-      @shell.exec_cmd('vagrant reload')
+    def reload(opts={})
+      opts = {
+        :cmd_timeout_in_seconds => 180,
+        :retry_attempts => 0
+      }.merge(opts)
+      exec_cmd_with_retry('vagrant reload', opts)
+    end
+    
+    
+    private
+    
+    def exec_cmd_with_retry(cmd, opts)
+      attempt ||= 1
+      @shell.exec_cmd(cmd, opts[:cmd_timeout_in_seconds] || 600)
+    rescue Mixlib::ShellOut::ShellCommandFailed => e
+      @logger.warn("#{cmd} failed with error: #{e.message}")
+      raise if attempt > (opts[:retry_attempts] || 0)
+      attempt += 1
+      sleep(opts[:retry_wait_in_seconds] || 10)
+      retry
     end
     
   end

data/spec/daptiv-chef-ci/vagrant_driver_spec.rb

@@ -1,4 +1,5 @@
 require 'mocha/api'
+require 'mixlib/shellout/exceptions'
 require 'daptiv-chef-ci/vagrant_driver'
 require 'daptiv-chef-ci/logger'
 
@@ -25,6 +26,18 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
       end
       @vagrant.halt()
     end
+    
+    it 'should retry when exec fails' do
+      # shell cmd fails then succeeds, the vagrant.halt should succeed overall
+      @shell.stubs(:exec_cmd).raises(Mixlib::ShellOut::ShellCommandFailed, 'There was an error').then.returns('success')
+      @vagrant.halt({ :retry_wait_in_seconds => 0 })
+    end
+    
+    it 'should fail after retrying twice' do
+      # shell always fails, vagrant.halt should fail after a couple retries
+      @shell.stubs(:exec_cmd).raises(Mixlib::ShellOut::ShellCommandFailed, 'There was an error')
+      expect { @vagrant.halt({ :retry_wait_in_seconds => 0 }) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
+    end
   end
   
   describe 'up' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -157,6 +157,7 @@ files:
 - pkg/daptiv-chef-ci-0.0.2.gem
 - pkg/daptiv-chef-ci-0.0.3.gem
 - pkg/daptiv-chef-ci-0.0.4.gem
+- pkg/daptiv-chef-ci-0.0.5.gem
 - Rakefile
 - README.md
 - spec/daptiv-chef-ci/logger_spec.rb
@@ -178,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4016572917644416697
+      hash: -3011568715703408744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4016572917644416697
+      hash: -3011568715703408744
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23