[WIP] Integrate Arbiter

.gitmodules

@@ -31,3 +31,6 @@
 [submodule "Carthage/Checkouts/Tentacle"]
 	path = Carthage/Checkouts/Tentacle
 	url = https://github.com/mdiep/Tentacle.git
+[submodule "Carthage/Checkouts/Arbiter"]
+	path = Carthage/Checkouts/Arbiter
+	url = https://github.com/ArbiterLib/Arbiter.git

Cartfile

@@ -3,3 +3,4 @@ github "Carthage/Commandant" ~> 0.10.1
 github "jdhealy/PrettyColors" ~> 4.0
 github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.2
 github "mdiep/Tentacle" ~> 0.4.1
+github "ArbiterLib/Arbiter" "multiple-dependents"

Cartfile.resolved

@@ -1,3 +1,4 @@
+github "ArbiterLib/Arbiter" "045a731fab5f609dad082d77549d314813d511f0"
 github "thoughtbot/Argo" "v3.1.0"
 github "thoughtbot/Curry" "v2.3.3"
 github "Quick/Nimble" "188caeb094bc342614d8a5c706cd8bb9a6c355eb"

Carthage.xcodeproj/project.pbxproj

@@ -55,6 +55,9 @@
 		D074EDC51A049283001DE082 /* FrameworkExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D074EDC41A049283001DE082 /* FrameworkExtensions.swift */; };
 		D095BA3C1A187D40007F15D6 /* Bootstrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D095BA3B1A187D40007F15D6 /* Bootstrap.swift */; };
 		D0A2025E1B114D1000C71375 /* ProducerQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A2025D1B114D1000C71375 /* ProducerQueue.swift */; };
+		D0A397201DA14C7100A0CECC /* Arbiter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0A3971F1DA14C7100A0CECC /* Arbiter.framework */; };
+		D0A397221DA14C8000A0CECC /* Arbiter.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = D0A3971F1DA14C7100A0CECC /* Arbiter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D0A397241DA14D7400A0CECC /* ArbiterBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0A397231DA14D7400A0CECC /* ArbiterBridge.swift */; };
 		D0AAAB4A19FAEDB4007B24B3 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AAAB4919FAEDB4007B24B3 /* Errors.swift */; };
 		D0AAAB5019FB0960007B24B3 /* CarthageKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D0D1216D19E87B05005E4BAA /* CarthageKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D0AAAB5519FB1062007B24B3 /* TestCartfile in Resources */ = {isa = PBXBuildFile; fileRef = D0AAAB5419FB1062007B24B3 /* TestCartfile */; };
@@ -139,6 +142,7 @@
 				67AFA98B1A79433900B7DA78 /* PrettyColors.framework in Copy Frameworks */,
 				D0F648831A4DD3EA00BCF808 /* Argo.framework in Copy Frameworks */,
 				D012AD111AF9844D00EE91DA /* Result.framework in Copy Frameworks */,
+				D0A397221DA14C8000A0CECC /* Arbiter.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -202,6 +206,8 @@
 		D074EDC41A049283001DE082 /* FrameworkExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameworkExtensions.swift; sourceTree = "<group>"; };
 		D095BA3B1A187D40007F15D6 /* Bootstrap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bootstrap.swift; sourceTree = "<group>"; };
 		D0A2025D1B114D1000C71375 /* ProducerQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProducerQueue.swift; sourceTree = "<group>"; };
+		D0A3971F1DA14C7100A0CECC /* Arbiter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Arbiter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D0A397231DA14D7400A0CECC /* ArbiterBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArbiterBridge.swift; sourceTree = "<group>"; };
 		D0AAAB4919FAEDB4007B24B3 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
 		D0AAAB5419FB1062007B24B3 /* TestCartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestCartfile; sourceTree = "<group>"; };
 		D0AAC23F1A14933100060F2E /* Update.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Update.swift; sourceTree = "<group>"; };
@@ -260,6 +266,7 @@
 				D01F8A3F19EA28C400643E7C /* ReactiveCocoa.framework in Frameworks */,
 				67AFA98A1A79430B00B7DA78 /* PrettyColors.framework in Frameworks */,
 				D0F648821A4DD3D900BCF808 /* Argo.framework in Frameworks */,
+				D0A397201DA14C7100A0CECC /* Arbiter.framework in Frameworks */,
 				D012AD101AF9843700EE91DA /* Result.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -432,6 +439,7 @@
 			children = (
 				D0D1217119E87B05005E4BAA /* CarthageKit.h */,
 				3A0472F21C782B4000097EC7 /* Algorithms.swift */,
+				D0A397231DA14D7400A0CECC /* ArbiterBridge.swift */,
 				D069CA231A4E3B2700314A85 /* Archive.swift */,
 				89E80E601C754FFD000F8DCB /* BuildArguments.swift */,
 				CDF9D3701CF1E54200DF5A6F /* BuildOptions.swift */,
