Accept packages with hyphens in their names

kevinbluer · Nov 20, 2015 · 0885f9d · 0885f9d
1 parent 240f9dd
commit 0885f9d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Sources/dep/Package.swift b/Sources/dep/Package.swift
@@ -36,17 +36,16 @@ public struct Package {
       - Note: Throws if the Package manifest will not parse.
      */
     public init?(path: String) throws {
-        let parts = path.basename.characters.split("-")
-
         // Packages are git clones
         guard let repo = Git.Repo(root: path) else { return nil }
 
         // Packages have origins
         guard let origin = repo.origin else { return nil }
 
         // Packages have dirnames of the form foo-X.Y.Z
-        guard parts.count == 2 else { return nil }
-        guard let version = Version(parts[1]) else { return nil }
+        let parts = path.basename.characters.split("-")
+        guard parts.count >= 2 else { return nil }
+        guard let version = Version(parts.last!) else { return nil }
 
         self.version = version
         self.manifest = try Manifest(path: Path.join(path, Manifest.filename), baseURL: origin)

diff --git a/Tests/dep/Fixtures/103-mattts-dealer/app/Package.swift b/Tests/dep/Fixtures/103-mattts-dealer/app/Package.swift
@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
     name: "Dealer",
     dependencies: [
-        .Package(url: "../DeckOfPlayingCards", versions: Version(1,1,0)..<Version(2,0,0)),
+        .Package(url: "../deck-of-playing-cards", versions: Version(1,1,0)..<Version(2,0,0)),
         .Package(url: "../PlayingCard", versions: Version(1,1,0)..<Version(2,0,0)),
         .Package(url: "../FisherYates", versions: Version(1,2,0)..<Version(2,0,0))
     ]

diff --git a/...s-dealer/DeckOfPlayingCards/Package.swift → ...ealer/deck-of-playing-cards/Package.swift b/...s-dealer/DeckOfPlayingCards/Package.swift → ...ealer/deck-of-playing-cards/Package.swift
diff --git a/...-dealer/DeckOfPlayingCards/src/Deck.swift → ...aler/deck-of-playing-cards/src/Deck.swift b/...-dealer/DeckOfPlayingCards/src/Deck.swift → ...aler/deck-of-playing-cards/src/Deck.swift