1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Make RubyDsl a little easier to read; avoid a Hash sometimes

Browse Source 
https://github.com/rubygems/rubygems/commit/2dca83722b
This commit is contained in:
Martin Emde 2023-12-11 16:40:07 -08:00 committed by git
parent f466afa176
commit f671c5d179
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/bundler/ruby_dsl.rb
View File

@ -3,22 +3,28 @@
module Bundler module Bundler
module RubyDsl module RubyDsl
def ruby(*ruby_version) def ruby(*ruby_version)
options = ruby_version.last.is_a?(Hash) ? ruby_version.pop : {} options = ruby_version.pop if ruby_version.last.is_a?(Hash)
ruby_version.flatten! ruby_version.flatten!
raise GemfileError, "Please define :engine_version" if options[:engine] && options[:engine_version].nil? if options
raise GemfileError, "Please define :engine" if options[:engine_version] && options[:engine].nil? patchlevel = options[:patchlevel]
engine = options[:engine]
engine_version = options[:engine_version]
if options[:file] raise GemfileError, "Please define :engine_version" if engine && engine_version.nil?
raise GemfileError, "Do not pass version argument when using :file option" unless ruby_version.empty? raise GemfileError, "Please define :engine" if engine_version && engine.nil?
ruby_version << normalize_ruby_file(options[:file])
if options[:file]
raise GemfileError, "Do not pass version argument when using :file option" unless ruby_version.empty?
ruby_version << normalize_ruby_file(options[:file])
end
if engine == "ruby" && engine_version && ruby_version != Array(engine_version)
raise GemfileEvalError, "ruby_version must match the :engine_version for MRI"
end
end end
if options[:engine] == "ruby" && options[:engine_version] && @ruby_version = RubyVersion.new(ruby_version, patchlevel, engine, 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
# Support the various file formats found in .ruby-version files. # Support the various file formats found in .ruby-version files.