0
@@ -11,32 +11,12 @@ module Kernel
0
 
0
   def dependency(name, *ver)
0
     begin
0
-      # If it's not in ROOT/gems, skip to the next attempt
0
-      raise LoadError unless File.directory?(Merb.root / "gems")
0
-      
0
-      # cache the gem path
0
-      begin
0
-        # Clear out the paths and reset them to Merb
0
-        Gem.use_paths(Merb.root / "gems", [Merb.root / "gems"])
0
-        
0
-        # Try activating the gem (Failure will raise a LoadError)
0
-        Gem.activate(name, true, *ver)
0
-        Merb.logger.info("#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ...")
0
-      ensure
0
-        # Either way, set the gem path back to normal
0
-        Gem.clear_paths
0
-      end
0
-
0
-    # If we couldn't load the gem or there was no ROOT/gems, try again, now with the full gem path
0
+      # Try activating the gem
0
+      Gem.activate(name, true, *ver)
0
+      Merb.logger.info("#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ...")
0
     rescue LoadError
0
-      begin
0
-        # Try activating again
0
-        Gem.activate(name, true, *ver)
0
-        Merb.logger.info("#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ...")
0
-      rescue LoadError
0
-        # Failed requiring as a gem, let's try loading with a normal require.
0
-        require name
0
-      end
0
+      # Failed requiring as a gem, let's try loading with a normal require.
0
+      require name
0
     end
0
   end
0