summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-05-30 15:15:27 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-05-30 15:15:27 -0700
commit05af06c7cf223f7f6f91a77bfa9b3f60720a96d0 (patch)
treed372aa55ba8bcdfa3e40c103527b93b34a014715
parentd93b37e49266fd7adfd550f12295ac2593605085 (diff)
downloadbundler-05af06c7cf223f7f6f91a77bfa9b3f60720a96d0.tar.gz
[EndpointSpecification] Return local load paths
Needed for when inline has installed from this spec
-rw-r--r--lib/bundler/endpoint_specification.rb11
-rw-r--r--lib/bundler/inline.rb1
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/bundler/endpoint_specification.rb b/lib/bundler/endpoint_specification.rb
index 31365e5b42..bbbf3023a8 100644
--- a/lib/bundler/endpoint_specification.rb
+++ b/lib/bundler/endpoint_specification.rb
@@ -29,6 +29,17 @@ module Bundler
end
end
+ # needed for inline
+ def load_paths
+ if @remote_specification
+ @remote_specification.load_paths
+ elsif _local_specification
+ _local_specification.load_paths
+ else
+ super
+ end
+ end
+
# needed for binstubs
def executables
if @remote_specification
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index 99ee98db04..3eff45b4c4 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -51,7 +51,6 @@ def gemfile(install = false, &gemfile)
end
runtime = Bundler::Runtime.new(nil, definition)
- runtime.setup_environment
runtime.setup.require
bundler_module = class << Bundler; self; end