summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-11-23 10:52:14 +0000
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-13 20:07:18 +0100
commit098d6d961f9828c099b40a7e31d8de653a16c44b (patch)
treed3a7bef430ac5b92c56e6f952af2d62686918a19
parentd2a122de2fbde44cc3e7774535c3bc641aaffdf7 (diff)
downloadbundler-098d6d961f9828c099b40a7e31d8de653a16c44b.tar.gz
Merge #7452
7452: Bump rubocop and rubocop-performance r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was not really a problem, but it's good to keep our dependencies up to date. ### What is your fix for the problem, implemented in this PR? My fix is to bump rubocop and rubocop-performance. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net> (cherry picked from commit 3e54fbc7b1e28e25eaac465a825cdd16facfe999)
-rw-r--r--.rubocop.yml24
-rw-r--r--spec/bundler/fetcher_spec.rb4
-rw-r--r--spec/support/rubygems_ext.rb4
3 files changed, 16 insertions, 16 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b43ff6dd88..99f84d8ef0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -183,15 +183,6 @@ Lint/UnderscorePrefixedVariableName:
Lint/UnifiedInteger:
Enabled: true
-Lint/UnneededCopDisableDirective:
- Enabled: true
-
-Lint/UnneededCopEnableDirective:
- Enabled: true
-
-Lint/UnneededSplatExpansion:
- Enabled: true
-
Lint/UnreachableCode:
Enabled: true
@@ -705,9 +696,18 @@ Style/RedundantBegin:
Style/RedundantConditional:
Enabled: true
+Lint/RedundantCopDisableDirective:
+ Enabled: true
+
+Lint/RedundantCopEnableDirective:
+ Enabled: true
+
Style/RedundantException:
Enabled: true
+Style/RedundantInterpolation:
+ Enabled: true
+
Style/RedundantParentheses:
Enabled: true
@@ -717,6 +717,9 @@ Style/RedundantSelf:
Style/RedundantSortBy:
Enabled: true
+Lint/RedundantSplatExpansion:
+ Enabled: true
+
Style/RegexpLiteral:
Enabled: true
@@ -798,9 +801,6 @@ Style/TrailingCommaInHashLiteral:
Style/TrailingMethodEndStatement:
Enabled: true
-Style/UnneededInterpolation:
- Enabled: true
-
Style/UnlessElse:
Enabled: true
diff --git a/spec/bundler/fetcher_spec.rb b/spec/bundler/fetcher_spec.rb
index 184b9efa64..9176eb32f0 100644
--- a/spec/bundler/fetcher_spec.rb
+++ b/spec/bundler/fetcher_spec.rb
@@ -144,14 +144,14 @@ RSpec.describe Bundler::Fetcher do
describe "include CI information" do
it "from one CI" do
with_env_vars("JENKINS_URL" => "foo") do
- ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
+ ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
expect(ci_part).to match("jenkins")
end
end
it "from many CI" do
with_env_vars("TRAVIS" => "foo", "CI_NAME" => "my_ci") do
- ci_part = fetcher.user_agent.split(" ").find {|x| x.match(%r{\Aci/}) }
+ ci_part = fetcher.user_agent.split(" ").find {|x| x.start_with?("ci/") }
expect(ci_part).to match("travis")
expect(ci_part).to match("my_ci")
end
diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index 74ac7f50c5..5bfcac5ac4 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -10,8 +10,8 @@ module Spec
"rake" => "~> 12.0",
"ronn" => "~> 0.7.3",
"rspec" => "~> 3.8",
- "rubocop" => "= 0.74.0",
- "rubocop-performance" => "= 1.4.0",
+ "rubocop" => "= 0.76.0",
+ "rubocop-performance" => "= 1.5.1",
}.freeze
DEPS = {