diff options
author | André Arko <mail@arko.net> | 2015-07-27 22:55:09 -0700 |
---|---|---|
committer | André Arko <mail@arko.net> | 2015-07-27 22:55:09 -0700 |
commit | 58b6757f601b3660ca6258b5afca0798ff1f7aea (patch) | |
tree | 42cc094a5fc26b96120539f6f1abf9c4820020ee | |
parent | 26c4665788cd2601211cc54935411b8227c2f132 (diff) | |
parent | 536a49644db2d14121fca246ad4f162d568c3eec (diff) | |
download | bundler-58b6757f601b3660ca6258b5afca0798ff1f7aea.tar.gz |
Merge pull request #3886 from esasse/rubocop-fix
Fix Style/AlignArray
-rw-r--r-- | .rubocop_todo.yml | 5 | ||||
-rw-r--r-- | lib/bundler/cli/platform.rb | 2 | ||||
-rw-r--r-- | lib/bundler/gem_helper.rb | 2 | ||||
-rw-r--r-- | lib/bundler/similarity_detector.rb | 2 | ||||
-rw-r--r-- | spec/bundler/gem_helper_spec.rb | 3 | ||||
-rw-r--r-- | spec/support/fakeweb/windows.rb | 6 |
6 files changed, 8 insertions, 12 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5c75718ca6..aaa30dad84 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -57,11 +57,6 @@ Metrics/PerceivedComplexity: Style/AccessorMethodName: Enabled: false -# Offense count: 3 -# Cop supports --auto-correct. -Style/AlignArray: - Enabled: false - # Offense count: 12 # Cop supports --auto-correct. # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles. diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb index 2c09faad3f..28641a4c8b 100644 --- a/lib/bundler/cli/platform.rb +++ b/lib/bundler/cli/platform.rb @@ -8,7 +8,7 @@ module Bundler def run platforms, ruby_version = Bundler.ui.silence do [Bundler.definition.platforms.map {|p| "* #{p}" }, - Bundler.definition.ruby_version] + Bundler.definition.ruby_version] end output = [] diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index de4b57eb37..33576bbdc8 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -52,7 +52,7 @@ module Bundler desc "Create tag #{version_tag} and build and push #{name}-#{version}.gem to Rubygems\n" \ "To prevent publishing in Rubygems use `gem_push=no rake release`" task "release", [:remote] => ["build", "release:guard_clean", - "release:source_control_push", "release:rubygem_push"] do + "release:source_control_push", "release:rubygem_push"] do end task "release:guard_clean" do diff --git a/lib/bundler/similarity_detector.rb b/lib/bundler/similarity_detector.rb index 26f69d30ce..0657192eda 100644 --- a/lib/bundler/similarity_detector.rb +++ b/lib/bundler/similarity_detector.rb @@ -49,7 +49,7 @@ module Bundler dm[i][j] = [ dm[i - 1][j - 1] + (this[j - 1] == that[i - 1] ? 0 : sub), - dm[i][j - 1] + ins, + dm[i][j - 1] + ins, dm[i - 1][j] + del ].min end diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb index e1496f47fe..ff41f04fb3 100644 --- a/spec/bundler/gem_helper_spec.rb +++ b/spec/bundler/gem_helper_spec.rb @@ -104,7 +104,8 @@ describe Bundler::GemHelper do context "defines Rake tasks" do let(:task_names) { %w[build install release - release:guard_clean release:source_control_push release:rubygem_push] } + release:guard_clean release:source_control_push + release:rubygem_push] } context "before installation" do it "raises an error with appropriate message" do diff --git a/spec/support/fakeweb/windows.rb b/spec/support/fakeweb/windows.rb index f8fe5f6e70..6ff9560d4a 100644 --- a/spec/support/fakeweb/windows.rb +++ b/spec/support/fakeweb/windows.rb @@ -2,9 +2,9 @@ require File.expand_path("../../path.rb", __FILE__) include Spec::Path files = ["specs.4.8.gz", - "prerelease_specs.4.8.gz", - "quick/Marshal.4.8/rcov-1.0-mswin32.gemspec.rz", - "gems/rcov-1.0-mswin32.gem"] + "prerelease_specs.4.8.gz", + "quick/Marshal.4.8/rcov-1.0-mswin32.gemspec.rz", + "gems/rcov-1.0-mswin32.gem"] # Set up pretend http gem server with FakeWeb $LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/fakeweb*/lib")].first}" |