Merge pull request #928 from MikeMcQuaid/requirements-rubocop

Fix Library/Homebrew/requirements RuboCop warnings

5 files changed, 7 insertions, 7 deletions

diff --git a/Library/Homebrew/requirements/emacs_requirement.rb b/Library/Homebrew/requirements/emacs_requirement.rb
index 591b7babb..737f57264 100644
--- a/Library/Homebrew/requirements/emacs_requirement.rb
+++ b/Library/Homebrew/requirements/emacs_requirement.rb
@@ -3,7 +3,7 @@ class EmacsRequirement < Requirement
   default_formula "emacs"
 
   def initialize(tags)
-    @version = tags.shift if /\d+\.*\d*/ === tags.first
+    @version = tags.shift if /\d+\.*\d*/ =~ tags.first
     super
   end
 
diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb
index 3c1eefe87..ff451c688 100644
--- a/Library/Homebrew/requirements/java_requirement.rb
+++ b/Library/Homebrew/requirements/java_requirement.rb
@@ -9,7 +9,7 @@ class JavaRequirement < Requirement
     next false unless File.executable? "/usr/libexec/java_home"
 
     args = %w[--failfast]
-    args << "--version" << "#{@version}" if @version
+    args << "--version" << @version.to_s if @version
     @java_home = Utils.popen_read("/usr/libexec/java_home", *args).chomp
     $?.success?
   end
@@ -27,7 +27,7 @@ class JavaRequirement < Requirement
   end
 
   def initialize(tags)
-    @version = tags.shift if /(\d\.)+\d/ === tags.first
+    @version = tags.shift if /(\d\.)+\d/ =~ tags.first
     super
   end
 
diff --git a/Library/Homebrew/requirements/perl_requirement.rb b/Library/Homebrew/requirements/perl_requirement.rb
index 0aac21610..6d7484175 100644
--- a/Library/Homebrew/requirements/perl_requirement.rb
+++ b/Library/Homebrew/requirements/perl_requirement.rb
@@ -3,7 +3,7 @@ class PerlRequirement < Requirement
   default_formula "perl"
 
   def initialize(tags)
-    @version = tags.shift if /^\d+\.\d+$/ === tags.first
+    @version = tags.shift if /^\d+\.\d+$/ =~ tags.first
     raise "PerlRequirement requires a version!" unless @version
     super
   end
diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb
index c445bd408..dd0039638 100644
--- a/Library/Homebrew/requirements/ruby_requirement.rb
+++ b/Library/Homebrew/requirements/ruby_requirement.rb
@@ -3,7 +3,7 @@ class RubyRequirement < Requirement
   default_formula "ruby"
 
   def initialize(tags)
-    @version = tags.shift if /(\d\.)+\d/ === tags.first
+    @version = tags.shift if /(\d\.)+\d/ =~ tags.first
     raise "RubyRequirement requires a version!" unless @version
     super
   end
diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb
index d91f9d3d4..6a320401a 100644
--- a/Library/Homebrew/requirements/x11_requirement.rb
+++ b/Library/Homebrew/requirements/x11_requirement.rb
@@ -12,7 +12,7 @@ class X11Requirement < Requirement
 
   def initialize(name = "x11", tags = [])
     @name = name
-    if /(\d\.)+\d/ === tags.first
+    if /(\d\.)+\d/ =~ tags.first
       @min_version = Version.create(tags.shift)
       @min_version_string = " #{@min_version}"
     else
@@ -33,7 +33,7 @@ class X11Requirement < Requirement
   end
 
   def <=>(other)
-    return unless X11Requirement === other
+    return unless other.is_a? X11Requirement
     min_version <=> other.min_version
   end