diff options
author | Homu <homu@barosl.com> | 2015-07-22 12:17:39 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2015-07-22 12:17:39 +0900 |
commit | 8d25615ab4c3b72d8d1154d32d5b65e268f16226 (patch) | |
tree | ac73b2a81f2afcb3cb4e6cae84fe1936eeb234a5 | |
parent | 492c87a7a4ba01aea72c3206b126c23a1c39167b (diff) | |
parent | fddf8ccaaae31eb08abe55792f1d9512cbe7ae8e (diff) | |
download | bundler-8d25615ab4c3b72d8d1154d32d5b65e268f16226.tar.gz |
Auto merge of #3869 - esasse:rubocop-fix, r=indirect
Fix Style/AccessModifierIndentation
The @indirect Style :smile:
-rw-r--r-- | .rubocop.yml | 3 | ||||
-rw-r--r-- | .rubocop_todo.yml | 6 | ||||
-rw-r--r-- | lib/bundler/cli.rb | 2 | ||||
-rw-r--r-- | lib/bundler/cli/gem.rb | 2 | ||||
-rw-r--r-- | lib/bundler/cli/show.rb | 2 | ||||
-rw-r--r-- | lib/bundler/dsl.rb | 2 | ||||
-rw-r--r-- | lib/bundler/gem_helper.rb | 2 | ||||
-rw-r--r-- | lib/bundler/graph.rb | 2 | ||||
-rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
-rw-r--r-- | lib/bundler/source/git.rb | 2 |
10 files changed, 11 insertions, 14 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index b4b986c64e..cc1c9f461b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,6 +18,9 @@ Lint/EndAlignment: # Style +Style/AccessModifierIndentation: + EnforcedStyle: outdent + Style/MultilineOperationIndentation: EnforcedStyle: indented diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index fc68e3065f..cc3636e380 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -58,12 +58,6 @@ Metrics/PerceivedComplexity: Performance/ReverseEach: Enabled: false -# Offense count: 38 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -Style/AccessModifierIndentation: - Enabled: false - # Offense count: 1 Style/AccessorMethodName: Enabled: false diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index 82359eb6cc..cd4eb10b0b 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -406,7 +406,7 @@ module Bundler Env.new.write($stdout) end - private + private # Automatically invoke `bundle install` and resume if # Bundler.settings[:auto_install] exists. This is set through config cmd diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb index dff8ce4848..cef64f27a8 100644 --- a/lib/bundler/cli/gem.rb +++ b/lib/bundler/cli/gem.rb @@ -134,7 +134,7 @@ module Bundler end end - private + private def resolve_name(name) SharedHelpers.pwd.join(name).basename.to_s diff --git a/lib/bundler/cli/show.rb b/lib/bundler/cli/show.rb index 7c72c8d38c..44b5894a61 100644 --- a/lib/bundler/cli/show.rb +++ b/lib/bundler/cli/show.rb @@ -53,7 +53,7 @@ module Bundler end end - private + private def fetch_latest_specs definition = Bundler.definition(true) diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 7928dcaa4b..03cec2d366 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -454,7 +454,7 @@ module Bundler end end - private + private def parse_line_number_from_description description = self.description diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index 28df1493a4..de4b57eb37 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -88,7 +88,7 @@ module Bundler Bundler.ui.confirm "#{name} (#{version}) installed." end - protected + protected def rubygem_push(path) if Pathname.new("~/.gem/credentials").expand_path.exist? diff --git a/lib/bundler/graph.rb b/lib/bundler/graph.rb index 3806751286..74a59c115b 100644 --- a/lib/bundler/graph.rb +++ b/lib/bundler/graph.rb @@ -26,7 +26,7 @@ module Bundler GraphVizClient.new(self).run end - private + private def _populate_relations parent_dependencies = _groups.values.to_set.flatten diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 14a33f5e46..435eccd1a2 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -236,7 +236,7 @@ module Bundler Bundler.ui.info ".", false end - private + private include Molinillo::SpecificationProvider diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index d4cd916b89..59ec639879 100644 --- a/lib/bundler/source/git.rb +++ b/lib/bundler/source/git.rb @@ -213,7 +213,7 @@ module Bundler @allow_remote || @allow_cached end - private + private def serialize_gemspecs_in(destination) expanded_path = destination.expand_path(Bundler.root) |