From 3d0fae46218a414af9db40454f496047c6df9992 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Wed, 16 Oct 2019 18:37:20 +0200 Subject: [PATCH 1/2] Fix `#match?` on `nil`. --- Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb index 1d97333267..68a2ea7e35 100644 --- a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb +++ b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb @@ -17,7 +17,7 @@ module RuboCop url_node = stanza.stanza_node.first_argument url = url_node.str_content - return unless url.match?(%r{^.+://[^/]+$}) + return unless url&.match?(%r{^.+://[^/]+$}) add_offense(url_node, location: :expression, message: format(MSG_NO_SLASH, url: url)) From 6cff8aff90df40dae95b92981272e8d7d2321a7b Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Wed, 16 Oct 2019 19:06:39 +0200 Subject: [PATCH 2/2] Fix cop for interpolated strings. --- .../Homebrew/rubocops/cask/homepage_url_trailing_slash.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb index 68a2ea7e35..220acaca83 100644 --- a/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb +++ b/Library/Homebrew/rubocops/cask/homepage_url_trailing_slash.rb @@ -15,7 +15,13 @@ module RuboCop def on_homepage_stanza(stanza) url_node = stanza.stanza_node.first_argument - url = url_node.str_content + + url = if url_node.dstr_type? + # Remove quotes from interpolated string. + url_node.source[1..-2] + else + url_node.str_content + end return unless url&.match?(%r{^.+://[^/]+$})