@@ -463,6 +471,7 @@
 				D01F8A3E19EA28C400643E7C /* ReactiveCocoa.framework */,
 				D0E0E1AF1A2D28AC0097BE2B /* ReactiveTask.framework */,
 				BEB076651C8A1FD800ABD373 /* Tentacle.framework */,
+				D0A3971F1DA14C7100A0CECC /* Arbiter.framework */,
 				D0D1217019E87B05005E4BAA /* Info.plist */,
 			);
 			name = "Supporting Files";
@@ -731,6 +740,7 @@
 				D0DE89441A0F2D9B0030A3EC /* Scannable.swift in Sources */,
 				D01D82D71A10160700F0DD94 /* Resolver.swift in Sources */,
 				D074EDC51A049283001DE082 /* FrameworkExtensions.swift in Sources */,
+				D0A397241DA14D7400A0CECC /* ArbiterBridge.swift in Sources */,
 				88ED56D619ECE34900CBF5C4 /* Git.swift in Sources */,
 				D0D1219219E88B8F005E4BAA /* GitHub.swift in Sources */,
 				CDF9D3711CF1E54200DF5A6F /* BuildOptions.swift in Sources */,
@@ -805,7 +815,7 @@
 			buildSettings = {
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_VERSION = 2.3;
 			};
