From 4b87da4da963470a134b8d10844d17ca9d4a5c15 Mon Sep 17 00:00:00 2001
From: Seeker <meaningseeking@protonmail.com>
Date: Thu, 3 Sep 2020 20:09:56 -0700
Subject: [PATCH] Initial small fixes

- Skip blank lines in watchlist
- Initialize Livecheck#version as nil
- Simplify livecheck_version logic
- Make test a bit more understandable
---
 Library/Homebrew/dev-cmd/livecheck.rb   |  4 +++-
 Library/Homebrew/livecheck.rb           |  5 +++--
 Library/Homebrew/livecheck/livecheck.rb | 15 +++++----------
 Library/Homebrew/test/livecheck_spec.rb |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb
index e2ca9e1d8b..39c59fb77f 100644
--- a/Library/Homebrew/dev-cmd/livecheck.rb
+++ b/Library/Homebrew/dev-cmd/livecheck.rb
@@ -67,7 +67,9 @@ module Homebrew
       args.named.to_formulae_and_casks
     elsif File.exist?(WATCHLIST_PATH)
       begin
-        names = Pathname.new(WATCHLIST_PATH).read.lines.reject { |line| line.start_with?("#") }.map(&:strip)
+        names = Pathname.new(WATCHLIST_PATH).read.lines
+                        .reject { |line| line.start_with?("#") || line.blank? }
+                        .map(&:strip)
         CLI::NamedArgs.new(*names).to_formulae_and_casks
       rescue Errno::ENOENT => e
         onoe e
diff --git a/Library/Homebrew/livecheck.rb b/Library/Homebrew/livecheck.rb
index 52cd8a8dbb..7311cffe4c 100644
--- a/Library/Homebrew/livecheck.rb
+++ b/Library/Homebrew/livecheck.rb
@@ -20,6 +20,7 @@ class Livecheck
     @skip_msg = nil
     @strategy = nil
     @url = nil
+    @version = nil
   end
 
   # Sets the `@regex` instance variable to the provided `Regexp` or returns the
@@ -88,10 +89,10 @@ class Livecheck
     @url = case val
     when nil
       return @url
-    when :cask_url
-      @formula_or_cask.url.to_s
     when :appcast
       @formula_or_cask.appcast.to_s
+    when :cask_url
+      @formula_or_cask.url.to_s
     when :head, :stable
       @formula_or_cask.send(val).url
     when :homepage
diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
index 792af949ba..66af0adb32 100644
--- a/Library/Homebrew/livecheck/livecheck.rb
+++ b/Library/Homebrew/livecheck/livecheck.rb
@@ -115,9 +115,11 @@ module Homebrew
         # comparison.
         livecheck_version = formula_or_cask.livecheck.version
         current = if livecheck_version.is_a?(String)
-          livecheck_version
-        else
-          version = if formula
+          Version.new(livecheck_version)
+        elsif livecheck_version.is_a?(Array)
+          separator, method = livecheck_version
+          Version.new(formula_or_cask.version.to_s.split(separator, 2).try(method))
+        elsif formula
             if formula.head_only?
               formula.any_installed_version.version.commit
             else
@@ -125,13 +127,6 @@ module Homebrew
             end
           else
             Version.new(formula_or_cask.version)
-          end
-          if livecheck_version.is_a?(Array)
-            separator, method = livecheck_version
-            Version.new(version.to_s.split(separator, 2).try(method))
-          else
-            version
-          end
         end
 
         latest = if formula&.stable? || cask
diff --git a/Library/Homebrew/test/livecheck_spec.rb b/Library/Homebrew/test/livecheck_spec.rb
index 2352d44b50..e39af8afd1 100644
--- a/Library/Homebrew/test/livecheck_spec.rb
+++ b/Library/Homebrew/test/livecheck_spec.rb
@@ -113,8 +113,8 @@ describe Livecheck do
     end
 
     it "returns value if set" do
-      livecheckable.version("foo")
-      expect(livecheckable.version).to eq("foo")
+      livecheckable.version("1.2.3")
+      expect(livecheckable.version).to eq("1.2.3")
 
       livecheckable.version(:before_comma)
       expect(livecheckable.version).to eq([",", :first])