summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-05-09 10:35:03 +0900
committerKoichi ITO <lol@wut.com>2017-05-28 17:23:34 +0900
commit6bfb49ef40cea035407ed01371a960c46c0ad09a (patch)
treee2cd512df9f7ac98f320f4ada927e510cffe8c97
parentc49ca61e05ceb45406f3eb04b63960873b610279 (diff)
downloadbundler-6bfb49ef40cea035407ed01371a960c46c0ad09a.tar.gz
[RuboCop] Update to 0.48.1
-rw-r--r--.rubocop_todo.yml28
-rw-r--r--Rakefile4
-rwxr-xr-xbin/rubocop2
3 files changed, 18 insertions, 16 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e9ec7c682b..f8d8cc2515 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,24 +1,26 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
-# on 2017-04-28 14:46:27 +0200 using RuboCop version 0.48.0.
+# on 2017-05-09 10:32:47 +0900 using RuboCop version 0.48.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
-# Offense count: 23
+# Offense count: 27
Lint/AmbiguousBlockAssociation:
Exclude:
+ - 'lib/bundler/capistrano.rb'
- 'lib/bundler/definition.rb'
+ - 'lib/bundler/installer/parallel_installer.rb'
- 'lib/bundler/resolver.rb'
- - 'lib/bundler/runtime.rb'
- - 'lib/bundler/source/path.rb'
- 'spec/bundler/compact_index_client/updater_spec.rb'
- 'spec/commands/init_spec.rb'
- 'spec/commands/install_spec.rb'
- 'spec/install/gems/flex_spec.rb'
- 'spec/lock/lockfile_spec.rb'
+ - 'spec/other/major_deprecation_spec.rb'
- 'spec/runtime/setup_spec.rb'
+ - 'spec/support/helpers.rb'
- 'spec/support/indexes.rb'
# Offense count: 2
@@ -72,12 +74,7 @@ Lint/UselessAssignment:
- 'lib/bundler/index.rb'
- 'lib/bundler/installer.rb'
-# Offense count: 456
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
- Max: 1048
-
-# Offense count: 2083
+# Offense count: 2079
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
@@ -161,7 +158,7 @@ Style/ConditionalAssignment:
- 'lib/bundler/source/git.rb'
- 'lib/bundler/source/rubygems.rb'
-# Offense count: 161
+# Offense count: 160
Style/Documentation:
Enabled: false
@@ -265,13 +262,12 @@ Style/MethodMissing:
- 'lib/bundler/remote_specification.rb'
- 'spec/support/builders.rb'
-# Offense count: 2
+# Offense count: 1
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: separated, grouped
Style/MixinGrouping:
Exclude:
- 'lib/bundler/spec_set.rb'
- - 'spec/runtime/setup_spec.rb'
# Offense count: 2
# Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -321,6 +317,12 @@ Style/NumericPredicate:
- 'lib/bundler/source/git/git_proxy.rb'
- 'lib/bundler/source/path.rb'
+# Offense count: 192
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+ Enabled: false
+
# Offense count: 9
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
# NamePrefix: is_, has_, have_
diff --git a/Rakefile b/Rakefile
index 5e6f421fae..5508ef8e6f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,7 +39,7 @@ namespace :spec do
deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
[d.name, d.requirement.to_s]
end]
- deps["rubocop"] ||= "= 0.48.0" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+ deps["rubocop"] ||= "= 0.48.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
# JRuby can't build ronn or rdiscount, so we skip that
if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@ -93,7 +93,7 @@ begin
if RUBY_VERSION >= "2.0.0"
# can't go in the gemspec because of the ruby version requirement
- gem "rubocop", "= 0.48.0"
+ gem "rubocop", "= 0.48.1"
require "rubocop/rake_task"
RuboCop::RakeTask.new
end
diff --git a/bin/rubocop b/bin/rubocop
index ab7285f421..c98433bb18 100755
--- a/bin/rubocop
+++ b/bin/rubocop
@@ -10,7 +10,7 @@ bundler_spec.dependencies.each do |dep|
gem dep.name, dep.requirement
end
-gem "rubocop", "= 0.48.0"
+gem "rubocop", "= 0.48.1"
Gem.finish_resolve if Gem.respond_to?(:finish_resolve)