lib/r10k/deployment.rb in r10k-1.5.1 vs lib/r10k/deployment.rb in r10k-2.0.0

@@ -9,13 +9,10 @@
   # and manages the contents of directories where environments are deployed.
   #
   # @api private
   class Deployment
 
-    require 'r10k/deployment/environment'
-    require 'r10k/deployment/basedir'
-    require 'r10k/deployment/source'
     require 'r10k/deployment/config'
 
     # Generate a deployment object based on a config
     #
     # @param path [String] The path to the deployment config
@@ -35,13 +32,10 @@
 
     def preload!
       sources.each(&:preload!)
     end
 
-    # @deprecated
-    alias fetch_sources preload!
-
     # Lazily load all sources
     #
     # This instantiates the @_sources instance variable, but should not be
     # used directly as it could be legitimately unset if we're doing lazy
     # loading.
@@ -92,10 +86,10 @@
           if hash.key?(environment.path)
             osource, oenvironment = hash[environment.path]
             msg = ""
             msg << "Environment collision at #{environment.path} between "
             msg << "#{source.name}:#{environment.name} and #{osource.name}:#{oenvironment.name}"
-            raise R10K::R10KError, msg
+            raise R10K::Error, msg
           else
             hash[environment.path] = [source, environment]
           end
         end
       end