Avoid using shellcode env with pkgx (#1119)

Author: waliid

Demo/Sources/ContentLists/ContentListViewModel.swift

@@ -16,7 +16,7 @@ final class ContentListViewModel: ObservableObject, Refreshable {
     init() {
         $configuration
             .removeDuplicates()
-            .compactMap { $0 }
+            .compactMap(\.self)
             .map { [trigger] configuration in
                 Self.publisher(for: configuration, trigger: trigger)
             }

Gemfile.lock

@@ -10,20 +10,20 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1014.0)
-    aws-sdk-core (3.214.0)
+    aws-partitions (1.1040.0)
+    aws-sdk-core (3.216.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.174.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.178.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     badge (0.13.0)
@@ -62,17 +62,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -112,7 +112,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-badge (1.5.0)
       badge (~> 0.13.0)
@@ -157,12 +157,12 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.8.2)
-    jwt (2.9.3)
+    json (2.9.1)
+    jwt (2.10.1)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
@@ -173,18 +173,18 @@ GEM
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
     public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.9)
-    rouge (2.0.7)
+    rexml (3.4.0)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -213,8 +213,8 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -233,4 +233,4 @@ DEPENDENCIES
   fastlane-plugin-xcconfig
 
 BUNDLED WITH
-   2.5.23
+   2.6.3

Scripts/private/archive-demo.sh

@@ -11,8 +11,9 @@ function usage {
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +bundle
+    set -a
+    eval "$(pkgx +bundle)"
+    set +a
 }
 
 if [[ -z "$1" ]]; then

Scripts/private/deliver-demo.sh

@@ -11,8 +11,9 @@ function usage {
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +bundle +magick +rsvg-convert
+    set -a
+    eval "$(pkgx +bundle +magick +rsvg-convert)"
+    set +a
 }
 
 while getopts p:c: OPT; do

Scripts/private/fix-quality.sh

@@ -4,8 +4,9 @@ set -e
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +swiftlint
+    set -a
+    eval "$(pkgx +swiftlint)"
+    set +a
 }
 
 install_tools

Scripts/public/check-quality.sh

@@ -12,8 +12,9 @@ function usage {
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +swiftlint +shellcheck +markdownlint
+    set -a
+    eval "$(pkgx +swiftlint +shellcheck +markdownlint)"
+    set +a
 }
 
 while getopts c OPT; do

Scripts/public/clean-imports.sh

@@ -2,8 +2,9 @@
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +swiftlint
+    set -a
+    eval "$(pkgx +swiftlint)"
+    set +a
 }
 
 install_tools

Scripts/public/find-dead-code.sh

@@ -2,8 +2,9 @@
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +periphery
+    set -a
+    eval "$(pkgx +periphery)"
+    set +a
 }
 
 install_tools

Scripts/public/test-streams.sh

