From 7e42c5d08003fd38addbcd84af17df84e14a69b2 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 11 Sep 2016 17:42:43 +0100 Subject: [PATCH 1/5] requirements/emacs_requirement: fix Rubocop warnings. --- Library/Homebrew/requirements/emacs_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/emacs_requirement.rb b/Library/Homebrew/requirements/emacs_requirement.rb index 591b7babb1..737f572648 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 From fb0e121686fa5212362d701b1d0dfb705c56c5d6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 11 Sep 2016 17:42:44 +0100 Subject: [PATCH 2/5] requirements/java_requirement: fix Rubocop warnings. --- Library/Homebrew/requirements/java_requirement.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index 3c1eefe87d..ff451c6886 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 From dab681e71563b8d633d290f2f381a2101b56a3d8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 11 Sep 2016 17:42:44 +0100 Subject: [PATCH 3/5] requirements/perl_requirement: fix Rubocop warnings. --- Library/Homebrew/requirements/perl_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/perl_requirement.rb b/Library/Homebrew/requirements/perl_requirement.rb index 0aac216107..6d74841759 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 From 784e804fc23bbfa83a0104bb138f4802f8397d8a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 11 Sep 2016 17:42:44 +0100 Subject: [PATCH 4/5] requirements/ruby_requirement: fix Rubocop warnings. --- Library/Homebrew/requirements/ruby_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb index c445bd408a..dd00396386 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 From 5cba530eef15ece440be63adb4d625018c97badc Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 11 Sep 2016 17:42:44 +0100 Subject: [PATCH 5/5] requirements/x11_requirement: fix Rubocop warnings. --- Library/Homebrew/requirements/x11_requirement.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb index d91f9d3d43..6a320401a1 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