Merge pull request #43 from mxcl/Bundle.executable

Add Bundle.executable

.github/deploy

@@ -5,7 +5,7 @@ import PMKFoundation  // PromiseKit/Foundation ~> 3.3
 import LegibleError   // @mxcl ~> 1.0
 import Foundation
 import PromiseKit     // @mxcl ~> 6.8
-import Path           // mxcl/Path.swift == master
+import Path           // mxcl/Path.swift ~> 0.15
 
 let env = ProcessInfo.processInfo.environment
 let token = env["GITHUB_TOKEN"] ?? env["GITHUB_ACCESS_TOKEN"]!
@@ -17,13 +17,7 @@ func fatal(message: String) -> Never {
     exit(1)
 }
 func fatal(error: Error) -> Never {
-    fatal(message: error.legibleLocalizedDescription)
-}
-
-guard let licenseFile = try Path.cwd.ls().files.first(where: {
-    $0.basename().hasPrefix("LICENSE")
-})?.basename() else {
-    fatal(message: "no LICENSE file found")
+    fatal(message: "\(error.legibleLocalizedDescription)\n\n\(error.legibleDescription)")
 }
 
 struct Repo: Decodable {
@@ -114,15 +108,17 @@ var defaultSwiftVersion: String {
 
 func podspec(repo: Repo, user: User, pkg: Package) -> (Substring, String) {
     let (owner, name) = { ($0[0], $0[1]) }(slug.split(separator: "/"))
-    let swiftVersion = pkg.swiftLanguageVersions.max() ?? defaultSwiftVersion
-    let sources = pkg.targets.filter{ $0.type == .regular }.compactMap{ $0.path }.first!
+    let swiftVersion = pkg.swiftLanguageVersions.min() ?? defaultSwiftVersion
+    let targets = pkg.targets.filter{ $0.type == .regular }
+    guard targets.count == 1 else { fatal(message: "Too many targets for this script!") }
+    guard let sources = targets[0].path else { fatal(message: "Target has no path!") }
     return (name, """
     Pod::Spec.new do |s|
       s.name = '\(name)'
       s.version = '\(tag)'
       s.summary = '\(repo.description)'
       s.homepage = "https://github.com/\(slug)"
-      s.license = { type: '\(repo.license.spdx_id)', file: '\(licenseFile)' }
+      s.license = '\(repo.license.spdx_id)'
       s.author = { '\(user.name)': '\(user.email)' }
       s.source = { git: "https://github.com/\(slug).git", tag: '\(tag)' }
       s.social_media_url = 'https://twitter.com/\(owner)'
@@ -138,8 +134,8 @@ func podspec(repo: Repo, user: User, pkg: Package) -> (Substring, String) {
 
 func publishRelease() throws -> Promise<Void> {
     struct Input: Encodable {
-        var tag_name: String { return tag }
-        var name: String { return tag }
+        let tag_name = tag
+        let name = tag
         let body = ""
     }
 

.travis.yml

@@ -15,8 +15,12 @@ xcode_scheme: Path.swift-Package
 
 jobs:
   include:
+    - name: macOS / Swift 4.0.3
+      script: swift test --parallel -Xswiftc -swift-version -Xswiftc 4
+
     - name: macOS / Swift 4.2.1
       script: swift test --parallel
+
     - name: macOS / Swift 5.0
       osx_image: xcode10.2
       script: swift test --parallel
@@ -26,9 +30,11 @@ jobs:
       xcode_destination: platform=iOS Simulator,OS=latest,name=iPhone XS
       name: iOS / Swift 4.2.1
       after_success: bash <(curl -s https://codecov.io/bash)
+
     - <<: *xcodebuild
       xcode_destination: platform=tvOS Simulator,OS=latest,name=Apple TV
       name: tvOS / Swift 4.2.1
+
     - <<: *xcodebuild
       name: watchOS / Swift 4.2.1
       script: |
@@ -52,7 +58,7 @@ jobs:
 
     - <<: *linux
       env: SWIFT_VERSION='5.0-DEVELOPMENT-SNAPSHOT-2019-01-22-a'
-      name: Linux / Swift 5.0.0-dev+2019-01-22
+      name: Linux / Swift 5.0.0-dev+2019.01.22
 
     - stage: pretest
       name: Check Linux tests are sync’d
@@ -80,4 +86,4 @@ jobs:
       install: brew install mxcl/made/swift-sh
       before_script: .github/deploy generate-podspec
       script: pod trunk push
-      after_success: .github/deploy post-release
+      after_success: .github/deploy publish-release

Package.swift

@@ -1,7 +1,7 @@
 // swift-tools-version:4.2
 import PackageDescription
 
-let package = Package(
+let pkg = Package(
     name: "Path.swift",
     products: [
         .library(name: "Path", targets: ["Path"]),
@@ -9,5 +9,6 @@ let package = Package(
     targets: [
         .target(name: "Path", path: "Sources"),
         .testTarget(name: "PathTests", dependencies: ["Path"]),
-    ]
+    ],
+    swiftLanguageVersions: [.v4, .v4_2, .version("5")]
 )

Package@swift-5.0.swift

@@ -1,17 +0,0 @@
-// swift-tools-version:5.0
-import PackageDescription
-
-let pkg = Package(
-    name: "Path.swift",
-    products: [
-        .library(name: "Path", targets: ["Path"]),
-    ],
-    targets: [
-        .target(name: "Path", path: "Sources"),
-        .testTarget(name: "PathTests", dependencies: ["Path"]),
-    ]
-)
-
-pkg.swiftLanguageVersions = [
-    .v4_2, .v5
-]

Sources/Extensions.swift

@@ -34,6 +34,11 @@ public extension Bundle {
     var path: Path {
         return Path(string: bundlePath)
     }
+    
+    /// Returns the executable for this bundle, if there is one, not all bundles have one hence `Optional`.
+    var executable: Path? {
+        return executablePath.flatMap(Path.init)
+    }
 }
 
 /// Extensions on `String` that work with `Path` rather than `String` or `URL`

Sources/Path.swift

@@ -200,6 +200,15 @@ public struct Path: Equatable, Hashable, Comparable {
         }
     }
 
+    /**
+     Splits the string representation on the directory separator.
+     - Important: The first element is always "/" to be consistent with `NSString.pathComponents`.
+    */
+    @inlinable
+    public var components: [String] {
+        return ["/"] + string.split(separator: "/").map(String.init)
+    }
+
 //MARK: Pathing
 
     /**

Tests/PathTests/PathTests.swift

@@ -403,6 +403,7 @@ class PathTests: XCTestCase {
             XCTAssertEqual(bndl.privateFrameworks, tmpdir.Frameworks)
             XCTAssertEqual(bndl.resources, tmpdir)
             XCTAssertNil(bndl.path(forResource: "foo", ofType: "bar"))
+            XCTAssertNil(bndl.executable)
 
         #if os(macOS)
             XCTAssertEqual(bndl.defaultSharedFrameworksPath, tmpdir.Contents.Frameworks)
@@ -588,4 +589,9 @@ class PathTests: XCTestCase {
         XCTAssertNil(Path("../foo"))
         XCTAssertNil(Path("./foo"))
     }
+
+    func testPathComponents() throws {
+        XCTAssertEqual(Path.root.foo.bar.components, ["/", "foo", "bar"])
+        XCTAssertEqual(Path.root.components, ["/"])
+    }
 }

Tests/PathTests/XCTestManifests.swift

@@ -28,6 +28,7 @@ extension PathTests {
         ("testMoveInto", testMoveInto),
         ("testMoveTo", testMoveTo),
         ("testNoUndesiredSymlinkResolution", testNoUndesiredSymlinkResolution),
+        ("testPathComponents", testPathComponents),
         ("testReadlinkOnFileReturnsSelf", testReadlinkOnFileReturnsSelf),
         ("testReadlinkOnNonExistantFileThrows", testReadlinkOnNonExistantFileThrows),
         ("testReadlinkOnRelativeSymlink", testReadlinkOnRelativeSymlink),