lib/origen/remote_manager.rb in origen-0.2.6 vs lib/origen/remote_manager.rb in origen-0.3.0

@@ -15,16 +15,10 @@
     # This will fetch all remotes (if required)
     # It does not add the libs to the load path, and require the environments
     #  since remotes are not assumed to be Ruby.
     def require!
       unless required?
-        # Make sure the imports have already been required and added
-        # to the load path of the current thread
-        unless imports_required?
-          fail 'Error: Imports must be required before remotes!'
-        end
-
         while updates_required?
           Origen.log.info 'The following remotes need to be updated, this will now happen automatically:'
           dirty_remotes.each do |name, remote|
             if remote[:path]
               Origen.log.info "  #{name} - #{remote[:path]}"
@@ -45,11 +39,11 @@
     end
 
     # Returns true if the imports have already been required and added
     # to the load path of the current thread
     def imports_required?
-      Origen.import_manager.required?
+      true # Guaranteed by the boot process
     end
 
     def validate_production_status(force = false)
       if Origen.mode.production? || force
         remotes.each do |_name, remote|
@@ -218,10 +212,10 @@
         traverse_remotes(remote) do |remote|
           add_remote(remote)
         end
       end
       # Add remotes from imports
-      Origen.plugins.each do |plugin|
+      Origen.app.plugins.each do |plugin|
         plugin.config.remotes.each do |import_remote|
           add_remote(import_remote)
         end
       end
       @remotes