daptiv-chef-ci 0.0.9 → 0.0.10

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

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

@@ -2,15 +2,33 @@ module DaptivChefCI
   module RakeTaskHelpers
     extend self
     
+    @@exit_on_failure = true
+    
+    def exit_on_failure
+      @@exit_on_failure
+    end
+    
+    def exit_on_failure=(exit_on_failure)
+      @@exit_on_failure = exit_on_failure
+    end
+    
     def execute(&block)
       begin
         block.call()
       rescue SystemExit => ex
-        exit(ex.status)
+        if @@exit_on_failure
+          exit(ex.status)
+        else
+          raise
+        end
       rescue Exception => ex
-        STDERR.puts("#{ex.message} (#{ex.class})")
-        STDERR.puts(ex.backtrace.join("\n"))
-        exit(1)
+        if @@exit_on_failure
+          STDERR.puts("#{ex.message} (#{ex.class})")
+          STDERR.puts(ex.backtrace.join("\n"))
+          exit(1)
+        else
+          raise
+        end
       end
     end
     

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

@@ -16,15 +16,18 @@ module DaptivChefCI
     #
     # @param [String] The command line to execute
     # @param [Int] The number of seconds to wait for the command to finish, defaults to 600
+    # @param [Hash] Key value pairs of environment variables to pass to the command's environment.
     # @return [Array] Each entry represents a line from the stdout
-    def exec_cmd(command, timeout=600)
+    def exec_cmd(command, timeout = nil, environment = {})
+      timeout ||= 600
+      environment = Hash[ environment.map{ |k, v| [k.to_s, v.to_s] } ]
       path_at_start = ENV['PATH']
       begin
         ENV['PATH'] = path_without_gem_dir()
         @logger.debug("Temporarily setting PATH: #{ENV['PATH']}")
         
-        @logger.info("Calling command [#{command}]")
-        shell_out = Mixlib::ShellOut.new(command, :timeout => timeout)
+        @logger.info("Executing: '#{command}'\n\ttimeout: #{timeout}\n\tenvironment: #{environment}")
+        shell_out = Mixlib::ShellOut.new(command, :timeout => timeout, :environment => environment)
         shell_out.run_command()
         shell_out.invalid! if shell_out.exitstatus != 0
         

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

@@ -77,7 +77,9 @@ module DaptivChefCI
     
     def exec_cmd_with_retry(cmd, opts)
       attempt ||= 1
-      @shell.exec_cmd(cmd, opts[:cmd_timeout_in_seconds] || 600)
+      environment ||= opts[:environment] || {}
+      timeout ||= opts[:cmd_timeout_in_seconds] || 600
+      @shell.exec_cmd(cmd, timeout, environment)
     rescue Mixlib::ShellOut::ShellCommandFailed => e
       @logger.warn("#{cmd} failed with error: #{e.message}")
       raise if attempt > (opts[:retry_attempts] || 0)

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

@@ -11,6 +11,7 @@ class VagrantProvision
   #
   # VagrantProvision::RakeTask.new 'provision' do |t|
   #   t.provision_timeout_in_seconds = 3600
+  #   t.environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
   # end
   #
   # This class lets you define Rake tasks to drive Vagrant.
@@ -20,6 +21,7 @@ class VagrantProvision
     
     attr_accessor :vagrant_driver
     attr_accessor :provision_timeout_in_seconds
+    attr_accessor :environment
     
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
@@ -27,6 +29,7 @@ class VagrantProvision
     def initialize(name = 'vagrant_provision', desc = 'Vagrant provision task')
       @name, @desc = name, desc
       @provision_timeout_in_seconds = 7200
+      @environment = {}
       @vagrant_driver = DaptivChefCI::VagrantDriver.new()
       yield self if block_given?
       define_task
@@ -37,7 +40,12 @@ class VagrantProvision
     def define_task
       desc @desc
       task @name do
-        execute { @vagrant_driver.provision({ :cmd_timeout_in_seconds => @provision_timeout_in_seconds }) }
+        execute {
+          @vagrant_driver.provision({
+            :cmd_timeout_in_seconds => @provision_timeout_in_seconds,
+            :environment => @environment
+          })
+        }
       end
     end
 

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

