bin/toaster in cloud-toaster-1.1.4 vs bin/toaster in cloud-toaster-1.1.5

@@ -3,26 +3,20 @@
 #
 # Author: Waldemar Hummer ([e-mail])
 # 
 
 # some global/constant variables
+ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
 REQUIRED_CONFIGS = {
   #"db.host" => "Database host"
 }
-ROOT_DIR = File.join(File.dirname(File.expand_path(__FILE__)), "..")
+$LOAD_PATH << File.join(ROOT_DIR, "lib")
 
-# call bundler
-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 dependencies using Bundler
+require "toaster/util/load_bundler"
 
 # requires
-$LOAD_PATH << File.join(ROOT_DIR, "lib")
-require "toaster/api.rb"
+require "toaster/api"
 
 # util functions
 def install_chef()
   existing = `which chef-solo 2> /dev/null`
   existing = existing.strip