summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-08-18 15:55:41 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-08-29 12:36:14 -0500
commit0849d4eb4248c5fa821ff211d51578f22e5604d5 (patch)
treec7f9b36e2019e98cbca81004c2e93bf049d42abc
parentf2d9d93b09a13aa812b16d27afb82a02995fc279 (diff)
downloadbundler-0849d4eb4248c5fa821ff211d51578f22e5604d5.tar.gz
Revert "[DSL] Infer ruby from .ruby-version"
This reverts commit c20815c7ddb6a882d946ba0ab53e745d2ea16989. # Conflicts: # lib/bundler/dsl.rb
-rw-r--r--lib/bundler/dsl.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index abfa1337ab..0f6098b27c 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -37,7 +37,6 @@ module Bundler
@gemfile = Pathname.new(gemfile)
contents ||= Bundler.read_file(gemfile.to_s)
instance_eval(contents, gemfile.to_s, 1)
- infer_ruby_version(gemfile)
rescue Exception => e
message = "There was an error " \
"#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
@@ -418,12 +417,6 @@ module Bundler
" end", true
end
- def infer_ruby_version(gemfile)
- return if @ruby_version
- ruby_version_path = gemfile.parent + ".ruby-version"
- ruby(ruby_version_path.read.strip) if ruby_version_path.file?
- end
-
class DSLError < GemfileError
# @return [String] the description that should be presented to the user.
#