no rubygems in lib/ && cleanup from previous commit

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] = { }