diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-10-16 04:57:23 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-10-30 13:52:48 -0500 |
| commit | 4465ff11ba077239ef7a038e49efaddad5a4c511 (patch) | |
| tree | 67ccc9ee96394cedb22bcdc8cadf1a84bcac7a8d | |
| parent | bf9f327ad2272e54a64c49e6141153f8149639b4 (diff) | |
| download | bundler-4465ff11ba077239ef7a038e49efaddad5a4c511.tar.gz | |
Auto merge of #6102 - amatsuda:warnings, r=segiddins
Fix "assigned but unused variable" warning in Ruby 2.5
We're seeing several "assigned but unused variable" warnings when we run `bundle` in Ruby 2.5 with `RUBYOPT=-w`.
This is because Ruby 2.5's unused variable check has been improved since https://github.com/ruby/ruby/commit/37b04894f20a5d3701309a2055bfa03b9d760090, and [previous double-assignment technique](https://github.com/bundler/bundler/blob/fea177f61df71121c6f9422a74b093e42c504388/lib/bundler/installer.rb#L116) no longer works as an anti-warning workaround.
For example, here's a short reproducible code that doesn't warn in 2.4 but warns in 2.5:
```ruby
`def a() x = x = 1; end`
```
So here are updated workarounds against this warning, which are valid for both Ruby < 2.5 and >= 2.5.
(cherry picked from commit 3847fd5e9605c794fd1f6362029c57c466d3d77a)
| -rw-r--r-- | lib/bundler/installer.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index 2bb405bc7a..3633fbe776 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -113,9 +113,12 @@ module Bundler end # double-assignment to avoid warnings about variables that will be used by ERB - bin_path = bin_path = Bundler.bin_path - relative_gemfile_path = relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path) - ruby_command = ruby_command = Thor::Util.ruby_command + bin_path = Bundler.bin_path + bin_path = bin_path + relative_gemfile_path = Bundler.default_gemfile.relative_path_from(bin_path) + relative_gemfile_path = relative_gemfile_path + ruby_command = Thor::Util.ruby_command + ruby_command = ruby_command template_path = File.expand_path("../templates/Executable", __FILE__) if spec.name == "bundler" template_path += ".bundler" @@ -157,13 +160,16 @@ module Bundler unless path = Bundler.settings[:path] raise "Can't standalone without an explicit path set" end - standalone_path = standalone_path = Bundler.root.join(path).relative_path_from(bin_path) + standalone_path = Bundler.root.join(path).relative_path_from(bin_path) + standalone_path = standalone_path template = File.read(File.expand_path("../templates/Executable.standalone", __FILE__)) - ruby_command = ruby_command = Thor::Util.ruby_command + ruby_command = Thor::Util.ruby_command + ruby_command = ruby_command spec.executables.each do |executable| next if executable == "bundle" - executable_path = executable_path = Pathname(spec.full_gem_path).join(spec.bindir, executable).relative_path_from(bin_path) + executable_path = Pathname(spec.full_gem_path).join(spec.bindir, executable).relative_path_from(bin_path) + executable_path = executable_path File.open "#{bin_path}/#{executable}", "w", 0o755 do |f| f.puts ERB.new(template, nil, "-").result(binding) end |