chef/cookbooks/toaster/recipes/testing.rb in cloud-toaster-1.1.4 vs chef/cookbooks/toaster/recipes/testing.rb in cloud-toaster-1.1.5
- old
+ new
@@ -37,17 +37,11 @@
# 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)
-
+# load gems and require files using Bundler
+require "toaster/util/load_bundler"
package "gcc-c++" do
action :install
not_if "which g++"
end