support taps with custom urls

Author: danielmmetz

brew.go

@@ -139,18 +139,26 @@ func (t *Taps) UnmarshalJSON(b []byte) error {
 	}
 	seen := map[string]bool{}
 	for _, tap := range intermediary {
-		if seen[string(tap)] {
-			return fmt.Errorf("error: contains duplicate tap %s", string(tap))
+		if seen[tap.String()] {
+			return fmt.Errorf("error: contains duplicate tap %s", tap)
 		}
-		seen[string(tap)] = true
+		seen[tap.String()] = true
 	}
 	*t = intermediary
 	return nil
 }
 
-type Tap string
+type Tap struct {
+	Repo string `json:"repo"`
+	URL  string `json:"url"`
+}
 
-func (t Tap) String() string { return fmt.Sprintf(`tap "%s"`, string(t)) }
+func (t Tap) String() string {
+	if t.URL == "" {
+		return fmt.Sprintf(`tap "%s"`, t.Repo)
+	}
+	return fmt.Sprintf(`tap "%s", "%s"`, t.Repo, t.URL)
+}
 
 type Pkgs []Pkg
 

install.sh

@@ -27,7 +27,7 @@
 
 set -euo pipefail
 
-version=0.0.9  # TODO integrate with releases.
+version=0.0.10  # TODO integrate with releases.
 
 settle_base=$(pwd)
 

settle.yaml

@@ -10,12 +10,12 @@ files:
 
 brew:
   taps:
-    - homebrew/core
-    - homebrew/bundle
-    - homebrew/services
-    - homebrew/cask
-    - homebrew/cask-fonts
-    - homebrew/cask-versions
+    - repo: homebrew/core
+    - repo: homebrew/bundle
+    - repo: homebrew/services
+    - repo: homebrew/cask
+    - repo: homebrew/cask-fonts
+    - repo: homebrew/cask-versions
   pkgs:
     # core
     - name: age