Fixes to support unbundled rake uselcg/support-unbundled-rake

We're using Bundler::GemHelper without requiring it

We're requiring `lib/chef/dist.rb` which requires files out
of `chef-config/lib/chef-config` which will escape into the
main fileset if we don't push that libdir on there.

(Also:  all of `lib/chef/dist.rb` and
`chef-config/lib/chef-config/dist.rb` needs to be pushed into
chef-utils and reading values into `lib/chef/dist.rb` from
the Chef::Config itself seems like the wrong flow of information)

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/Rakefile b/Rakefile
index b54411af4c..a147fc3435 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
+# we need this to resolve files required by lib/chef/dist
+$LOAD_PATH.unshift(File.expand_path("../chef-config/lib", __FILE__))
+
 begin
   require_relative "tasks/rspec"
   require_relative "tasks/dependencies"
@@ -27,6 +30,8 @@ rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"
 end
 
+require "bundler/gem_helper"
+
 ENV["CHEF_LICENSE"] = "accept-no-persist"
 
 # hack the chef-config install to run before the traditional install task