Merge pull request #1362 from reitermarkus/rubocop

Update RuboCop to 0.45.0.

4 files changed, 22 insertions, 27 deletions

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 909dc4f94..a93c1ee1f 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -98,11 +98,12 @@ module SharedEnvExtension
   end
 
   def remove(keys, value)
+    return if value.nil?
     Array(keys).each do |key|
       next unless self[key]
       self[key] = self[key].sub(value, "")
       delete(key) if self[key].empty?
-    end if value
+    end
   end
 
   def cc
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 27dc95d29..14f9b81b8 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -11,9 +11,8 @@ module Stdenv
   DEFAULT_FLAGS = "-march=core2 -msse4".freeze
 
   def self.extended(base)
-    unless ORIGINAL_PATHS.include? HOMEBREW_PREFIX/"bin"
-      base.prepend_path "PATH", "#{HOMEBREW_PREFIX}/bin"
-    end
+    return if ORIGINAL_PATHS.include? HOMEBREW_PREFIX/"bin"
+    base.prepend_path "PATH", "#{HOMEBREW_PREFIX}/bin"
   end
 
   # @private
diff --git a/Library/Homebrew/extend/enumerable.rb b/Library/Homebrew/extend/enumerable.rb
deleted file mode 100644
index fededbfca..000000000
--- a/Library/Homebrew/extend/enumerable.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Enumerable
-  def flat_map
-    return to_enum(:flat_map) unless block_given?
-    r = []
-    each do |*args|
-      result = yield(*args)
-      result.respond_to?(:to_ary) ? r.concat(result) : r.push(result)
-    end
-    r
-  end unless method_defined?(:flat_map)
-end
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 3f73b6a1c..976ea7dd8 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -148,13 +148,17 @@ class Pathname
     open("a", *open_args) { |f| f.puts(content) }
   end
 
-  def binwrite(contents, *open_args)
-    open("wb", *open_args) { |f| f.write(contents) }
-  end unless method_defined?(:binwrite)
+  unless method_defined?(:binwrite)
+    def binwrite(contents, *open_args)
+      open("wb", *open_args) { |f| f.write(contents) }
+    end
+  end
 
-  def binread(*open_args)
-    open("rb", *open_args, &:read)
-  end unless method_defined?(:binread)
+  unless method_defined?(:binread)
+    def binread(*open_args)
+      open("rb", *open_args, &:read)
+    end
+  end
 
   # NOTE always overwrites
   def atomic_write(content)
@@ -353,13 +357,15 @@ class Pathname
     File.symlink(src.relative_path_from(dirname), self)
   end
 
-  def /(other)
-    unless other.respond_to?(:to_str) || other.respond_to?(:to_path)
-      opoo "Pathname#/ called on #{inspect} with #{other.inspect} as an argument"
-      puts "This behavior is deprecated, please pass either a String or a Pathname"
+  unless method_defined?(:/)
+    def /(other)
+      unless other.respond_to?(:to_str) || other.respond_to?(:to_path)
+        opoo "Pathname#/ called on #{inspect} with #{other.inspect} as an argument"
+        puts "This behavior is deprecated, please pass either a String or a Pathname"
+      end
+      self + other.to_s
     end
-    self + other.to_s
-  end unless method_defined?(:/)
+  end
 
   # @private
   def ensure_writable