🔀 Merge 1.7.1 hotfix into master

.editorconfig

@@ -16,7 +16,7 @@ indent_size = 2
 indent_size = 2
 
 # Use 2 spaces for Ruby files
-[{Podfile,Rakefile,*.{rb,podspec}}]
+[{Podfile,Rakefile,script/*,*.{podspec,rb,yml}}]
 indent_size = 2
 indent_style = space
 max_line_length = 80

.gitignore

@@ -31,5 +31,6 @@ Pods/
 Temporary Items
 bin/
 build/
+default.profraw
 releases/
 xcuserdata

Brewfile.lock.json

@@ -65,9 +65,9 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "2.4.13-67-gf943af3",
+        "HOMEBREW_VERSION": "2.4.16-186-gd0e1595",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "5a20f3825ca6ff1b29bcf0aad050628adcd37065",
+        "Homebrew/homebrew-core": "642b748a2f1029ee2afb0188a5ced5d543be4456",
         "CLT": "1103.0.32.62",
         "Xcode": "11.6",
         "macOS": "10.15.6"

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 🐛 Fix alignment of 2nd column of list command output #298
 - ✨ `Makefile` #277
 
+## [v1.7.1] 🐛 Search JSON Fix - 2020-09-06
+
+- 🐛 Account for missing JSON fields in search results #299
+
 ## [v1.7.0] 🛍 Purchase Command - 2020-05-24
 
 - ✨ New `purchase` command for purchasing free apps #264 (resolves #2, #145)  
@@ -205,7 +209,8 @@ Use the `mas.pkg` package to install manually.
 
 - Initial Release
 
-[Unreleased]: https://github.com/mas-cli/mas/compare/v1.7.0...HEAD
+[Unreleased]: https://github.com/mas-cli/mas/compare/v1.7.1...HEAD
+[v1.7.1]: https://github.com/mas-cli/mas/compare/v1.7.0...v1.7.1
 [v1.7.0]: https://github.com/mas-cli/mas/compare/v1.6.4...v1.7.0
 [v1.6.4]: https://github.com/mas-cli/mas/compare/v1.6.3...v1.6.4
 [v1.6.3]: https://github.com/mas-cli/mas/compare/v1.6.2...v1.6.3

Cartfile.resolved

@@ -1,3 +1,3 @@
 github "Carthage/Commandant" "0.17.0"
-github "Quick/Nimble" "v8.0.9"
-github "Quick/Quick" "v2.2.0"
+github "Quick/Nimble" "v8.1.2"
+github "Quick/Quick" "v3.0.0"

Carthage/Checkouts/Nimble/.github/workflows/ci.yml

@@ -6,29 +6,41 @@ on:
       - master
   pull_request:
     branches:
-      - '*'
+      - "*"
 
 jobs:
+  cocoapods:
+    name: CocoaPods Lint
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: bundle install
+      - run: ./test podspec
+
   xcode:
     name: Xcode ${{ matrix.xcode }}
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [11, 11.1, 11.2]
+        xcode: [10.3, 11, 11.1, 11.2]
+      fail-fast: false
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
-    - run: ./test macos
-    - run: ./test ios
-    - run: ./test tvos
+      - uses: actions/checkout@v2
+      - run: ./test macos
+      - run: ./test ios
+      - run: ./test tvos
 
   swiftpm_darwin:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
-    runs-on: macOS-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         xcode: [11, 11.1, 11.2]
+      fail-fast: false
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
-    - uses: actions/checkout@v2
-    - run: sudo xcode-select -s '/Applications/Xcode_${{ matrix.xcode }}.app'
-    - run: ./test swiftpm
+      - uses: actions/checkout@v2
+      - run: ./test swiftpm

Carthage/Checkouts/Nimble/.travis.yml

@@ -6,12 +6,6 @@ branches:
 language: generic
 jobs:
   include:
-    - &cocoapods
-      name: CocoaPods Lint
-      os: osx
-      osx_image: xcode10.3
-      install: bundle install
-      script: ./test podspec
     - &xcode
       name: Xcode 10.1 / Swift 4.2
       os: osx
@@ -20,9 +14,6 @@ jobs:
         - ./test macos
         - ./test ios
         - ./test tvos
-    - <<: *xcode
-      name: Xcode 10.3 / Swift 5.0
-      osx_image: xcode10.3
     - &swiftpm_darwin
       name: SwiftPM / Darwin / Swift 4.2
       os: osx
@@ -49,13 +40,17 @@ jobs:
       env:
         - SWIFT_VERSION=5.1.5
     - <<: *swiftpm_linux
-      name: SwiftPM / Linux / Swift 5.2.2
+      name: SwiftPM / Linux / Swift 5.2.4
+      env:
+        - SWIFT_VERSION=5.2.4
+    - <<: *swiftpm_linux
+      name: SwiftPM / Linux / Swift 5.3 Development
       env:
-        - SWIFT_VERSION=5.2.2
+        - SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-05-19-a
     - <<: *swiftpm_linux
       name: SwiftPM / Linux / Swift Development
       env:
-        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-04-17-a
+        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-05-26-a
 install: true
 script:
   - ./test $TYPE

Carthage/Checkouts/Nimble/Gemfile.lock

@@ -1,65 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.11.1)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.3)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.7.1)
+    claide (1.0.3)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.1)
+      cocoapods-core (= 1.9.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.1)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.3)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
-    fourflusher (2.3.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.13.0)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    json (2.3.0)
+    minitest (5.14.1)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.16.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -73,4 +87,4 @@ DEPENDENCIES
   cocoapods (~> 1.7)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

Carthage/Checkouts/Nimble/Nimble.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Nimble"
-  s.version      = "8.0.9"
+  s.version      = "8.1.2"
   s.summary      = "A Matcher Framework for Swift and Objective-C"
   s.description  = <<-DESC
                    Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.

Carthage/Checkouts/Nimble/README.md

@@ -1186,7 +1186,7 @@ expect {
 let notificationCenter = NotificationCenter()
 expect {
     notificationCenter.postNotification(testNotification)
-}.to(postNotifications(equal([testNotification]), fromNotificationCenter: notificationCenter))
+}.to(postNotifications(equal([testNotification]), from: notificationCenter))
 ```
 
 > This matcher is only available in Swift.

Carthage/Checkouts/Nimble/Sources/Nimble/Matchers/PostNotification.swift

@@ -29,7 +29,7 @@ private let mainThread = pthread_self()
 
 public func postNotifications(
     _ predicate: Predicate<[Notification]>,
-    fromNotificationCenter center: NotificationCenter = .default
+    from center: NotificationCenter = .default
 ) -> Predicate<Any> {
     _ = mainThread // Force lazy-loading of this value
     let collector = NotificationCollector(notificationCenter: center)
@@ -66,12 +66,18 @@ public func postNotifications(
     }
 }
 
+@available(*, deprecated, renamed: "postNotifications(_:from:)")
+public func postNotifications(
+    _ predicate: Predicate<[Notification]>,
+    fromNotificationCenter center: NotificationCenter
+) -> Predicate<Any> {
+    return postNotifications(predicate, from: center)
+}
+
 public func postNotifications<T>(
     _ notificationsMatcher: T,
-    fromNotificationCenter center: NotificationCenter = .default)
-    -> Predicate<Any>
-    where T: Matcher, T.ValueType == [Notification]
-{
+    from center: NotificationCenter = .default
+)-> Predicate<Any> where T: Matcher, T.ValueType == [Notification] {
     _ = mainThread // Force lazy-loading of this value
     let collector = NotificationCollector(notificationCenter: center)
     collector.startObserving()
@@ -98,3 +104,11 @@ public func postNotifications<T>(
         return PredicateResult(bool: match, message: failureMessage.toExpectationMessage())
     }
 }
+
+@available(*, deprecated, renamed: "postNotifications(_:from:)")
+public func postNotifications<T>(
+    _ notificationsMatcher: T,
+    fromNotificationCenter center: NotificationCenter
+)-> Predicate<Any> where T: Matcher, T.ValueType == [Notification] {
+    return postNotifications(notificationsMatcher, from: center)
+}

Carthage/Checkouts/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m

@@ -6,7 +6,12 @@
 #import <Nimble/Nimble-Swift.h>
 #endif
 
-__attribute__((constructor))
-static void registerCurrentTestCaseTracker(void) {
+#pragma mark - Private
+
+@implementation XCTestObservationCenter (Register)
+
++ (void)load {
     [[XCTestObservationCenter sharedTestObservationCenter] addTestObserver:[CurrentTestCaseTracker sharedInstance]];
 }
+
+@end

Carthage/Checkouts/Nimble/Tests/NimbleTests/Matchers/PostNotificationTest.swift

@@ -9,14 +9,14 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
         expect {
             // no notifications here!
             return nil
-        }.to(postNotifications(beEmpty(), fromNotificationCenter: notificationCenter))
+        }.to(postNotifications(beEmpty()))
     }
 
     func testPassesWhenExpectedNotificationIsPosted() {
         let testNotification = Notification(name: Notification.Name("Foo"), object: nil)
         expect {
             self.notificationCenter.post(testNotification)
-        }.to(postNotifications(equal([testNotification]), fromNotificationCenter: notificationCenter))
+        }.to(postNotifications(equal([testNotification]), from: notificationCenter))
     }
 
     func testPassesWhenAllExpectedNotificationsArePosted() {
@@ -28,7 +28,7 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
             self.notificationCenter.post(n1)
             self.notificationCenter.post(n2)
             return nil
-        }.to(postNotifications(equal([n1, n2]), fromNotificationCenter: notificationCenter))
+        }.to(postNotifications(equal([n1, n2]), from: notificationCenter))
     }
 
     func testFailsWhenNoNotificationsArePosted() {
@@ -37,7 +37,7 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
             expect {
                 // no notifications here!
                 return nil
-            }.to(postNotifications(equal([testNotification]), fromNotificationCenter: self.notificationCenter))
+            }.to(postNotifications(equal([testNotification]), from: self.notificationCenter))
         }
     }
 
@@ -48,7 +48,7 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
             expect {
                 self.notificationCenter.post(n2)
                 return nil
-            }.to(postNotifications(equal([n1]), fromNotificationCenter: self.notificationCenter))
+            }.to(postNotifications(equal([n1]), from: self.notificationCenter))
         }
     }
 
@@ -59,7 +59,7 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
             expect {
                 self.notificationCenter.post(n2)
                 return nil
-            }.to(postNotifications(equal([n1]), fromNotificationCenter: self.notificationCenter))
+            }.to(postNotifications(equal([n1]), from: self.notificationCenter))
         }
     }
 
@@ -70,6 +70,6 @@ final class PostNotificationTest: XCTestCase, XCTestCaseProvider {
                 self.notificationCenter.post(testNotification)
             }
             return nil
-        }.toEventually(postNotifications(equal([testNotification]), fromNotificationCenter: notificationCenter))
+        }.toEventually(postNotifications(equal([testNotification]), from: notificationCenter))
     }
 }