lib/bundler.rb in bundler-0.9.16 vs lib/bundler.rb in bundler-0.9.17

@@ -68,11 +68,11 @@
     def setup(*groups)
       load.setup(*groups)
     end
 
     def require(*groups)
-      load.require(*groups)
+      setup(*groups).require(*groups)
     end
 
     def load
       if current_env_file?
         SharedHelpers.gem_loaded = true
@@ -142,10 +142,10 @@
     def configure_gem_home_and_path
       if settings[:disable_shared_gems]
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
         ENV['GEM_PATH'] = ''
       else
-        paths = [Gem.dir, Gem.path].flatten.compact.reject{|p| p.empty? }
+        paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
       end
 
       Gem.clear_paths