From 61d072a36c22bcb5d7c7f3562adf6bbfb93bd0b0 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Tue, 20 Jun 2023 00:37:14 +0100
Subject: [PATCH] fix(xbar/brew-updates): show installed cask version(s)
 correctly

The brew outdated command recently changed the "installed_versions"
field on casks from a string to an array, bringing it in line with
formula details.

This allows it to deal with either string or array values, and show them
correctly.
---
 xbar/brew-updates.1h.rb | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/xbar/brew-updates.1h.rb b/xbar/brew-updates.1h.rb
index d8f49eb..6d73d06 100755
--- a/xbar/brew-updates.1h.rb
+++ b/xbar/brew-updates.1h.rb
@@ -4,7 +4,7 @@
 # rubocop:disable Layout/LineLength
 
 # <xbar.title>Brew Updates</xbar.title>
-# <xbar.version>v2.6.2</xbar.version>
+# <xbar.version>v2.6.3</xbar.version>
 # <xbar.author>Jim Myhrberg</xbar.author>
 # <xbar.author.github>jimeh</xbar.author.github>
 # <xbar.desc>List and manage outdated Homebrew formulas and casks</xbar.desc>
@@ -254,13 +254,13 @@ module Brew
     end
   end
 
-  class Formula
+  class Package
     attr_reader :name, :installed_versions, :latest_version,
                 :pinned, :pinned_version
 
     def initialize(attributes = {})
       @name = attributes['name']
-      @installed_versions = attributes['installed_versions']
+      @installed_versions = Array(attributes['installed_versions'])
       @latest_version = attributes['current_version']
       @pinned = attributes['pinned']
       @pinned_version = attributes['pinned_version']
@@ -271,17 +271,8 @@ module Brew
     end
   end
 
-  class Cask
-    attr_reader :name, :installed_version, :latest_version
-
-    def initialize(attributes = {})
-      @name = attributes['name']
-      @installed_version = attributes['installed_versions']
-      @latest_version = attributes['current_version']
-    end
-
-    alias current_version installed_version
-  end
+  class Formula < Package; end
+  class Cask < Package; end
 
   class FormulaUpdates < Common
     prefix '🍻'
@@ -550,7 +541,7 @@ module Brew
             ] + post_commands
           )
           printer.sep
-          printer.item("→ Installed: #{cask.installed_version}")
+          printer.item("→ Installed: #{cask.installed_versions.join(', ')}")
           printer.item("↑ Latest: #{cask.latest_version}")
           printer.sep
           if upgrade_all_exclude?(cask.name)
@@ -636,11 +627,11 @@ module Brew
     end
 
     def all_formulas
-      @all_formulas ||= outdated['formulae'].map { |line| Formula.new(line) }
+      @all_formulas ||= outdated['formulae'].map { |f| Formula.new(f) }
     end
 
     def casks
-      @casks ||= outdated['casks'].map { |line| Cask.new(line) }
+      @casks ||= outdated['casks'].map { |c| Cask.new(c) }
     end
 
     def greedy_args