@@ -816,7 +826,7 @@
 			baseConfigurationReference = D0D1212819E878CC005E4BAA /* Release.xcconfig */;
 			buildSettings = {
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
@@ -888,7 +898,7 @@
 			baseConfigurationReference = D0D1212719E878CC005E4BAA /* Profile.xcconfig */;
 			buildSettings = {
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				SWIFT_VERSION = 2.3;
 			};
 			name = Profile;
@@ -929,7 +939,7 @@
 			baseConfigurationReference = D0D1212919E878CC005E4BAA /* Test.xcconfig */;
 			buildSettings = {
 				GCC_NO_COMMON_BLOCKS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				SWIFT_VERSION = 2.3;
 			};
 			name = Test;

Carthage.xcodeproj/xcshareddata/xcschemes/carthage.xcscheme

@@ -52,7 +52,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Source/CarthageKit/ArbiterBridge.swift

@@ -0,0 +1,153 @@
+import Arbiter
+
+// This file contains internal utilities for bridging between CarthageKit's
+// public API and the use of Arbiter as an implementation detail.
+//
+// Even though Arbiter may offer richer features in some cases, we avoid them
+// when necessary in favor of backwards compatibility for Carthage.
+
+/**
+ * Used to give identity to CarthageKit value types, so they can be associated
+ * with Arbiter data types.
+ */
+class ArbiterValueBox<T: Comparable where T: Hashable>: ArbiterValue, CustomStringConvertible {
+  init(_ value: T) {
+    self.unbox = value
+  }
+
+  let unbox: T
+
+  var hashValue: Int {
+    return unbox.hashValue
+  }
+
+  var description: String {
+    return "\(unbox)"
+  }
+}
+
+func ==<T: Equatable>(lhs: ArbiterValueBox<T>, rhs: ArbiterValueBox<T>) -> Bool {
+  return lhs.unbox == rhs.unbox
+}
+
+func <<T: Comparable>(lhs: ArbiterValueBox<T>, rhs: ArbiterValueBox<T>) -> Bool {
+  return lhs.unbox < rhs.unbox
+}
+
+/**
+ * Extends PinnedVersion with the requirements needed for ArbiterValueBox.
+ */
+extension PinnedVersion: Hashable, Comparable {
+  public var hashValue: Int {
+    return commitish.hashValue
+  }
+}
+
+public func <(lhs: PinnedVersion, rhs: PinnedVersion) -> Bool {
+  return lhs.commitish < rhs.commitish
+}
+
+extension ProjectIdentifier {
+  typealias ArbiterType = Arbiter.ProjectIdentifier<ArbiterValueBox<ProjectIdentifier>>
+
+  func toArbiter() -> ArbiterType {
+    return Arbiter.ProjectIdentifier(value: ArbiterValueBox(self))
+  }
+
+  static func fromArbiter(x: ArbiterType) -> ProjectIdentifier {
+    return x.value.unbox
+  }
+}
+
+extension SemanticVersion {
+  typealias ArbiterType = Arbiter.SemanticVersion
+
+  func toArbiter() -> ArbiterType {
+    return Arbiter.SemanticVersion(major: major, minor: minor, patch: patch)
+  }
+
+  static func fromArbiter(x: ArbiterType) -> SemanticVersion {
+    precondition(x.prereleaseVersion == nil)
+    precondition(x.buildMetadata == nil)
+
+    return SemanticVersion(major: x.major, minor: x.minor, patch: x.patch)
+  }
+}
+
+extension PinnedVersion {
+  typealias ArbiterType = Arbiter.SelectedVersion<ArbiterValueBox<PinnedVersion>>
+
+  func toArbiter() -> ArbiterType {
+    let semVer = try? SemanticVersion.fromPinnedVersion(self).dematerialize()
+    return Arbiter.SelectedVersion(semanticVersion: semVer?.toArbiter(), metadata: ArbiterValueBox(self))
+  }
+
+  static func fromArbiter(x: ArbiterType) -> PinnedVersion {
+    return x.metadata.unbox
+  }
+}
+
+extension VersionSpecifier {
+  typealias ArbiterType = Arbiter.Requirement
+
+  func toArbiter() -> ArbiterType {
+    switch self {
+    case .Any:
+      return Arbiter.Requirement(Specifier.Any)
+
+    case let .AtLeast(version):
+      return Arbiter.Requirement(Specifier.AtLeast(version.toArbiter()))
+
+    case let .CompatibleWith(version):
+      return Arbiter.Requirement(Specifier.CompatibleWith(version.toArbiter(), ArbiterRequirementStrictnessAllowVersionZeroPatches))
+
+    case let .Exactly(version):
+      return Arbiter.Requirement(Specifier.Exactly(version.toArbiter()))
+
+    case let .GitReference(commitish):
+      return Arbiter.Requirement(Specifier.Any)
+      /*
+      TODO: This needs a rework in Arbiter, because as written here, the requirement is never satisfied
+      (consider commitishes specified here, but which get expanded into full commit hashes during lookup)
+
+      let pinnedVersion = PinnedVersion(commitish)
+      let unversionedSpecifier = Specifier.Unversioned(ArbiterValueBox<PinnedVersion>(pinnedVersion).toUserValue())
+      return Arbiter.Requirement(Specifier.Prioritized(unversionedSpecifier, 10))
+      */
+    }
+  }
+}
+
+func dependencyToArbiter(dependency: Dependency<VersionSpecifier>) -> Arbiter.Dependency<ArbiterValueBox<ProjectIdentifier>> {
+  return Arbiter.Dependency(project: dependency.project.toArbiter(), requirement: dependency.version.toArbiter())
+}
+
+func dependencyToArbiter(dependency: Dependency<PinnedVersion>) -> Arbiter.ResolvedDependency<ArbiterValueBox<ProjectIdentifier>, ArbiterValueBox<PinnedVersion>> {
+  return Arbiter.ResolvedDependency(project: dependency.project.toArbiter(), version: dependency.version.toArbiter())
+}
+
+func dependencyFromArbiter(dependency: Arbiter.ResolvedDependency<ArbiterValueBox<ProjectIdentifier>, ArbiterValueBox<PinnedVersion>>) -> Dependency<PinnedVersion> {
+  let project = ProjectIdentifier.fromArbiter(dependency.project)
+  let version = PinnedVersion.fromArbiter(dependency.version)
+  return Dependency(project: project, version: version)
+}
+
+extension Cartfile {
+  typealias ArbiterType = Arbiter.DependencyList<ArbiterValueBox<ProjectIdentifier>>
+
+  func toArbiter() -> ArbiterType {
+    return Arbiter.DependencyList(dependencies.map(dependencyToArbiter))
+  }
+}
+
+extension ResolvedCartfile {
+  typealias ArbiterType = Arbiter.ResolvedDependencyGraph<ArbiterValueBox<ProjectIdentifier>, ArbiterValueBox<PinnedVersion>>
+
+  static func fromArbiter(x: ArbiterType) -> ResolvedCartfile {
+    let installer = Arbiter.ResolvedDependencyInstaller(graph: x)
+
+    return ResolvedCartfile(dependencies: installer.phases.flatMap { phase in
+      return phase.map(dependencyFromArbiter)
+    })
+  }
+}

Source/CarthageKit/Errors.swift

@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 Carthage. All rights reserved.
 //
 
+import Arbiter
 import Foundation
 import ReactiveCocoa
 import ReactiveTask
@@ -81,6 +82,8 @@ public enum CarthageError: ErrorType, Equatable {
 
 	/// An error occurred while shelling out.
 	case TaskError(ReactiveTask.TaskError)
+
+	case ResolverError(ArbiterError)
 }
 
 private func == (lhs: CarthageError.VersionRequirement, rhs: CarthageError.VersionRequirement) -> Bool {
@@ -138,6 +141,9 @@ public func == (lhs: CarthageError, rhs: CarthageError) -> Bool {
 	case let (.TaskError(left), .TaskError(right)):
 		return left == right
 
+	case let (.ResolverError(left), .ResolverError(right)):
+		return left.description == right.description
+
 	default:
 		return false
 	}
@@ -263,6 +269,9 @@ extension CarthageError: CustomStringConvertible {
 
 		case let .TaskError(taskError):
 			return taskError.description
+
+		case let .ResolverError(error):
+			return error.description
 		}
 	}
 }