@@ -13,16 +13,6 @@ function serve_test_streams {
 
     kill_test_streams "$dest_dir"
 
-    if ! command -v python &> /dev/null; then
-        echo "python could not be found"
-        exit 1
-    fi
-
-    if ! command -v ffmpeg &> /dev/null; then
-        echo "ffmpeg could not be found"
-        exit 1
-    fi
-
     mkdir -p "$dest_dir"
     cp -R "$JSON_DIR" "$dest_dir"
 
@@ -136,8 +126,9 @@ function usage {
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +python +ffmpeg +packager
+    set -a
+    eval "$(pkgx +python +ffmpeg +packager)"
+    set +a
 }
 
 if [[ -z "$1" ]]; then

Scripts/public/test.sh

@@ -11,8 +11,9 @@ function usage {
 
 function install_tools {
     curl -Ssf https://pkgx.sh | sh &> /dev/null
-    eval "$(pkgx --shellcode)"
-    env +ruby +bundle +xcodes
+    set -a
+    eval "$(pkgx +ruby +bundle +xcodes)"
+    set +a
 }
 
 if [[ -z "$1" ]]; then

Sources/Circumspect/Expectations/ExpectAtLeastPublished.swift

@@ -163,7 +163,7 @@ public extension XCTestCase {
             file: file,
             line: line,
             while: executing
-        ).flatMap({ $0 }) else {
+        ).flatMap(\.self) else {
             XCTFail("Failed to publish enough values", file: file, line: line)
             return
         }

Sources/Core/Publisher.swift

@@ -25,7 +25,7 @@ public extension Publisher {
     /// ```
     func withPrevious() -> AnyPublisher<(previous: Output?, current: Output), Failure> {
         scan(Optional<(Output?, Output)>.none) { ($0?.1, $1) }
-            .compactMap { $0 }
+            .compactMap(\.self)
             .eraseToAnyPublisher()
     }
 

Sources/Player/Extensions/AVMediaSelectionGroup.swift

@@ -23,7 +23,7 @@ extension AVMediaSelectionGroup {
         }
         .merging(withOptions) { _, new in new }
         .values
-        .flatMap { $0 }
+        .flatMap(\.self)
     }
 
     /// Returns media selection options where options without the provided characteristics are preferred.
@@ -42,7 +42,7 @@ extension AVMediaSelectionGroup {
         }
         .merging(withoutOptions) { _, new in new }
         .values
-        .flatMap { $0 }
+        .flatMap(\.self)
     }
 
     static func sortedMediaSelectionOptions(from options: [AVMediaSelectionOption]) -> [AVMediaSelectionOption] {

Sources/Player/Publishers/AVAssetPublishers.swift

@@ -17,7 +17,7 @@ extension AVAsset {
             .map { characteristics, asset in
                 Publishers.MergeMany(characteristics.compactMap { characteristic in
                     asset.mediaSelectionGroupPublisher(for: characteristic)
-                        .compactMap { $0 }
+                        .compactMap(\.self)
                         .map { [characteristic: $0] }
                         .replaceError(with: [:])
                 })

Sources/Player/Publishers/AVPlayerItemPublishers.swift

@@ -148,7 +148,7 @@ extension AVPlayerItem {
 
     private func timebaseUpdateNotificationPublisher() -> AnyPublisher<Bool, Never> {
         publisher(for: \.timebase)
-            .compactMap { $0 }
+            .compactMap(\.self)
             .map { _ in false }
             .eraseToAnyPublisher()
     }
@@ -218,7 +218,7 @@ extension AVPlayerItem {
 
     func assetMetricEventPublisher() -> AnyPublisher<MetricEvent, Never> {
         publisher(for: \.isPlaybackLikelyToKeepUp)
-            .first { $0 }
+            .first(where: \.self)
             .measureDateInterval()
             .weakCapture(self)
             .map { dateInterval, item in

Sources/Player/Types/Chapter.swift

@@ -37,7 +37,7 @@ public struct Chapter: Equatable {
                 .init(identifier: .commonIdentifierAssetIdentifier, value: identifier),
                 .init(identifier: .commonIdentifierTitle, value: title),
                 .init(identifier: .commonIdentifierArtwork, value: artworkImage.pngData())
-            ].compactMap { $0 },
+            ].compactMap(\.self),
             timeRange: timeRange
         )
     }

Sources/Player/Types/PlayerMetadata.swift

@@ -65,7 +65,7 @@ public struct PlayerMetadata: Equatable {
             .init(identifier: .commonIdentifierDescription, value: description),
             .init(identifier: .commonIdentifierArtwork, value: artworkData),
             .init(identifier: .quickTimeUserDataCreationDate, value: episodeDescription)
-        ].compactMap { $0 }
+        ].compactMap(\.self)
     }
 
     var nowPlayingInfo: NowPlaying.Info {

Sources/Player/UserInterface/VisibilityTracker.swift

@@ -161,7 +161,7 @@ public final class VisibilityTracker: ObservableObject {
 
     private func voiceOverUnhidePublisher() -> AnyPublisher<Bool, Never> {
         voiceOverStatusPublisher()
-            .filter { $0 }
+            .filter(\.self)
             .map { _ in false }
             .eraseToAnyPublisher()
     }

Tests/CircumspectTests/PublishersTests.swift

@@ -101,14 +101,14 @@ final class PublisherTests: XCTestCase {
     func testCollectFirst() throws {
         let values = try waitForOutput(
             from: [1, 2, 3, 4, 5].publisher.collectFirst(3)
-        ).flatMap { $0 }
+        ).flatMap(\.self)
         expect(values).to(equal([1, 2, 3]))
     }
 
     func testCollectNext() throws {
         let values = try waitForOutput(
             from: [1, 2, 3, 4, 5].publisher.collectNext(3)
-        ).flatMap { $0 }
+        ).flatMap(\.self)
         expect(values).to(equal([2, 3, 4]))
     }
 }