@@ -14,6 +14,7 @@ class Vagrant
   #   t.create_box = true
   #   t.box_name = 'windows-server-vmwarefusion.box'
   #   t.up_timeout_in_seconds = 3600
+  #   t.environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
   # end
   #
   # This class lets you define Rake tasks to drive Vagrant.
@@ -31,6 +32,7 @@ class Vagrant
     attr_accessor :destroy_timeout_in_seconds
     attr_accessor :destroy_retry_attempts
     attr_accessor :halt_retry_attempts
+    attr_accessor :environment
     
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
@@ -46,6 +48,7 @@ class Vagrant
       @destroy_timeout_in_seconds = 180
       @destroy_retry_attempts = 2
       @halt_retry_attempts = 2
+      @environment = {}
       @vagrant_driver = DaptivChefCI::VagrantDriver.new(@provider)
       yield self if block_given?
       define_task
@@ -79,7 +82,10 @@ class Vagrant
     end
     
     def up()
-      @vagrant_driver.up({ :cmd_timeout_in_seconds => @up_timeout_in_seconds })
+      @vagrant_driver.up({
+        :cmd_timeout_in_seconds => @up_timeout_in_seconds,
+        :environment => @environment
+      })
     end
     
     def package()

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

@@ -12,6 +12,7 @@ class VagrantUp
   # VagrantUp::RakeTask.new 'up' do |t|
   #   t.provider = :vmware_fusion
   #   t.up_timeout_in_seconds = 3600
+  #   t.environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
   # end
   #
   # This class lets you define Rake tasks to drive Vagrant.
@@ -22,6 +23,7 @@ class VagrantUp
     attr_accessor :vagrant_driver
     attr_accessor :provider
     attr_accessor :up_timeout_in_seconds
+    attr_accessor :environment
     
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
@@ -30,6 +32,7 @@ class VagrantUp
       @name, @desc = name, desc
       @provider = :virtualbox
       @up_timeout_in_seconds = 7200
+      @environment = {}
       @vagrant_driver = DaptivChefCI::VagrantDriver.new(@provider)
       yield self if block_given?
       define_task
@@ -40,7 +43,12 @@ class VagrantUp
     def define_task
       desc @desc
       task @name do
-        execute { @vagrant_driver.up({ :cmd_timeout_in_seconds => @up_timeout_in_seconds }) }
+        execute {
+          @vagrant_driver.up({
+            :cmd_timeout_in_seconds => @up_timeout_in_seconds,
+            :environment => @environment
+          })
+        }
       end
     end
 

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

@@ -25,6 +25,18 @@ describe DaptivChefCI::Shell, :unit => true do
       expect(ENV['PATH']).to eq(path_before)
     end
     
+    it 'should pass long environment vars' do
+      shell = DaptivChefCI::Shell.new()
+      out = shell.exec_cmd('echo $ENV_VAR1', 600, { 'ENV_VAR1' => 'val1' })
+      expect(out[0]).to eq('val1')
+    end
+    
+    it 'should convert environment symbol keys to strings' do
+      shell = DaptivChefCI::Shell.new()
+      out = shell.exec_cmd('echo $ENV_VAR1', 600, { :ENV_VAR1 => 'val1' })
+      expect(out[0]).to eq('val1')
+    end
+    
   end
   
   describe 'path_without_gem_dir' do

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

@@ -12,14 +12,14 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
 
   describe 'destroy' do
     it 'should force shutdown vagrant with a timeout of 180 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant destroy -f', 180)
+      @shell.should_receive(:exec_cmd).with('vagrant destroy -f', 180, {})
       @vagrant.destroy()
     end
   end
   
   describe 'halt' do
     it 'should halt vagrant with a timeout of 180 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant halt', 180)
+      @shell.should_receive(:exec_cmd).with('vagrant halt', 180, {})
       @vagrant.halt()
     end
     
@@ -39,27 +39,39 @@ describe DaptivChefCI::VagrantDriver, :unit => true do
   
   describe 'up' do
     it 'should up vagrant with a timeout of 7200 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant up', 7200)
