diff options
author | Daniel DeLeo <dan@opscode.com> | 2010-04-24 13:42:11 -0700 |
---|---|---|
committer | Daniel DeLeo <dan@opscode.com> | 2010-05-01 10:50:31 -0700 |
commit | d6d5769656fd8ff00a3f9fb5aee2e1e54648677f (patch) | |
tree | af91232027f72bd93376ad5aa26da283c21b3594 /chef/spec/spec_helper.rb | |
parent | 55f3a1be1e8ef45beb1d24f25882d5fefb854a63 (diff) | |
download | chef-d6d5769656fd8ff00a3f9fb5aee2e1e54648677f.tar.gz |
no rubygems in lib/ && cleanup from previous commit
Diffstat (limited to 'chef/spec/spec_helper.rb')
-rw-r--r-- | chef/spec/spec_helper.rb | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/chef/spec/spec_helper.rb b/chef/spec/spec_helper.rb index 9a62ae7a70..c98a4f51bd 100644 --- a/chef/spec/spec_helper.rb +++ b/chef/spec/spec_helper.rb @@ -22,30 +22,23 @@ module Shef IRB = nil unless defined? IRB end +require 'rubygems' + $:.unshift(File.join(File.dirname(__FILE__), "..", "lib")) -#$:.unshift(File.join(File.dirname(__FILE__), "..", "..", "chef-server", "lib")) require 'chef' require 'chef/knife' Chef::Knife.load_commands require 'chef/mixins' +require 'chef/application' +require 'chef/applications' + require 'chef/shef' require 'chef/util/file_edit' -# chef_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')) -# Dir[ -# File.expand_path( -# File.join( -# chef_lib_path, 'chef', '**', '*.rb' -# ) -# ) -# ].sort.each do |lib| -# lib_short_path = lib.match("^#{chef_lib_path}#{File::SEPARATOR}(.+)$")[1] -# require lib_short_path -# end Dir[File.join(File.dirname(__FILE__), 'lib', '**', '*.rb')].sort.each { |lib| require lib } -# + Chef::Config[:log_level] = :fatal Chef::Config[:cache_type] = "Memory" Chef::Config[:cache_options] = { } |