[Get] Update getRepositoryVersion for SE-0135.

 - This also adds an end-to-end function test of the behavior.

Author: ddunbar

Sources/Get/RawClone.swift

@@ -32,6 +32,9 @@ class RawClone: Fetchable {
         if branch.hasPrefix("v") {
             branch = String(branch.characters.dropFirst())
         }
+        if branch.contains("@") {
+            branch = branch.components(separatedBy: "@").first!
+        }
         return Version(branch)
     }
 

Sources/TestSupport/misc.swift

@@ -109,6 +109,18 @@ public func tagGitRepo(_ dir: AbsolutePath, tag: String) throws {
     try systemQuietly([Git.tool, "-C", dir.asString, "tag", tag])
 }
 
+public func removeTagGitRepo(_ dir: AbsolutePath, tag: String) throws {
+    try systemQuietly([Git.tool, "-C", dir.asString, "tag", "-d", tag])
+}
+
+public func addGitRepo(_ dir: AbsolutePath, file path: RelativePath) throws {
+    try systemQuietly([Git.tool, "-C", dir.asString, "add", path.asString])
+}
+
+public func commitGitRepo(_ dir: AbsolutePath, message: String = "Test commit") throws {
+    try systemQuietly([Git.tool, "-C", dir.asString, "commit", "-m", message])
+}
+
 public enum Configuration {
     case Debug
     case Release
@@ -158,3 +170,16 @@ public func systemQuietly(_ args: [String]) throws {
 public func systemQuietly(_ args: String...) throws {
     try systemQuietly(args)
 }
+
+public extension FileSystem {
+    /// Write to a file from a stream producer.
+    //
+    // FIXME: This is copy-paste from Commands/init.swift, maybe it is reasonable to lift it to Basic?
+    mutating func writeFileContents(_ path: AbsolutePath, body: (OutputByteStream) -> ()) throws {
+        let contents = BufferedOutputByteStream()
+        body(contents)
+        try createDirectory(path.parentDirectory, recursive: true)
+        try writeFileContents(path, bytes: contents.bytes)
+    }
+}
+

Tests/FunctionalTests/DependencyResolutionTests.swift

@@ -9,11 +9,14 @@
 */
 
 import XCTest
-import TestSupport
+
 import Basic
+
 import func POSIX.popen
 
-class DependencyResolutionTestCase: XCTestCase {
+import TestSupport
+
+class DependencyResolutionTests: XCTestCase {
     func testInternalSimple() {
         fixture(name: "DependencyResolution/Internal/Simple") { prefix in
             XCTAssertBuilds(prefix)

Tests/FunctionalTests/ValidLayoutTests.swift

@@ -17,7 +17,7 @@ import Utility
 import func POSIX.rename
 import func POSIX.popen
 
-class ValidLayoutsTestCase: XCTestCase {
+class ValidLayoutsTests: XCTestCase {
 
     func testSingleModuleLibrary() {
         runLayoutFixture(name: "SingleModule/Library") { prefix in
@@ -113,7 +113,7 @@ class ValidLayoutsTestCase: XCTestCase {
 
 // MARK: Utility
 
-extension ValidLayoutsTestCase {
+extension ValidLayoutsTests {
     func runLayoutFixture(name: String, line: UInt = #line, body: (AbsolutePath) throws -> Void) {
         let name = "ValidLayouts/\(name)"
 

Tests/FunctionalTests/VersionSpecificTests.swift

@@ -0,0 +1,83 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+import XCTest
+
+import Basic
+import Utility
+
+import TestSupport
+
+class VersionSpecificTests: XCTestCase {
+    /// Functional tests of end-to-end support for version specific dependency resolution.
+    func testEndToEndResolution() throws {
+        mktmpdir { path in
+            var fs = localFileSystem
+        
+            // Create a repo for the dependency to test against.
+            let depPath = path.appending(component: "Dep")
+            try fs.createDirectory(depPath)
+            initGitRepo(depPath)
+        
+            // Create the initial version (works, but empty).
+            try fs.writeFileContents(depPath.appending(component: "Package.swift")) {
+                $0 <<< "import PackageDescription\n"
+                $0 <<< "let package = Package(name: \"Dep\")\n"
+            }
+            try addGitRepo(depPath, file: RelativePath("Package.swift"))
+            try commitGitRepo(depPath, message: "Initial v1.0.0")
+            try tagGitRepo(depPath, tag: "1.0.0")
+        
+            // Create the version to test against.
+            try fs.writeFileContents(depPath.appending(component: "Package.swift")) {
+                $0 <<< "NOT_A_VALID_PACKAGE"
+            }
+            try fs.writeFileContents(depPath.appending(component: "foo.swift")) {
+                $0 <<< "public func foo() { print(\"foo\\n\") }\n"
+            }
+            try addGitRepo(depPath, file: RelativePath("Package.swift"))
+            try addGitRepo(depPath, file: RelativePath("foo.swift"))
+            try commitGitRepo(depPath, message: "Bogus v1.1.0")
+            try tagGitRepo(depPath, tag: "1.1.0")
+
+            // Create the primary repository.
+            let primaryPath = path.appending(component: "Primary")
+            try fs.writeFileContents(primaryPath.appending(component: "Package.swift")) {
+                $0 <<< "import PackageDescription\n"
+                $0 <<< "let package = Package(name: \"Primary\", dependencies: [.Package(url: \"../Dep\", majorVersion: 1)])\n"
+            }
+            // This build should fail, because of the invalid package.
+            XCTAssertBuildFails(primaryPath)
+
+            // Create a file which requires a version 1.1.0 resolution.
+            try fs.writeFileContents(primaryPath.appending(component: "main.swift")) {
+                $0 <<< "import Dep\n"
+                $0 <<< "Dep.foo()\n"
+            }
+
+            // Create a version-specific tag, which should work.
+            try fs.writeFileContents(depPath.appending(component: "Package.swift")) {
+                $0 <<< "import PackageDescription\n"
+                $0 <<< "let package = Package(name: \"Dep\")\n"
+            }
+            try addGitRepo(depPath, file: RelativePath("Package.swift"))
+            try commitGitRepo(depPath, message: "OK v1.1.0")
+            try tagGitRepo(depPath, tag: "1.1.0@swift-\(Versioning.currentVersion.major)")
+
+            // The build should work now.
+            try removeFileTree(primaryPath.appending(component: "Packages"))
+            XCTAssertBuilds(primaryPath)
+        }
+    }
+
+    static var allTests = [
+        ("testEndToEndResolution", testEndToEndResolution),
+    ]
+}

Tests/FunctionalTests/XCTestManifests.swift

@@ -14,11 +14,12 @@ import XCTest
 public func allTests() -> [XCTestCaseEntry] {
     return [
         testCase(ClangModulesTestCase.allTests),
-        testCase(DependencyResolutionTestCase.allTests),
+        testCase(DependencyResolutionTests.allTests),
         testCase(MiscellaneousTestCase.allTests),
         testCase(ModuleMapsTestCase.allTests),
         testCase(SwiftPMXCTestHelperTests.allTests),
-        testCase(ValidLayoutsTestCase.allTests),
+        testCase(ValidLayoutsTests.allTests),
+        testCase(VersionSpecificTests.allTests),
     ]
 }
 #endif