Fix regression when building paths with hyphens

Author: mxcl

Sources/dep/Package.swift

@@ -36,7 +36,7 @@ public struct Package {
       - Note: Throws if the Package manifest will not parse.
      */
     public init?(path: String) throws {
-        let parts = path.characters.split("-")
+        let parts = path.basename.characters.split("-")
 
         // Packages are git clones
         guard let repo = Git.Repo(root: path) else { return nil }

Tests/dep/Fixtures/103-mattts-dealer/DeckOfPlayingCards/Package.swift

@@ -0,0 +1,9 @@
+import PackageDescription
+
+let package = Package(
+    name: "DeckOfPlayingCards",
+    dependencies: [
+        .Package(url: "../PlayingCard", majorVersion: 1),
+        .Package(url: "../FisherYates", majorVersion: 1)
+    ]
+)

Tests/dep/Fixtures/103-mattts-dealer/DeckOfPlayingCards/src/Deck.swift

@@ -0,0 +1,50 @@
+import FisherYates
+import PlayingCard
+
+public struct Deck {
+    private var cards: [PlayingCard]
+
+    public static func standard52CardDeck() -> Deck {
+        let suits: [Suit] = [.Spades, .Hearts, .Diamonds, .Clubs]
+        let ranks: [Rank] = [.Ace, .Two, .Three, .Four, .Five, .Six, .Seven, .Eight, .Nine, .Ten, .Jack, .Queen, .King]
+
+        var cards: [PlayingCard] = []
+        for suit in suits {
+            for rank in ranks {
+                cards.append(PlayingCard(rank: rank, suit: suit))
+            }
+        }
+
+        return Deck(cards)
+    }
+
+    public init(_ cards: [PlayingCard]) {
+        self.cards = cards
+    }
+
+    public mutating func shuffle() {
+        cards.shuffleInPlace()
+    }
+
+    public mutating func deal() -> PlayingCard? {
+        guard !cards.isEmpty else { return nil }
+
+        return cards.removeLast()
+    }
+}
+
+// MARK: - ArrayLiteralConvertible
+
+extension Deck : ArrayLiteralConvertible {
+    public init(arrayLiteral elements: PlayingCard...) {
+        self.init(elements)
+    }
+}
+
+// MARK: - Equatable
+
+extension Deck : Equatable {}
+
+public func ==(lhs: Deck, rhs: Deck) -> Bool {
+    return lhs.cards == rhs.cards
+}

Tests/dep/Fixtures/103-mattts-dealer/FisherYates/Package.swift

@@ -0,0 +1,30 @@
+#if os(OSX) || os(iOS)
+import Darwin
+#else
+import Glibc
+#endif
+
+public extension CollectionType {
+    func shuffle() -> [Generator.Element] {
+        var array = Array(self)
+        array.shuffleInPlace()
+
+        return array
+    }
+}
+
+public extension MutableCollectionType where Index == Int {
+    mutating func shuffleInPlace() {
+        guard count > 1 else { return }
+
+        for i in 0..<count - 1 {
+#if os(OSX) || os(iOS)
+            let j = Int(arc4random_uniform(UInt32(count - i))) + i
+#else
+            let j = Int(g_random_int_range(0, Int32(count - i))) + i
+#endif
+            guard i != j else { continue }
+            swap(&self[i], &self[j])
+        }
+    }
+}

Tests/dep/Fixtures/103-mattts-dealer/FisherYates/src/Fisher-Yates_Shuffle.swift

@@ -0,0 +1,33 @@
+public struct PlayingCard {
+    let rank: Rank
+    let suit: Suit
+
+    public init(rank: Rank, suit: Suit) {
+        self.rank = rank
+        self.suit = suit
+    }
+}
+
+// MARK: - Equatable
+
+extension PlayingCard: Equatable {}
+
+public func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
+    return lhs.rank == rhs.rank && lhs.suit == rhs.suit
+}
+
+// MARK: - Comparable
+
+extension PlayingCard: Comparable {}
+
+public func <(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
+    return lhs.suit < rhs.suit || (lhs.suit == rhs.suit && lhs.rank < rhs.rank)
+}
+
+// MARK: - CustomStringConvertible
+
+extension PlayingCard : CustomStringConvertible {
+    public var description: String {
+        return "\(suit)\(rank)"
+    }
+}

Tests/dep/Fixtures/103-mattts-dealer/PlayingCard/Package.swift

@@ -0,0 +1,35 @@
+public enum Rank : Int {
+    case Ace = 1
+    case Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten
+    case Jack, Queen, King
+}
+
+// MARK: - Comparable
+
+extension Rank : Comparable {}
+
+public func <(lhs: Rank, rhs: Rank) -> Bool {
+    switch (lhs, rhs) {
+    case (_, _) where lhs == rhs:
+        return false
+    case (.Ace, _):
+        return false
+    default:
+        return lhs.rawValue < rhs.rawValue
+    }
+}
+
+// MARK: - CustomStringConvertible
+
+extension Rank : CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .Ace: return "A"
+        case .Jack: return "J"
+        case .Queen: return "Q"
+        case .King: return "K"
+        default:
+            return "\(rawValue)"
+        }
+    }
+}

Tests/dep/Fixtures/103-mattts-dealer/PlayingCard/src/PlayingCard.swift

@@ -0,0 +1,33 @@
+public enum Suit: String {
+    case Spades, Hearts, Diamonds, Clubs
+}
+
+// MARK: - Comparable
+
+extension Suit: Comparable {}
+
+public func <(lhs: Suit, rhs: Suit) -> Bool {
+    switch (lhs, rhs) {
+    case (_, _) where lhs == rhs:
+        return false
+    case (.Spades, _),
+    (.Hearts, .Diamonds), (.Hearts, .Clubs),
+    (.Diamonds, .Clubs):
+        return false
+    default:
+        return true
+    }
+}
+
+// MARK: - CustomStringConvertible
+
+extension Suit : CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .Spades: return "♠︎"
+        case .Hearts: return "♡"
+        case .Diamonds: return "♢"
+        case .Clubs: return "♣︎"
+        }
+    }
+}

Tests/dep/Fixtures/103-mattts-dealer/PlayingCard/src/Rank.swift

@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+    name: "Dealer",
+    dependencies: [
+        .Package(url: "../DeckOfPlayingCards", 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))
+    ]
+)

Tests/dep/Fixtures/103-mattts-dealer/PlayingCard/src/Suit.swift

@@ -0,0 +1,18 @@
+import FisherYates
+import PlayingCard
+import DeckOfPlayingCards
+
+let numberOfCards = 10
+
+var deck = Deck.standard52CardDeck()
+
+//deck.shuffle()  // no shuffle!
+
+for _ in 0..<numberOfCards {
+    guard let card = deck.deal() else {
+        print("No More Cards!")
+        break
+    }
+
+    print(card)
+}

Tests/dep/Fixtures/103-mattts-dealer/app/Package.swift

@@ -395,4 +395,10 @@ class FunctionalBuildTests: XCTestCase, XCTestCaseProvider {
             XCTAssertNotNil(try? executeSwiftBuild("\(prefix)/app"))
         }
     }
+
+    func testWhenThereAreHyphensInThePath() {
+        fixture(name: "103-mattts-dealer") { prefix in
+            XCTAssertNotNil(try? executeSwiftBuild("\(prefix)/app"))
+        }
+    }
 }