diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/fetcher.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/ruby_dsl.rb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index dfadfc0631..afbecdd553 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -166,7 +166,7 @@ module Bundler agent = String.new("bundler/#{Bundler::VERSION}") agent << " rubygems/#{Gem::VERSION}" - agent << " ruby/#{ruby.versions}" + agent << " ruby/#{ruby.versions_string(ruby.versions)}" agent << " (#{ruby.host})" agent << " command/#{ARGV.first}" @@ -177,7 +177,7 @@ module Bundler rescue "???" end - agent << " #{ruby.engine}/#{engine_version}" + agent << " #{ruby.engine}/#{ruby.versions_string(engine_version)}" end agent << " options/#{Bundler.settings.all.join(",")}" diff --git a/lib/bundler/ruby_dsl.rb b/lib/bundler/ruby_dsl.rb index e1b9c3c3a1..a410b7f3d7 100644 --- a/lib/bundler/ruby_dsl.rb +++ b/lib/bundler/ruby_dsl.rb @@ -7,7 +7,10 @@ module Bundler raise GemfileError, "Please define :engine_version" if options[:engine] && options[:engine_version].nil? raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil? - raise GemfileEvalError, "ruby_version must match the :engine_version for MRI" if options[:engine] == "ruby" && options[:engine_version] && ruby_version != options[:engine_version] + if options[:engine] == "ruby" && options[:engine_version] && + ruby_version != Array(options[:engine_version]) + raise GemfileEvalError, "ruby_version must match the :engine_version for MRI" + end @ruby_version = RubyVersion.new(ruby_version, options[:patchlevel], options[:engine], options[:engine_version]) end end |