chef/cookbooks/toaster/recipes/testing.rb in cloud-toaster-1.1.3 vs chef/cookbooks/toaster/recipes/testing.rb in cloud-toaster-1.1.4

- old
+ new

@@ -33,10 +33,23 @@ # issue where Chef was complaining that /var/chef/data_bags does not exist) require 'fileutils' databags_dir = "/var/chef/data_bags" FileUtils.mkpath(databags_dir) if !File.directory?(databags_dir) +# Add code directories to Ruby LOAD_PATH. +root_dir = File.join(File.dirname(__FILE__), "..","..","..","..") +code_dir = File.join(root_dir, "lib") +$:.unshift(code_dir) +require "rubygems" +require "bundler/setup" +# bug fix for ruby 1.9+ +require 'dl/import' +DL::Importable = DL::Importer +ENV['BUNDLE_GEMFILE'] = File.join(root_dir, "Gemfile") +Bundler.require(:default) + + package "gcc-c++" do action :install not_if "which g++" end @@ -87,11 +100,10 @@ end bash "install_toaster_gem" do - require 'toaster/util/config' code <<-EOH gem install --no-ri --no-rdoc cloud-toaster EOH not_if "which toaster" end @@ -101,11 +113,9 @@ $status_of_parsing_postprocessing_scripts = "off" $postprocessing_scripts = [] $postprocessing_scripts_by_name = {} # Add code directories to Ruby LOAD_PATH. -code_dir = File.join(__FILE__, "..","..","..","..", "lib") -$:.unshift(code_dir) if node['toaster']['additional_load_paths'].kind_of?(Array) node['toaster']['additional_load_paths'].each do |path| if File.exist?(path) puts "INFO: Adding folder to $LOAD_PATH: #{path}" $:.unshift(path)