summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-02-24 19:21:47 -0600
committerSamuel Giddins <segiddins@segiddins.me>2016-02-24 19:21:47 -0600
commit347c117793b4681416501e67ecb2c832709b37b4 (patch)
tree7ea995234e1bb9cf453398aebffcf110d1ba153c
parent825a6d9887385c9829567b0c25e760019949c3bf (diff)
downloadbundler-git-extension-rebuild.tar.gz
Ensure loaded_from is always set to a stringgit-extension-rebuild
-rw-r--r--lib/bundler.rb2
-rw-r--r--spec/bundler/bundler_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index a90bc5486d..2958e64cee 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -361,7 +361,7 @@ module Bundler
eval_gemspec(path, contents)
end
return unless spec
- spec.loaded_from = file
+ spec.loaded_from = path.expand_path.to_s
Bundler.rubygems.validate(spec) if validate
spec
end
diff --git a/spec/bundler/bundler_spec.rb b/spec/bundler/bundler_spec.rb
index 9b1cca5f12..84d2922f37 100644
--- a/spec/bundler/bundler_spec.rb
+++ b/spec/bundler/bundler_spec.rb
@@ -84,7 +84,7 @@ describe Bundler do
GEMSPEC
end
- expect(subject.loaded_from).to eq(app_gemspec_path)
+ expect(subject.loaded_from).to eq(app_gemspec_path.expand_path.to_s)
end
context "validate is true" do