update to new names

Author: paulofaria

.gitmodules

@@ -1,15 +1,12 @@
-[submodule "Carthage/Checkouts/Luminescence"]
-	path = Carthage/Checkouts/Luminescence
-	url = https://github.com/Zewo/Luminescence.git
-[submodule "Carthage/Checkouts/Curvature"]
-	path = Carthage/Checkouts/Curvature
-	url = https://github.com/Zewo/Curvature.git
-[submodule "Carthage/Checkouts/Otherside"]
-	path = Carthage/Checkouts/Otherside
-	url = https://github.com/Zewo/Otherside.git
-[submodule "Carthage/Checkouts/Currents"]
-	path = Carthage/Checkouts/Currents
-	url = https://github.com/Zewo/Currents.git
-[submodule "Carthage/Checkouts/Kalopsia"]
-	path = Carthage/Checkouts/Kalopsia
-	url = https://github.com/Zewo/Kalopsia.git
+[submodule "HTTPParser"]
+	path = HTTPParser
+	url = https://github.com/Zewo/HTTPParser.git
+	branch = master
+[submodule "TCPIP"]
+	path = TCPIP
+	url = https://github.com/Zewo/TCPIP.git
+	branch = master
+[submodule "GrandCentralDispatch"]
+	path = GrandCentralDispatch
+	url = https://github.com/Zewo/GrandCentralDispatch.git
+	branch = master

Aeon.podspec

@@ -1,23 +1,20 @@
 Pod::Spec.new do |s|
   s.name = 'Aeon'
-  s.version = '0.2.1'
+  s.version = '0.3'
   s.license = 'MIT'
   s.summary = 'GCD based HTTP server for Swift 2 (Linux ready)'
   s.homepage = 'https://github.com/Zewo/Aeon'
   s.authors = { 'Paulo Faria' => '[email protected]' }
-  s.source = { :git => 'https://github.com/Zewo/Aeon.git', :tag => 'v0.2.1' }
+  s.source = { :git => 'https://github.com/Zewo/Aeon.git', :tag => s.version }
 
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.9'
 
-  s.source_files = 'Aeon/**/*.swift',
-                   'HTTPServerType/**/*.swift'
+  s.source_files = 'Aeon/**/*.swift'
 
-  s.dependency 'Currents', '0.2'
-  s.dependency 'Kalopsia', '0.2'
-  s.dependency 'Luminescence', '0.3'
-  s.dependency 'Curvature', '0.1'
-  s.dependency 'Otherside', '0.1'
+  s.dependency 'HTTPParser'
+  s.dependency 'GrandCentralDispatch'
+  s.dependency 'TCPIP'
 
   s.requires_arc = true
 end

Aeon.xcodeproj/project.pbxproj

@@ -4,20 +4,22 @@
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
-    "57932305D7AF3390B1D4C8A3D4D1FCFFE771843F" : 0,
+    "66FB12B2039D50DE5AF09A44F1172B3A2880CFB8" : 0,
     "45B7FEFFE2FB16A849776CE96605306C4D07DBEF" : 0,
-    "7926375CF48B2FF472FD622211E467ACFF61BE5A" : 0,
-    "8F96187C21DCA91FDCD88D25D8AF3DBCE89E0BCF" : 0,
     "ED0FE0EECA7970ABC2D434BB3DA7278322E3B02F" : 0,
+    "8F96187C21DCA91FDCD88D25D8AF3DBCE89E0BCF" : 0,
+    "7926375CF48B2FF472FD622211E467ACFF61BE5A" : 0,
+    "57932305D7AF3390B1D4C8A3D4D1FCFFE771843F" : 0,
     "D4199CF4A45E212E54A4CEE7E34326E0BC446862" : 0
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "27589DA4-6D84-4D61-BF7A-B9C142F226F5",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "57932305D7AF3390B1D4C8A3D4D1FCFFE771843F" : "Aeon\/Carthage\/Checkouts\/Luminescence\/",
+    "66FB12B2039D50DE5AF09A44F1172B3A2880CFB8" : "Aeon\/HTTPParser\/HTTP\/URI\/",
     "45B7FEFFE2FB16A849776CE96605306C4D07DBEF" : "Aeon\/Carthage\/Checkouts\/Kalopsia\/",
-    "7926375CF48B2FF472FD622211E467ACFF61BE5A" : "Aeon\/Carthage\/Checkouts\/Otherside\/",
-    "8F96187C21DCA91FDCD88D25D8AF3DBCE89E0BCF" : "Aeon\/",
     "ED0FE0EECA7970ABC2D434BB3DA7278322E3B02F" : "Aeon\/Carthage\/Checkouts\/Currents\/",
+    "8F96187C21DCA91FDCD88D25D8AF3DBCE89E0BCF" : "Aeon\/",
+    "7926375CF48B2FF472FD622211E467ACFF61BE5A" : "Aeon\/Carthage\/Checkouts\/Otherside\/",
+    "57932305D7AF3390B1D4C8A3D4D1FCFFE771843F" : "Aeon\/Carthage\/Checkouts\/Luminescence\/",
     "D4199CF4A45E212E54A4CEE7E34326E0BC446862" : "Aeon\/Carthage\/Checkouts\/Curvature\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Aeon",
