daptiv-chef-ci 0.0.11 → 0.0.12

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.11'
+  gem.version       = '0.0.12'
   
   gem.add_runtime_dependency "log4r", "~> 1.1.10"
   gem.add_runtime_dependency "mixlib-shellout", "~> 1.2.0"

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

@@ -20,12 +20,14 @@ class VagrantDestroy
     
     attr_accessor :vagrant_driver
     attr_accessor :destroy_timeout_in_seconds
+    attr_accessor :environment
     
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
     def initialize(name = 'vagrant_destroy', desc = 'Vagrant destroy task')
       @name, @desc = name, desc
       @destroy_timeout_in_seconds = 180
+      @environment = {}
       yield self if block_given?
       define_task
     end
@@ -35,7 +37,9 @@ class VagrantDestroy
     def define_task
       desc @desc
       task @name do
-        execute { vagrant_driver.destroy({ :cmd_timeout_in_seconds => @destroy_timeout_in_seconds }) }
+        execute { vagrant_driver.destroy({
+          :cmd_timeout_in_seconds => @destroy_timeout_in_seconds,
+          :environment => @environment }) }
       end
     end
     

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

@@ -88,15 +88,24 @@ class Vagrant
     end
     
     def package()
-      vagrant_driver.package({ :base_dir => @vagrantfile_dir, :box_name => @box_name })
+      vagrant_driver.package({
+        :base_dir => @vagrantfile_dir,
+        :box_name => @box_name,
+        :environment => @environment })
     end
     
     def destroy()
-      vagrant_driver.destroy({ :cmd_timeout_in_seconds => @destroy_timeout_in_seconds, :retry_attempts => @destroy_retry_attempts })
+      vagrant_driver.destroy({
+        :cmd_timeout_in_seconds => @destroy_timeout_in_seconds,
+        :retry_attempts => @destroy_retry_attempts,
+        :environment => @environment })
     end
     
     def halt()
-      vagrant_driver.halt({ :cmd_timeout_in_seconds => @halt_timeout_in_seconds, :retry_attempts => @halt_retry_attempts })
+      vagrant_driver.halt({
+        :cmd_timeout_in_seconds => @halt_timeout_in_seconds,
+        :retry_attempts => @halt_retry_attempts,
+        :environment => @environment })
     end
     
     def vagrant_driver()

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

@@ -7,7 +7,7 @@ describe VagrantDestroy::RakeTask, :unit => true do
   describe 'vagrant_destroy' do
     it 'should destroy the box' do
 
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180 })
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :environment => {} })
       
       task = rake['vagrant_destroy']
       task.invoke()

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

@@ -7,10 +7,10 @@ describe Vagrant::RakeTask, :unit => true do
   describe 'vagrant' do
     it 'should destroy, up, halt, then destroy the box' do
       
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => {} })
       vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => {} })
-      vagrant_driver.should_receive(:halt).at_least(1).times.with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      vagrant_driver.should_receive(:halt).at_least(1).times.with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => {} })
+      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => {} })
       
       task = rake['vagrant']
       task.invoke()
@@ -21,10 +21,14 @@ describe Vagrant::RakeTask, :unit => true do
 
       environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
       
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
-      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => environment })
-      vagrant_driver.should_receive(:halt).at_least(1).times.with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
-      vagrant_driver.should_receive(:destroy).with({ :cmd_timeout_in_seconds => 180, :retry_attempts => 2 })
+      vagrant_driver.should_receive(:destroy).with({
+        :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => environment })
+      vagrant_driver.should_receive(:up).with({
+        :cmd_timeout_in_seconds => 7200, :environment => environment })
+      vagrant_driver.should_receive(:halt).at_least(1).times.with({
+        :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => environment })
+      vagrant_driver.should_receive(:destroy).with({
+        :cmd_timeout_in_seconds => 180, :retry_attempts => 2, :environment => environment })
       
       task = rake['vagrant']
       subject.environment = environment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -128,16 +128,6 @@ files:
 - lib/daptiv-chef-ci/virtualbox_basebox_builder.rb
 - lib/daptiv-chef-ci/virtualbox_driver.rb
 - lib/daptiv-chef-ci/vmware_basebox_builder.rb
-- pkg/daptiv-chef-ci-0.0.1.gem
-- pkg/daptiv-chef-ci-0.0.10.gem
-- 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
-- pkg/daptiv-chef-ci-0.0.6.gem
-- pkg/daptiv-chef-ci-0.0.7.gem
-- pkg/daptiv-chef-ci-0.0.8.gem
-- pkg/daptiv-chef-ci-0.0.9.gem
 - Rakefile
 - README.md
 - spec/daptiv-chef-ci/basebox_builder_factory_spec.rb
@@ -167,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4467900760227651610
+      hash: 2136130204737791091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4467900760227651610
+      hash: 2136130204737791091
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23