+      @shell.should_receive(:exec_cmd).with('vagrant up', 7200, {})
       @vagrant.up()
     end
 
     it 'should up vagrant and specify the provider if not virtualbox' do
       @vagrant = DaptivChefCI::VagrantDriver.new(:my_custom_provider, @shell, @basebox_builder_factory)
-      @shell.should_receive(:exec_cmd).with('vagrant up --provider=my_custom_provider', 7200)
+      @shell.should_receive(:exec_cmd).with('vagrant up --provider=my_custom_provider', 7200, {})
       @vagrant.up()
     end
+    
+    it 'should pass along environment variables' do
+      environment = { :A => 'A' }
+      @shell.should_receive(:exec_cmd).with('vagrant up', 7200, environment)
+      @vagrant.up({ :environment => environment })
+    end
   end
 
   describe 'provision' do
     it 'should provision vagrant with a timeout of 7200 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant provision', 7200)
+      @shell.should_receive(:exec_cmd).with('vagrant provision', 7200, {})
       @vagrant.provision()
     end
+    
+    it 'should pass along environment variables' do
+      environment = { :A => 'A' }
+      @shell.should_receive(:exec_cmd).with('vagrant provision', 7200, environment)
+      @vagrant.provision({ :environment => environment })
+    end
   end
   
   describe 'reload' do
     it 'should reload vagrant with a timeout of 180 seconds' do
-      @shell.should_receive(:exec_cmd).with('vagrant reload', 180)
+      @shell.should_receive(:exec_cmd).with('vagrant reload', 180, {})
       @vagrant.reload()
     end
   end

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

@@ -7,12 +7,23 @@ describe VagrantProvision::RakeTask, :unit => true do
   describe 'vagrant_provision' do
     it 'should provision the box' do
 
-      vagrant_driver.should_receive(:provision).with({ :cmd_timeout_in_seconds => 7200 })
+      vagrant_driver.should_receive(:provision).with({ :cmd_timeout_in_seconds => 7200, :environment => {} })
       
       task = rake['vagrant_provision']
       task.invoke()
 
     end
+    
+    it 'should up the box with the specified environment vars' do
+
+      environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
+      vagrant_driver.should_receive(:provision).with({ :cmd_timeout_in_seconds => 7200, :environment => environment })
+      
+      task = rake['vagrant_provision']
+      subject.environment = environment
+      task.invoke()
+
+    end
   end
   
 end

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

@@ -8,7 +8,7 @@ describe Vagrant::RakeTask, :unit => true 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(:up).with({ :cmd_timeout_in_seconds => 7200 })
+      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 })
       
@@ -16,6 +16,21 @@ describe Vagrant::RakeTask, :unit => true do
       task.invoke()
 
     end
+    
+    it 'should up the box with the specified environment vars' 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 })
+      
+      task = rake['vagrant']
+      subject.environment = environment
+      task.invoke()
+
+    end
   end
   
 end

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

@@ -7,12 +7,23 @@ describe VagrantUp::RakeTask, :unit => true do
   describe 'vagrant_up' do
     it 'should up the box' do
 
-      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200 })
+      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => {} })
       
       task = rake['vagrant_up']
       task.invoke()
 
     end
+    
+    it 'should up the box with the specified environment vars' do
+
+      environment = { :ENV_VAR1 => 'val1', :ENV_VAR2 => 'val2' }
+      vagrant_driver.should_receive(:up).with({ :cmd_timeout_in_seconds => 7200, :environment => environment })
+      
+      task = rake['vagrant_up']
+      subject.environment = environment
+      task.invoke()
+
+    end
   end
   
 end

data/spec/shared_contexts/rake.rb

@@ -1,9 +1,13 @@
 require "rake"
+require 'daptiv-chef-ci/raketask_helper'
 
 shared_context "rake" do
   let(:rake)           { create_rake_application() }
   let(:vagrant_driver) { stub() }
   
+  # let the errors bubble up normally, don't exit the app
+  before { DaptivChefCI::RakeTaskHelpers.exit_on_failure = false }
+  
   def create_rake_application
     Rake.application = Rake::Application.new
     subject.vagrant_driver = vagrant_driver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -136,6 +136,7 @@ files:
 - 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
@@ -165,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3145193294758643333
+      hash: 2192685794471906068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3145193294758643333
+      hash: 2192685794471906068
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23