diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2016-07-10 11:13:20 -0300 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-07-14 22:32:53 -0500 |
| commit | fff8f9b2dffa61d23b579f41d191454e22f27949 (patch) | |
| tree | 990dfe95e75b88e7acfebce26dc5accd1397dcc2 | |
| parent | fb4532cea4f418671620f096a4816d80f2762153 (diff) | |
| download | bundler-fff8f9b2dffa61d23b579f41d191454e22f27949.tar.gz | |
[RuboCop] Fix offenses
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 81de3bfc21..716636e280 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -773,7 +773,7 @@ module Bundler def compute_requires dependencies.reduce({}) do |requires, dep| - next unless dep.should_include? + next requires unless dep.should_include? requires[dep.name] = Array(dep.autorequire || dep.name).each do |file| # Allow `require: true` as an alias for `require: <name>` file = dep.name if file == true diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 5fb3009241..84e37dbd82 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -479,7 +479,7 @@ module Bundler def redefine_method(klass, method, unbound_method = nil, &block) # puts "redefining #{klass} #{method} to #{unbound_method || block}" begin - if instance_method = klass.instance_method(method) and method != :initialize + if (instance_method = klass.instance_method(method)) && method != :initialize # doing this to ensure we also get private methods klass.send(:remove_method, method) end |