@@ -34,6 +36,11 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "57932305D7AF3390B1D4C8A3D4D1FCFFE771843F"
     },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/URI.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "66FB12B2039D50DE5AF09A44F1172B3A2880CFB8"
+    },
     {
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Zewo\/Otherside.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

Aeon.xcodeproj/project.xcworkspace/xcshareddata/Aeon.xcscmblueprint

@@ -22,8 +22,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Curvature
-import Luminescence
+import HTTP
+import HTTPParser
 
 struct HTTPParser: HTTPRequestParserType {
     func parseRequest(client: TCPStreamType, completion: (request: HTTPRequest?, error: ErrorType?) -> Void) {

Aeon/HTTPParser.swift renamed to Aeon/HTTPServer/HTTPParser.swift

@@ -22,7 +22,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Curvature
+import HTTP
 
 struct HTTPSerializer: HTTPResponseSerializerType {
     func serializeResponse(client: TCPStreamType, response: HTTPResponse, completion: (error: ErrorType?) -> Void) {

Aeon/HTTPSerializer.swift renamed to Aeon/HTTPServer/HTTPSerializer.swift

@@ -22,28 +22,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Otherside
-import Curvature
+import HTTP
 
 public struct HTTPServer: HTTPServerType {
     public let server: TCPServerType
     public let parser: HTTPRequestParserType = HTTPParser()
-    public let responder: HTTPResponderType
+    public let responder: HTTPServerResponderType
     public let serializer: HTTPResponseSerializerType = HTTPSerializer()
 
-    struct HTTPResponder: HTTPResponderType {
+    struct HTTPResponder: HTTPServerResponderType {
         let respond: (request: HTTPRequest) -> HTTPResponse
         func respond(request: HTTPRequest) -> HTTPResponse {
             return respond(request: request)
         }
     }
 
     public init(port: Int, responder: HTTPResponderType) {
-        self.server = TCPServer(port: port)
-        self.responder = responder
-    }
-
-    public init(port: Int, responder: HTTPFallibleResponderType) {
         self.server = TCPServer(port: port)
         self.responder = HTTPResponder { request in
             do {
@@ -69,4 +63,4 @@ public struct HTTPServer: HTTPServerType {
         self.server = TCPServer(port: port)
         self.responder = HTTPResponder(respond: respond)
     }
-}
+}

Aeon/HTTPServer.swift renamed to Aeon/HTTPServer/HTTPServer.swift

@@ -22,8 +22,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Kalopsia
-import Currents
+import TCPIP
+import GrandCentralDispatch
 
 struct TCPServer: TCPServerType {
     let port: Int

Aeon/TCPServer.swift renamed to Aeon/HTTPServer/TCPServer.swift

@@ -22,8 +22,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Kalopsia
-import Currents
+import TCPIP
+import GrandCentralDispatch
 
 final class TCPStream: TCPStreamType {
     let socket: TCPClientSocket

Aeon/TCPStream.swift renamed to Aeon/HTTPServer/TCPStream.swift

@@ -22,7 +22,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Curvature
+import HTTP
 
 public protocol HTTPRequestParserType {
     func parseRequest(client: TCPStreamType, completion: (request: HTTPRequest?, error: ErrorType?) -> Void)

HTTPServerType/HTTPRequestParserType.swift renamed to Aeon/HTTPServerType/HTTPRequestParserType.swift

@@ -22,7 +22,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Curvature
+import HTTP
 
 public protocol HTTPResponseSerializerType {
     func serializeResponse(client: TCPStreamType, response: HTTPResponse, completion: (error: ErrorType?) -> Void)

HTTPServerType/HTTPResponseSerializerType.swift renamed to Aeon/HTTPServerType/HTTPResponseSerializerType.swift

@@ -1,4 +1,4 @@
-// main.swift
+// HTTPServerResponderType.swift
 //
 // The MIT License (MIT)
 //
@@ -22,12 +22,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-struct HTTPServerResponder : HTTPResponderType {
-    func respond(request: HTTPRequest) -> HTTPResponse {
-        return HTTPResponse(statusCode: 200, reasonPhrase: "OK")
-    }
-}
+import HTTP
 
-let responder = HTTPServerResponder()
-let server = HTTPServer(port: 8080, responder: responder)
-server.start()
+public protocol HTTPServerResponderType {
+    func respond(request: HTTPRequest) -> HTTPResponse
+}

Aeon Command Line Application/main.swift renamed to Aeon/HTTPServerType/HTTPServerResponderType.swift

@@ -22,12 +22,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import Otherside
+import HTTP
 
 public protocol HTTPServerType {
     var server: TCPServerType { get }
     var parser: HTTPRequestParserType { get }
-    var responder: HTTPResponderType { get }
+    var responder: HTTPServerResponderType { get }
     var serializer: HTTPResponseSerializerType  { get }
 }