lib/berkshelf.rb in berkshelf-3.0.0.beta1 vs lib/berkshelf.rb in berkshelf-3.0.0.beta2

@@ -65,18 +65,18 @@
       Berkshelf::Config.set_config(config)
     end
 
     # The Chef configuration file.
     #
-    # @return [Berkshelf::Chef::Config]
+    # @return [Ridley::Chef::Config]
     def chef_config
-      Berkshelf::Chef::Config.instance
+      @chef_config ||= Ridley::Chef::Config.new(ENV['BERKSHELF_CHEF_CONFIG'])
     end
 
-    # @param [Berkshelf::Chef::Config]
+    # @param [Ridley::Chef::Config]
     def chef_config=(config)
-      Berkshelf::Chef::Config.set_config(config)
+      @chef_config = config
     end
 
     # Initialize the filepath for the Berkshelf path..
     def initialize_filesystem
       FileUtils.mkdir_p(berkshelf_path, mode: 0755)
@@ -151,9 +151,10 @@
 require_relative 'berkshelf/config'
 require_relative 'berkshelf/dependency'
 require_relative 'berkshelf/downloader'
 require_relative 'berkshelf/formatters'
 require_relative 'berkshelf/git'
+require_relative 'berkshelf/mercurial'
 require_relative 'berkshelf/init_generator'
 require_relative 'berkshelf/installer'
 require_relative 'berkshelf/location'
 require_relative 'berkshelf/lockfile'
 require_relative 'berkshelf/logger'