1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

[bundler/bundler] Enable Style/UnneededInterpolation cop

4c6a3c3cf7
This commit is contained in:
David Rodríguez 2019-07-23 19:19:31 +02:00 committed by Hiroshi SHIBATA
parent e84e63230b
commit 267a72be80
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2
9 changed files with 20 additions and 20 deletions

View file

@ -114,7 +114,7 @@ module Bundler
else else
Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n" Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
Bundler.settings.all.each do |setting| Bundler.settings.all.each do |setting|
Bundler.ui.confirm "#{setting}" Bundler.ui.confirm setting
show_pretty_values_for(setting) show_pretty_values_for(setting)
Bundler.ui.confirm "" Bundler.ui.confirm ""
end end

View file

@ -69,7 +69,7 @@ module Bundler
end end
def self.ruby_version def self.ruby_version
str = String.new("#{RUBY_VERSION}") str = String.new(RUBY_VERSION)
str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL str << "p#{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]" str << " (#{RUBY_RELEASE_DATE} revision #{RUBY_REVISION}) [#{RUBY_PLATFORM}]"
end end

View file

@ -309,7 +309,7 @@ module Bundler
rubyopt = [ENV["RUBYOPT"]].compact rubyopt = [ENV["RUBYOPT"]].compact
setup_require = "-r#{File.expand_path("setup", __dir__)}" setup_require = "-r#{File.expand_path("setup", __dir__)}"
return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/ return if !rubyopt.empty? && rubyopt.first =~ /#{setup_require}/
rubyopt.unshift %(#{setup_require}) rubyopt.unshift setup_require
Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ") Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ")
end end

View file

@ -230,7 +230,7 @@ RSpec.describe Bundler::Definition do
context "eager unlock" do context "eager unlock" do
let(:source_list) do let(:source_list) do
Bundler::SourceList.new.tap do |source_list| Bundler::SourceList.new.tap do |source_list|
source_list.global_rubygems_source = "#{file_uri_for(gem_repo4)}" source_list.global_rubygems_source = file_uri_for(gem_repo4)
end end
end end

View file

@ -58,7 +58,7 @@ RSpec.describe Bundler::Plugin::Installer do
end end
let(:result) do let(:result) do
installer.install(["ga-plugin"], :git => "#{file_uri_for(lib_path("ga-plugin"))}") installer.install(["ga-plugin"], :git => file_uri_for(lib_path("ga-plugin")))
end end
it "returns the installed spec after installing" do it "returns the installed spec after installing" do
@ -98,7 +98,7 @@ RSpec.describe Bundler::Plugin::Installer do
context "rubygems plugins" do context "rubygems plugins" do
let(:result) do let(:result) do
installer.install(["re-plugin"], :source => "#{file_uri_for(gem_repo2)}") installer.install(["re-plugin"], :source => file_uri_for(gem_repo2))
end end
it "returns the installed spec after installing " do it "returns the installed spec after installing " do
@ -113,7 +113,7 @@ RSpec.describe Bundler::Plugin::Installer do
context "multiple plugins" do context "multiple plugins" do
let(:result) do let(:result) do
installer.install(["re-plugin", "ma-plugin"], :source => "#{file_uri_for(gem_repo2)}") installer.install(["re-plugin", "ma-plugin"], :source => file_uri_for(gem_repo2))
end end
it "returns the installed spec after installing " do it "returns the installed spec after installing " do

View file

@ -74,7 +74,7 @@ RSpec.describe Bundler::SharedHelpers do
end end
context ".bundle is global .bundle" do context ".bundle is global .bundle" do
let(:global_rubygems_dir) { Pathname.new("#{bundled_app}") } let(:global_rubygems_dir) { Pathname.new(bundled_app) }
before do before do
Dir.mkdir ".bundle" Dir.mkdir ".bundle"

View file

@ -22,7 +22,7 @@ end
gem "foo", :git => '#{lib_path("foo-1.0")}' gem "foo", :git => '#{lib_path("foo-1.0")}'
G G
bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
@ -40,7 +40,7 @@ end
G G
bundle "install --path vendor/bundle" bundle "install --path vendor/bundle"
bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
@ -56,8 +56,8 @@ end
gem "foo", :git => '#{lib_path("foo-1.0")}' gem "foo", :git => '#{lib_path("foo-1.0")}'
G G
bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle! cmd, forgotten_command_line_options([:all, :cache_all] => true)
bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle! cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(out).to include "Updating files in vendor/cache" expect(out).to include "Updating files in vendor/cache"
FileUtils.rm_rf lib_path("foo-1.0") FileUtils.rm_rf lib_path("foo-1.0")
@ -72,7 +72,7 @@ end
gem "foo", :git => '#{lib_path("foo-1.0")}' gem "foo", :git => '#{lib_path("foo-1.0")}'
G G
bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
update_git "foo" do |s| update_git "foo" do |s|
s.write "lib/foo.rb", "puts :CACHE" s.write "lib/foo.rb", "puts :CACHE"
@ -82,7 +82,7 @@ end
expect(ref).not_to eq(old_ref) expect(ref).not_to eq(old_ref)
bundle! "update", :all => true bundle! "update", :all => true
bundle! "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle! cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
@ -129,7 +129,7 @@ end
bundle %(config set local.foo #{lib_path("foo-1.0")}) bundle %(config set local.foo #{lib_path("foo-1.0")})
bundle "install" bundle "install"
bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(bundled_app("vendor/cache/foo-invalid-#{ref}")).to exist expect(bundled_app("vendor/cache/foo-invalid-#{ref}")).to exist
@ -161,7 +161,7 @@ end
G G
ref = git.ref_for("master", 11) ref = git.ref_for("master", 11)
bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true) bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0")).to exist expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0")).to exist
@ -175,7 +175,7 @@ end
gem "foo", :git => '#{lib_path("foo-1.0")}' gem "foo", :git => '#{lib_path("foo-1.0")}'
G G
bundle "#{cmd}" bundle cmd
expect(err).to include("Your Gemfile contains path and git dependencies.") expect(err).to include("Your Gemfile contains path and git dependencies.")
end end

View file

@ -299,7 +299,7 @@ RSpec.describe "bundle exec" do
G G
rubylib = ENV["RUBYLIB"] rubylib = ENV["RUBYLIB"]
rubylib = "#{rubylib}".split(File::PATH_SEPARATOR).unshift "#{bundler_path}" rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift bundler_path
rubylib = rubylib.uniq.join(File::PATH_SEPARATOR) rubylib = rubylib.uniq.join(File::PATH_SEPARATOR)
bundle "exec 'echo $RUBYLIB'" bundle "exec 'echo $RUBYLIB'"

View file

@ -550,8 +550,8 @@ RSpec.describe "bundle install with gems on multiple sources" do
context "and the gemfile changes" do context "and the gemfile changes" do
it "is still able to find that gem from remote sources" do it "is still able to find that gem from remote sources" do
source_uri = "#{file_uri_for(gem_repo1)}" source_uri = file_uri_for(gem_repo1)
second_uri = "#{file_uri_for(gem_repo4)}" second_uri = file_uri_for(gem_repo4)
build_repo4 do build_repo4 do
build_gem "rack", "2.0.1.1.forked" build_gem "rack", "2.0.1.1.forked"