Merge pull request #275 from mas-cli/formula-1.7

🍺Formula 1.7
2025-02-16 12:38:30 +00:00 · 2020-05-25 07:55:29 -06:00 · 2020-05-25 07:55:29 -06:00 · 6bf45a0cfe
commit 6bf45a0cfe
parent 35575ff962 99a845fafd
8 changed files with 44 additions and 20 deletions
--- a/Brewfile.lock.json
+++ b/Brewfile.lock.json
@ -44,10 +44,10 @@
  "system": {
    "macos": {
      "catalina": {
-        "HOMEBREW_VERSION": "2.2.17-96-g2e801c3",
+        "HOMEBREW_VERSION": "2.2.17-98-ge6dda52",
        "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "572fc56b93562aa2d07749e826f8b4ab6cc04090",
-        "CLT": "11.0.0.0.1.1567737322",
+        "Homebrew/homebrew-core": "ec60e3fbd262d27494278a6917509adf7c5ecab4",
+        "CLT": "11.5.0.0.1.1588476445",
        "Xcode": "11.5",
        "macOS": "10.15.4"
      }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  thanks, [@blochberger](https://github.com/blochberger)!
 - 🐟 Seriously more interactive fish completions #242  
  thanks, [@lwolfsonkin](https://github.com/lwolfsonkin)!
+  🍺Formula 1.7 #275
 - ⬆️ Nimble (8.0.9) #274
 - 🛠 Xcode 11.5 #273
 - 🧹 Purchase cleanup #272
--- a/Homebrew/mas-tap.rb
+++ b/Homebrew/mas-tap.rb
@ -2,18 +2,18 @@ class Mas < Formula
  desc "Mac App Store command-line interface"
  homepage "https://github.com/mas-cli/mas"
  url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.6.4",
-      :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
+      :tag      => "v1.7.0",
+      :revision => "35575ff962687cfd9a12f859668cf61d5ea819c2"
  head "https://github.com/mas-cli/mas.git"

  bottle do
    root_url "https://dl.bintray.com/phatblat/mas-bottles"
    cellar :any
-    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :catalina
-    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :mojave
-    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :high_sierra
-    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :sierra
-    sha256 "5ef426109d9c5be43a43621ea52bab6130aac836f4bec75d0d127fbc5526c26f" => :el_capitan
+    sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :catalina
+    sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :mojave
+    sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :high_sierra
+    sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :sierra
+    sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :el_capitan
  end

  depends_on "carthage" => :build
@ -30,7 +30,7 @@ class Mas < Formula
    EOS
    ENV["XCODE_XCCONFIG_FILE"] = xcconfig

-    # Only build necessary dependencies (Commandant, Result)
+    # Only build necessary dependencies
    system "carthage", "bootstrap", "--platform", "macOS", "Commandant"
    system "script/install", prefix

--- a/Homebrew/mas.rb
+++ b/Homebrew/mas.rb
@ -2,15 +2,14 @@ class Mas < Formula
  desc "Mac App Store command-line interface"
  homepage "https://github.com/mas-cli/mas"
  url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.6.4",
-      :revision => "4cfb3185b6c72ac4a67eaaf17f842cc1dacf27c7"
+      :tag      => "v1.7.0",
+      :revision => "35575ff962687cfd9a12f859668cf61d5ea819c2"
  head "https://github.com/mas-cli/mas.git"

  bottle do
    cellar :any
-    sha256 "2069b8c1c1a64c2fb91cc1c25ab9c9890c61f2182224b9e0605a35a151bb85bd" => :catalina
-    sha256 "3dd5a50b551a37c164c31375cc8498ba870e29e50086bd5c4c294bc26708a6d2" => :mojave
-    sha256 "a0d1e45203448c08420c3eab2d40ef957fd22c8e40fbeb067bc7bffe4f08dfe2" => :high_sierra
+    sha256 "b985d100947063ee94961f7f1290f232786634b869d20d56bd553197cf91188b" => :catalina
+    sha256 "c7005c34a3cf38d23f98e9cc238a0deae61f50ea5dfbcf51a34cc689a9db315e" => :mojave
  end

  depends_on "carthage" => :build
@ -27,7 +26,7 @@ class Mas < Formula
    EOS
    ENV["XCODE_XCCONFIG_FILE"] = xcconfig

-    # Only build necessary dependencies (Commandant, Result)
+    # Only build necessary dependencies
    system "carthage", "bootstrap", "--platform", "macOS", "Commandant"
    system "script/install", prefix

--- a/MasKit/AppStore/SSPurchase.swift
+++ b/MasKit/AppStore/SSPurchase.swift
@ -35,7 +35,7 @@ extension SSPurchase {

        buyParameters = parameters.map { key, value in
            return "\(key)=\(value)"
-            }.joined(separator: "&")
+        }.joined(separator: "&")

        itemIdentifier = adamId
        accountIdentifier = account.dsID
--- a/MasKit/ExternalCommands/OpenSystemCommand.swift
+++ b/MasKit/ExternalCommands/OpenSystemCommand.swift
@ -18,7 +18,7 @@ public struct OpenSystemCommand: ExternalCommand {

    public init(
        binaryPath: String = "/usr/bin/open"
-        ) {
+    ) {
        self.binaryPath = binaryPath
    }
 }
--- a/script/brew_formula_update
+++ b/script/brew_formula_update
@ -14,7 +14,7 @@ BREW_CORE_PATH="$(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Fo
 function usage {
    echo "Usage: brew_formula_bump [v1.0] [sha1_hash]"
    echo "- version will be inferred using version script if not provided"
-    echo "- sha will be inferred from the curreent commit if not provided"
+    echo "- sha will be inferred from the current commit if not provided"
    exit 1
 }

@ -32,6 +32,11 @@ else
    REVISION=$(git rev-parse HEAD)
 fi

+# Purge the Carthage cache to avoid this error from Homebrew sandboxing:
+# A shell task (/usr/bin/env git checkout --quiet --force 0.15.0 (launched in /Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant)) failed with exit code 128:
+# fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted
+rm -rf ~/Library/Caches/org.carthage.CarthageKit
+
 echo "Checking to see if this update can be a simple bump."
 diff "Homebrew/mas.rb" "$BREW_CORE_PATH/mas.rb"

--- a/script/brew_release_validate
+++ b/script/brew_release_validate
@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# script/brew_release_validate
+# mas
+#
+# Validates the mas formula
+# https://github.com/Homebrew/homebrew-core/blob/master/CONTRIBUTING.md#to-contribute-a-fix-to-the-foo-formula
+#
+
+# Purge the Carthage cache to avoid this error from Homebrew sandboxing:
+# A shell task (/usr/bin/env git checkout --quiet --force 0.15.0 (launched in /Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant)) failed with exit code 128:
+# fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted
+rm -rf ~/Library/Caches/org.carthage.CarthageKit
+
+brew uninstall --force mas
+brew install --build-from-source mas
+brew test mas
+brew audit --strict mas
+brew style mas