daptiv-chef-ci 0.0.4 → 0.0.5

data/README.md

@@ -15,7 +15,7 @@ Add a dependency for daptiv-chef-ci in your Gemfile
 
 `gem 'daptiv-chef-ci'`
 
-In your Rakefile require 'daptiv-chef-ci/vagrant_task' and then declare a new Vagrant::RakeTask. The minimal task declaration look like this in your rake file:
+Then just add this to your Rakefile:
 
 ```
 require 'daptiv-chef-ci/vagrant_task'

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

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

@@ -15,15 +15,16 @@ module DaptivChefCI
     # that the user has outside Ruby/Bundler.
     #
     # @param [String] The command line to execute
+    # @param [Int] The number of seconds to wait for the command to finish, defaults to 600
     # @return [Array] Each entry represents a line from the stdout
-    def exec_cmd(command)
+    def exec_cmd(command, timeout=600)
       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)
+        shell_out = Mixlib::ShellOut.new(command, :timeout => timeout)
         shell_out.run_command()
         shell_out.invalid! if shell_out.exitstatus != 0
         

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

@@ -20,12 +20,12 @@ module DaptivChefCI
       @shell.exec_cmd('vagrant halt')
     end
     
-    def up()
-      @shell.exec_cmd('vagrant up')
+    def up(timeout=7200)
+      @shell.exec_cmd('vagrant up', timeout)
     end
     
-    def provision()
-      @shell.exec_cmd('vagrant provision')
+    def provision(timeout=7200)
+      @shell.exec_cmd('vagrant provision', timeout)
     end
     
     def reload()

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

@@ -33,7 +33,7 @@ describe DaptivChefCI::Shell, :unit => true do
     it 'should not be prefixed by the system gem dir' do
       shell = DaptivChefCI::Shell.new()
       path = shell.path_without_gem_dir()
-      expect(path).not_to include(Bundler.bundle_path.to_s())
+      expect(path).not_to include(Bundler.bundle_path.to_s() + ':')
       expect(ENV['PATH']).to include(path)
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daptiv-chef-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -178,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3669985751056624684
+      hash: 4016572917644416697
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3669985751056624684
+      hash: 4016572917644416697
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23