archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 21:44:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c

Browse source 
This version contains the some style changes by RuboCop.

    * 9d810be0ed
    * 61ea98a727
    * 795893dce3
    * 9be7858f7f

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2019-02-14 12:59:03 +00:00
parent d1e6304a89
commit 4ae3df42f7
160 changed files with 1159 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/rubygems/request_set/gem_dependency_api.rb
View file

@ -43,11 +43,12 @@ class Gem::RequestSet::GemDependencyAPI
:mri_20 => %w[ruby],
:mri_21 => %w[ruby],
:rbx => %w[rbx],
:ruby => %w[ruby rbx maglev],
:ruby_18 => %w[ruby rbx maglev],
:ruby_19 => %w[ruby rbx maglev],
:ruby_20 => %w[ruby rbx maglev],
:ruby_21 => %w[ruby rbx maglev],
:truffleruby => %w[truffleruby],
:ruby => %w[ruby rbx maglev truffleruby],
:ruby_18 => %w[ruby rbx maglev truffleruby],
:ruby_19 => %w[ruby rbx maglev truffleruby],
:ruby_20 => %w[ruby rbx maglev truffleruby],
:ruby_21 => %w[ruby rbx maglev truffleruby],
}.freeze
mswin = Gem::Platform.new 'x86-mswin32'
@ -85,6 +86,7 @@ class Gem::RequestSet::GemDependencyAPI
:ruby_19 => Gem::Platform::RUBY,
:ruby_20 => Gem::Platform::RUBY,
:ruby_21 => Gem::Platform::RUBY,
:truffleruby => Gem::Platform::RUBY,
:x64_mingw => x64_mingw,
:x64_mingw_20 => x64_mingw,
:x64_mingw_21 => x64_mingw
@ -126,6 +128,7 @@ class Gem::RequestSet::GemDependencyAPI
:ruby_19 => tilde_gt_1_9_0,
:ruby_20 => tilde_gt_2_0_0,
:ruby_21 => tilde_gt_2_1_0,
:truffleruby => gt_eq_0,
:x64_mingw => gt_eq_0,
:x64_mingw_20 => tilde_gt_2_0_0,
:x64_mingw_21 => tilde_gt_2_1_0,
@ -440,7 +443,7 @@ Gem dependencies file #{@path} requires #{name} more than once.
Gem dependencies file #{@path} includes git reference for both ref and branch but only ref is used.
WARNING
end
if (ref||branch) && tag
if (ref || branch) && tag
warn <<-WARNING
Gem dependencies file #{@path} includes git reference for both ref/branch and tag but only ref/branch is used.
WARNING
@ -480,7 +483,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
def gem_group(name, options) # :nodoc:
g = options.delete :group
all_groups = g ? Array(g) : []
all_groups = g ? Array(g) : []
groups = options.delete :groups
all_groups |= groups if groups