Converted to Swift 2 and updated dependencies

Cartfile

@@ -1,4 +1 @@
-github "robrix/Madness" "significant-indentation"
-github "robrix/Either" ~> 1.1
-github "robrix/Box" ~> 1.0.1
-github "robrix/Prelude" ~> 1.4
+github "robrix/Madness" "master"

Cartfile.private

@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs"
-github "Quick/Quick" ~> 0.2.2
-github "Quick/Nimble" ~> 0.2
+github "Quick/Quick" ~> 0.8.0
+github "Quick/Nimble" ~> 3.0.0

Cartfile.resolved

@@ -1,7 +1,6 @@
-github "robrix/Box" "1.0.1"
-github "robrix/Either" "1.1"
-github "robrix/Madness" "b5e2882e924b2377da83adcdb59592ba7fdab52a"
-github "Quick/Nimble" "v0.2.0"
-github "robrix/Prelude" "1.4"
-github "Quick/Quick" "v0.2.2"
-github "jspahrsummers/xcconfigs" "0.7.1"
+github "Quick/Nimble" "v3.0.0"
+github "robrix/Prelude" "bd23a25d8c7c90a7a4b2505be65ad511c9d1db81"
+github "Quick/Quick" "v0.8.0"
+github "jspahrsummers/xcconfigs" "0.8.1"
+github "robrix/Either" "1.3.1"
+github "robrix/Madness" "d682f7854596dc01d1298446a8c49c8c70ffe5f8"

OGDL.xcodeproj/project.pbxproj

@@ -9,11 +9,9 @@
 /* Begin PBXBuildFile section */
 		D00F9CDB1A5DC12500B4851E /* OGDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CD01A5DC12500B4851E /* OGDL.framework */; };
 		D00F9CEA1A5DC1C900B4851E /* OGDL.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BBBFC01A5DBF26007913DA /* OGDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D00F9CEF1A5DC45D00B4851E /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEB1A5DC45D00B4851E /* Box.framework */; };
 		D00F9CF01A5DC45D00B4851E /* Either.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEC1A5DC45D00B4851E /* Either.framework */; };
 		D00F9CF11A5DC45D00B4851E /* Madness.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CED1A5DC45D00B4851E /* Madness.framework */; };
 		D00F9CF21A5DC45D00B4851E /* Prelude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEE1A5DC45D00B4851E /* Prelude.framework */; };
-		D00F9CF31A5DC47500B4851E /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEB1A5DC45D00B4851E /* Box.framework */; };
 		D00F9CF41A5DC47500B4851E /* Either.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEC1A5DC45D00B4851E /* Either.framework */; };
 		D00F9CF51A5DC47500B4851E /* Madness.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CED1A5DC45D00B4851E /* Madness.framework */; };
 		D00F9CF61A5DC47500B4851E /* Prelude.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00F9CEE1A5DC45D00B4851E /* Prelude.framework */; };
@@ -110,7 +108,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D00F9CEF1A5DC45D00B4851E /* Box.framework in Frameworks */,
 				D00F9CF01A5DC45D00B4851E /* Either.framework in Frameworks */,
 				D00F9CF11A5DC45D00B4851E /* Madness.framework in Frameworks */,
 				D00F9CF21A5DC45D00B4851E /* Prelude.framework in Frameworks */,
@@ -122,7 +119,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				D0BBBFC71A5DBF26007913DA /* OGDL.framework in Frameworks */,
-				D00F9CF31A5DC47500B4851E /* Box.framework in Frameworks */,
 				D00F9CF41A5DC47500B4851E /* Either.framework in Frameworks */,
 				D00F9CFD1A5DC51300B4851E /* Nimble.framework in Frameworks */,
 				D00F9CF51A5DC47500B4851E /* Madness.framework in Frameworks */,
@@ -364,6 +360,7 @@
 		D0BBBFB21A5DBF26007913DA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0710;
 				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {

OGDL.xcworkspace/xcshareddata/OGDL.xcscmblueprint

@@ -0,0 +1,77 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D01149946CBFB7F4D884E8659DC65D5DEB658A19",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "D01149946CBFB7F4D884E8659DC65D5DEB658A19" : 0,
+    "D5FA66743146831DA2A20C0EAE4583EF424D9041" : 0,
+    "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : 0,
+    "9A760A1EBAC1979D46EF016B1BE84D98E53C16FF" : 0,
+    "95438028B10BBB846574013D29F154A00556A9D1" : 0,
+    "E084C86B03F81D63323C9E7510697EA528A758C7" : 0,
+    "57C931977B7D2307CC013C2BD93F90CF7C676790" : 0,
+    "7FCD68358D0D5A67F26F2A5E7B31EB3EF0CB2C00" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "E83B8028-25D4-408D-B553-312799016D19",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "D01149946CBFB7F4D884E8659DC65D5DEB658A19" : "ogdl-swift\/",
+    "D5FA66743146831DA2A20C0EAE4583EF424D9041" : "ogdl-swift\/Carthage\/Checkouts\/Either\/",
+    "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : "ogdl-swift\/Carthage\/Checkouts\/Quick\/",
+    "9A760A1EBAC1979D46EF016B1BE84D98E53C16FF" : "ogdl-swift\/Carthage\/Checkouts\/Prelude\/",
+    "95438028B10BBB846574013D29F154A00556A9D1" : "ogdl-swift\/Carthage\/Checkouts\/Quick\/Externals\/Nimble\/",
+    "E084C86B03F81D63323C9E7510697EA528A758C7" : "ogdl-swift\/Carthage\/Checkouts\/xcconfigs\/",
+    "57C931977B7D2307CC013C2BD93F90CF7C676790" : "ogdl-swift\/Carthage\/Checkouts\/Box\/",
+    "7FCD68358D0D5A67F26F2A5E7B31EB3EF0CB2C00" : "ogdl-swift\/Carthage\/Checkouts\/Madness\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "OGDL",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "OGDL.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/robrix\/Box.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "57C931977B7D2307CC013C2BD93F90CF7C676790"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/robrix\/Madness.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7FCD68358D0D5A67F26F2A5E7B31EB3EF0CB2C00"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/robrix\/Prelude.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9A760A1EBAC1979D46EF016B1BE84D98E53C16FF"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/coenert\/ogdl-swift.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D01149946CBFB7F4D884E8659DC65D5DEB658A19"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Quick.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/robrix\/Either.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D5FA66743146831DA2A20C0EAE4583EF424D9041"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jspahrsummers\/xcconfigs.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E084C86B03F81D63323C9E7510697EA528A758C7"
+    }
+  ]
+}

OGDL/Graph.swift

@@ -37,7 +37,7 @@ extension Node: Hashable {
 	}
 }
 
-extension Node: Printable {
+extension Node: CustomStringConvertible {
 	public var description: String {
 		var string = ""
 		if value.rangeOfCharacterFromSet(NSCharacterSet.alphanumericCharacterSet().invertedSet) == nil {
@@ -47,8 +47,8 @@ extension Node: Printable {
 		}
 
 		if !children.isEmpty {
-			let childDescriptions = map(children) { $0.description }
-			string += " (" + join(", ", childDescriptions) + ")"
+			let childDescriptions = children.map { $0.description }
+			string += " (" + childDescriptions.joinWithSeparator(", ") + ")"
 		}
 
 		return string