Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e774b6cf5 | ||
|
|
8b371fa5d2 | ||
|
|
02fd579f19 | ||
|
|
e915bc0cfb | ||
|
|
f4c2c75aa1 | ||
|
|
dc7affa28c | ||
|
|
476cdc1461 | ||
|
|
a644208c62 | ||
|
|
d7a9819350 | ||
|
|
24a54c2ee0 | ||
|
|
3735ed4476 | ||
|
|
2880aa556b | ||
|
|
a125a871f5 | ||
|
|
d79844cf2b | ||
|
|
d0648411ea | ||
|
|
e74cc63271 |
28
.github/deploy
vendored
28
.github/deploy
vendored
@@ -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,17 +108,19 @@ 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.author = { '\(user.name)': '\(user.email)' }
|
||||
s.source = { git: "https://github.com/\(slug).git", tag: '\(tag)' }
|
||||
s.version = '\(tag)'
|
||||
s.summary = '\(repo.description)'
|
||||
s.license = '\(repo.license.spdx_id)'
|
||||
s.homepage = "https://github.com/\(slug)"
|
||||
s.social_media_url = 'https://twitter.com/\(owner)'
|
||||
s.osx.deployment_target = '10.10'
|
||||
s.ios.deployment_target = '8.0'
|
||||
@@ -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 = ""
|
||||
}
|
||||
|
||||
|
||||
11
.travis.yml
11
.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,12 +58,13 @@ 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
|
||||
install: swift test --generate-linuxmain
|
||||
script: git diff --exit-code
|
||||
osx_image: xcode10.2
|
||||
|
||||
- stage: deploy
|
||||
name: Jazzy
|
||||
@@ -80,4 +87,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
|
||||
|
||||
@@ -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")]
|
||||
)
|
||||
|
||||
@@ -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
|
||||
]
|
||||
@@ -53,7 +53,7 @@ help me continue my work, I appreciate it x
|
||||
<img src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" width="160">
|
||||
</a>
|
||||
|
||||
[Other donation/tipping options](http://mxcl.github.io/donate/)
|
||||
[Other donation/tipping options](http://mxcl.dev/#donate)
|
||||
|
||||
# Handbook
|
||||
|
||||
@@ -316,7 +316,7 @@ pursuit of getting it *right*)! We will tag 1.0 as soon as possible.
|
||||
|
||||
### Get push notifications for new releases
|
||||
|
||||
https://codebasesaga.com/canopy/
|
||||
https://mxcl.dev/canopy/
|
||||
|
||||
# Alternatives
|
||||
|
||||
@@ -328,7 +328,7 @@ https://codebasesaga.com/canopy/
|
||||
|
||||
[badge-platforms]: https://img.shields.io/badge/platforms-macOS%20%7C%20Linux%20%7C%20iOS%20%7C%20tvOS%20%7C%20watchOS-lightgrey.svg
|
||||
[badge-languages]: https://img.shields.io/badge/swift-4.2%20%7C%205.0-orange.svg
|
||||
[docs]: https://mxcl.github.io/Path.swift/Structs/Path.html
|
||||
[docs]: https://mxcl.dev/Path.swift/Structs/Path.html
|
||||
[badge-jazzy]: https://raw.githubusercontent.com/mxcl/Path.swift/gh-pages/badge.svg?sanitize=true
|
||||
[badge-codecov]: https://codecov.io/gh/mxcl/Path.swift/branch/master/graph/badge.svg
|
||||
[badge-ci]: https://travis-ci.com/mxcl/Path.swift.svg
|
||||
|
||||
@@ -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`
|
||||
|
||||
@@ -53,11 +53,25 @@ public struct Path: Equatable, Hashable, Comparable {
|
||||
- Note: On macOS, removes an initial component of “/private/var/automount”, “/var/automount”, or “/private” from the path, if the result still indicates an existing file or directory (checked by consulting the file system).
|
||||
- Returns: The path or `nil` if fed a relative path or a `~foo` string where there is no user `foo`.
|
||||
*/
|
||||
public init?(_ description: String) {
|
||||
public init?<S: StringProtocol>(_ description: S) {
|
||||
var pathComponents = description.split(separator: "/")
|
||||
switch description.first {
|
||||
case "/":
|
||||
break
|
||||
#if os(macOS)
|
||||
func ifExists(withPrefix prefix: String, removeFirst n: Int) {
|
||||
assert(prefix.split(separator: "/").count == n)
|
||||
|
||||
if description.hasPrefix(prefix), FileManager.default.fileExists(atPath: String(description)) {
|
||||
pathComponents.removeFirst(n)
|
||||
}
|
||||
}
|
||||
|
||||
ifExists(withPrefix: "/private/var/automount", removeFirst: 3)
|
||||
ifExists(withPrefix: "/var/automount", removeFirst: 2)
|
||||
ifExists(withPrefix: "/private", removeFirst: 1)
|
||||
#endif
|
||||
self.string = join_(prefix: "/", pathComponents: pathComponents)
|
||||
|
||||
case "~":
|
||||
if description == "~" {
|
||||
self = Path.home
|
||||
@@ -82,26 +96,11 @@ public struct Path: Equatable, Hashable, Comparable {
|
||||
#endif
|
||||
}
|
||||
pathComponents.remove(at: 0)
|
||||
pathComponents.insert(contentsOf: tilded.split(separator: "/"), at: 0)
|
||||
self.string = join_(prefix: tilded, pathComponents: pathComponents)
|
||||
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
|
||||
#if os(macOS)
|
||||
func ifExists(withPrefix prefix: String, removeFirst n: Int) {
|
||||
assert(prefix.split(separator: "/").count == n)
|
||||
|
||||
if description.hasPrefix(prefix), FileManager.default.fileExists(atPath: description) {
|
||||
pathComponents.removeFirst(n)
|
||||
}
|
||||
}
|
||||
|
||||
ifExists(withPrefix: "/private/var/automount", removeFirst: 3)
|
||||
ifExists(withPrefix: "/var/automount", removeFirst: 2)
|
||||
ifExists(withPrefix: "/private", removeFirst: 1)
|
||||
#endif
|
||||
|
||||
self.string = join_(prefix: "/", pathComponents: pathComponents)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -200,6 +199,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
|
||||
|
||||
/**
|
||||
|
||||
@@ -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,19 @@ class PathTests: XCTestCase {
|
||||
XCTAssertNil(Path("../foo"))
|
||||
XCTAssertNil(Path("./foo"))
|
||||
}
|
||||
|
||||
func testPathComponents() throws {
|
||||
XCTAssertEqual(Path.root.foo.bar.components, ["/", "foo", "bar"])
|
||||
XCTAssertEqual(Path.root.components, ["/"])
|
||||
}
|
||||
|
||||
func testFlatMap() throws {
|
||||
// testing compile works
|
||||
let foo: String? = "/a"
|
||||
_ = foo.flatMap(Path.init)
|
||||
let bar: Substring? = "/a"
|
||||
_ = bar.flatMap(Path.init)
|
||||
let baz: String.SubSequence? = "/a/b:1".split(separator: ":").first
|
||||
_ = baz.flatMap(Path.init)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
#if !canImport(ObjectiveC)
|
||||
import XCTest
|
||||
|
||||
extension PathTests {
|
||||
static let __allTests = [
|
||||
// DO NOT MODIFY: This is autogenerated, use:
|
||||
// `swift test --generate-linuxmain`
|
||||
// to regenerate.
|
||||
static let __allTests__PathTests = [
|
||||
("testBasename", testBasename),
|
||||
("testBundleExtensions", testBundleExtensions),
|
||||
("testCodable", testCodable),
|
||||
@@ -19,6 +23,7 @@ extension PathTests {
|
||||
("testFileHandleExtensions", testFileHandleExtensions),
|
||||
("testFileReference", testFileReference),
|
||||
("testFilesystemAttributes", testFilesystemAttributes),
|
||||
("testFlatMap", testFlatMap),
|
||||
("testInitializerForRelativePath", testInitializerForRelativePath),
|
||||
("testIsDirectory", testIsDirectory),
|
||||
("testJoin", testJoin),
|
||||
@@ -28,6 +33,7 @@ extension PathTests {
|
||||
("testMoveInto", testMoveInto),
|
||||
("testMoveTo", testMoveTo),
|
||||
("testNoUndesiredSymlinkResolution", testNoUndesiredSymlinkResolution),
|
||||
("testPathComponents", testPathComponents),
|
||||
("testReadlinkOnFileReturnsSelf", testReadlinkOnFileReturnsSelf),
|
||||
("testReadlinkOnNonExistantFileThrows", testReadlinkOnNonExistantFileThrows),
|
||||
("testReadlinkOnRelativeSymlink", testReadlinkOnRelativeSymlink),
|
||||
@@ -47,10 +53,9 @@ extension PathTests {
|
||||
]
|
||||
}
|
||||
|
||||
#if !os(macOS)
|
||||
public func __allTests() -> [XCTestCaseEntry] {
|
||||
return [
|
||||
testCase(PathTests.__allTests),
|
||||
testCase(PathTests.__allTests__PathTests),
|
||||
]
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user