Update package

vmanot · Nov 23, 2024 · 8b0d696 · 8b0d696
1 parent 8c212a2
commit 8b0d696
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 18 deletions.
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ var package = Package(
             name: "Merge",
             targets: [
                 "CommandLineToolSupport",
-                "Shell",
+                "ShellScripting",
                 "SwiftDI",
                 "Merge"
             ]
@@ -36,46 +36,47 @@ var package = Package(
             ]
         ),
         .target(
-            name: "CommandLineToolSupport",
+            name: "Merge",
             dependencies: [
                 "Swallow",
+                .product(name: "SwallowMacrosClient", package: "Swallow"),
+                "SwiftDI"
             ],
-            path: "Sources/CommandLineToolSupport",
+            path: "Sources/Merge",
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
         ),
         .target(
-            name: "Merge",
+            name: "ShellScripting",
             dependencies: [
-                "CommandLineToolSupport",
-                "Swallow",
-                .product(name: "SwallowMacrosClient", package: "Swallow"),
-                "SwiftDI"
+                "Merge"
             ],
-            path: "Sources/Merge",
+            path: "Sources/ShellScripting",
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
         ),
         .target(
-            name: "Shell",
+            name: "CommandLineToolSupport",
             dependencies: [
-                "Merge"
+                "Merge",
+                "ShellScripting",
+                "Swallow",
             ],
-            path: "Sources/Shell",
+            path: "Sources/CommandLineToolSupport",
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
         ),
         .testTarget(
             name: "MergeTests",
             dependencies: [
+                "CommandLineToolSupport",
                 "Merge",
-                "Shell",
+                "ShellScripting",
             ],
             path: "Tests"
         )
-    ],
-    swiftLanguageVersions: [.v5]
+    ]
 )
diff --git a/Sources/CommandLineToolSupport/Intramodular/AnyCommandLineTool.swift b/Sources/CommandLineToolSupport/Intramodular/AnyCommandLineTool.swift
@@ -3,12 +3,30 @@
 //
 
 import Foundation
-import Swift
+import Merge
 
 open class AnyCommandLineTool {
     public var environmentVariables: [String: any CLT.EnvironmentVariableValue] = [:]
+    public var currentDirectoryURL: URL? = nil
 
     public init() {
 
     }
 }
+
+extension AnyCommandLineTool {
+    @discardableResult
+    public func withUnsafeSystemShell<R>(
+        perform operation: (SystemShell) async throws -> R
+    ) async throws -> R {
+        let shell = SystemShell(
+            environment: environmentVariables.mapValues({ String(describing: $0) }),
+            currentDirectoryURL: currentDirectoryURL,
+            options: [._forwardStdoutStderr]
+        )
+
+        let result: R = try await operation(shell)
+
+        return result
+    }
+}
diff --git a/Sources/Merge/module.swift b/Sources/Merge/module.swift
@@ -2,7 +2,6 @@
 // Copyright (c) Vatsal Manot
 //
 
-@_exported import CommandLineToolSupport
 @_exported import Diagnostics
 @_exported import Combine
 @_exported import Swallow

diff --git a/Sources/Shell/Intramodular/Process+sh.swift → ...llScripting/Intramodular/Process+sh.swift b/Sources/Shell/Intramodular/Process+sh.swift → ...llScripting/Intramodular/Process+sh.swift
@@ -9,6 +9,7 @@ import Merge
 internal import Swallow
 import Swift
 
+@available(*, deprecated)
 public func shq(
     _ cmd: String,
     arguments: [Process.ArgumentLiteral] = [],
@@ -24,6 +25,7 @@ public func shq(
     ._runSynchronously()
 }
 
+@available(*, deprecated)
 @_disfavoredOverload
 public func shq(
     _ cmd: String,
@@ -39,6 +41,7 @@ public func shq(
     )
 }
 
+@available(*, deprecated)
 public func shq(
     _ cmd: String,
     arguments: [String],
@@ -54,6 +57,7 @@ public func shq(
     .validate()
 }
 
+@available(*, deprecated)
 public func shq(
     _ cmd: String,
     arguments: [Process.ArgumentLiteral] = [],
@@ -69,6 +73,7 @@ public func shq(
     ._runAsynchronously()
 }
 
+@available(*, deprecated)
 @_disfavoredOverload
 public func shq(
     _ cmd: String,
@@ -84,6 +89,7 @@ public func shq(
     )
 }
 
+@available(*, deprecated)
 public func shq(
     _ cmd: String,
     arguments: [String],
@@ -99,6 +105,7 @@ public func shq(
     .validate()
 }
 
+@available(*, deprecated)
 public func shq<D: Decodable>(
     _ type: D.Type,
     decodedBy jsonDecoder: JSONDecoder = .init(),
@@ -116,6 +123,7 @@ public func shq<D: Decodable>(
     .decode(type, using: jsonDecoder)
 }
 
+@available(*, deprecated)
 public func shq<D: Decodable>(
     _ type: D.Type,
     decodedBy jsonDecoder: JSONDecoder = .init(),
@@ -132,6 +140,7 @@ public func shq<D: Decodable>(
     return try await process._runAsynchronously().stdout.decode(type, using: jsonDecoder)
 }
 
+@available(*, deprecated)
 @available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
 public func shq(
     _ sink: Process.StandardOutputSink,
@@ -148,6 +157,7 @@ public func shq(
     try process._runSynchronouslyRedirectingAllOutput(to: sink)
 }
 
+@available(*, deprecated)
 @available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
 public func shq(
     _ sink: Process.StandardOutputSink,

diff --git a/...l/Intramodular/Process-Initializers.swift → ...g/Intramodular/Process-Initializers.swift b/...l/Intramodular/Process-Initializers.swift → ...g/Intramodular/Process-Initializers.swift
diff --git a/Sources/Shell/module.swift → Sources/ShellScripting/module.swift b/Sources/Shell/module.swift → Sources/ShellScripting/module.swift
diff --git a/Tests/ProcessInitializerTests.swift b/Tests/ProcessInitializerTests.swift
@@ -2,7 +2,7 @@
 // Copyright (c) Vatsal Manot
 //
 
-@testable import Shell
+@testable import ShellScripting
 import XCTest
 
 class ShellProcessTests: XCTestCase {