diff options
author | Andre Arko <andre@arko.net> | 2015-07-18 14:17:58 -0600 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2015-07-18 14:17:58 -0600 |
commit | 53e03e3c03f3d86dafd5664253fffef7e95837ed (patch) | |
tree | a6943c13b0361d0678f205a68e5a83eb1da3e10e | |
parent | fca77995212cc240ffe6a75424aeeb6235100a32 (diff) | |
parent | b89a24ae42e04c653761e35e2e1383711e492b96 (diff) | |
download | bundler-53e03e3c03f3d86dafd5664253fffef7e95837ed.tar.gz |
Merge pull request #3852 from esasse/esasse-rubocop-7
Fix Style/SpaceBeforeComma
Conflicts:
.rubocop_todo.yml
spec/commands/open_spec.rb
-rw-r--r-- | .rubocop_todo.yml | 5 | ||||
-rw-r--r-- | spec/commands/binstubs_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/open_spec.rb | 4 | ||||
-rw-r--r-- | spec/commands/update_spec.rb | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5577ee960a..bb51e10b5f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -449,11 +449,6 @@ Style/SpaceAroundOperators: Style/SpaceBeforeBlockBraces: Enabled: false -# Offense count: 4 -# Cop supports --auto-correct. -Style/SpaceBeforeComma: - Enabled: false - # Offense count: 117 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters. diff --git a/spec/commands/binstubs_spec.rb b/spec/commands/binstubs_spec.rb index 422297e3ae..df5588fcf1 100644 --- a/spec/commands/binstubs_spec.rb +++ b/spec/commands/binstubs_spec.rb @@ -79,7 +79,7 @@ describe "bundle binstubs <gem>" do it "installs binstubs from path gems" do FileUtils.mkdir_p(lib_path("foo/bin")) FileUtils.touch(lib_path("foo/bin/foo")) - build_lib "foo" , "1.0", :path => lib_path("foo") do |s| + build_lib "foo", "1.0", :path => lib_path("foo") do |s| s.executables = %w(foo) end install_gemfile <<-G diff --git a/spec/commands/open_spec.rb b/spec/commands/open_spec.rb index b9d8274e52..f443cfe9d3 100644 --- a/spec/commands/open_spec.rb +++ b/spec/commands/open_spec.rb @@ -52,14 +52,14 @@ describe "bundle open" do end it "opens the gem with short words" do - bundle "open rec" , :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" } + bundle "open rec", :env => { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" } expect(out).to eq("bundler_editor #{default_bundle_path("gems", "activerecord-2.3.2")}") end it "select the gem from many match gems" do env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" } - bundle "open active" , :env => env do |input| + bundle "open active", :env => env do |input| input.puts "2" end diff --git a/spec/commands/update_spec.rb b/spec/commands/update_spec.rb index 2f3e41b67e..bcef27ad5b 100644 --- a/spec/commands/update_spec.rb +++ b/spec/commands/update_spec.rb @@ -125,7 +125,7 @@ describe "bundle update in more complicated situations" do G update_repo2 do - build_gem "thin" , "2.0" do |s| + build_gem "thin", "2.0" do |s| s.add_dependency "rack" end end |