Merge branch 'develop'

Author: helje5

.travis.yml

@@ -11,12 +11,18 @@ matrix:
           sudo: required
         - os:   Linux
           dist: trusty
-          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz"
+          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1.1-release/ubuntu1404/swift-4.1.1-RELEASE/swift-4.1.1-RELEASE-ubuntu14.04.tar.gz"
+          sudo: required
+        - os:   Linux
+          dist: trusty
+          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2-branch/ubuntu1404/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-07-24-a-ubuntu14.04.tar.gz"
           sudo: required
         - os:   osx
           osx_image: xcode9
         - os:   osx
           osx_image: xcode9.3
+        - os:   osx
+          osx_image: xcode9.4
 
 
 before_install:

Package.swift

@@ -3,17 +3,17 @@
 import PackageDescription
 
 let package = Package(
-    name: "swift-nio-irc",
+    name: "swift-nio-irc-client",
     products: [
-        .library   (name: "NIOIRC", targets: [ "NIOIRC" ]),
-        .library   (name: "IRC",    targets: [ "IRC"    ])
+        .library(name: "IRC", targets: [ "IRC" ])
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", 
-                 from: "1.8.0")
+                 from: "1.8.0"),
+        .package(url: "https://github.com/SwiftNIOExtras/swift-nio-irc.git",
+                 from: "0.6.0")
     ],
     targets: [
-        .target(name: "NIOIRC", dependencies: [ "NIO"    ]),
-        .target(name: "IRC",    dependencies: [ "NIOIRC" ])
+        .target(name: "IRC", dependencies: [ "NIOIRC" ])
     ]
 )

README.md

@@ -1,19 +1,21 @@
-# SwiftNIO IRC
+# SwiftNIO IRC Client
 
 ![Swift4](https://img.shields.io/badge/swift-4-blue.svg)
 ![iOS](https://img.shields.io/badge/os-iOS-green.svg?style=flat)
 ![macOS](https://img.shields.io/badge/os-macOS-green.svg?style=flat)
 ![tuxOS](https://img.shields.io/badge/os-tuxOS-green.svg?style=flat)
-![Travis](https://travis-ci.org/NozeIO/swift-nio-irc.svg?branch=master)
+![Travis](https://travis-ci.org/NozeIO/swift-nio-irc-client.svg?branch=master)
 
 SwiftNIO-IRC is a Internet Relay Chat 
 [protocol implementation](Sources/NIOIRC) for
 [SwiftNIO](https://github.com/apple/swift-nio)
 and a simple 
 [IRC client](Sources/IRC).
 
-This module contains the protocol implementation and the client, we also
+This module contains a simple IRC client library. We also
 provide:
+- [swift-nio-irc](https://github.com/SwiftNIOExtras/swift-nio-irc) -
+  the raw Swift NIO IRC protocol implementation
 - [swift-nio-irc-webclient](https://github.com/NozeIO/swift-nio-irc-webclient) -
   a simple IRC webclient + WebSocket gateway based on this module,
 - [swift-nio-irc-eliza](https://github.com/NozeIO/swift-nio-irc-eliza) -
@@ -42,41 +44,17 @@ import PackageDescription
 let package = Package(
     name: "IRCTests",
     dependencies: [
-        .package(url: "https://github.com/NozeIO/swift-nio-irc.git",
-                 from: "0.5.0")
+        .package(url: "https://github.com/NozeIO/swift-nio-irc-client.git",
+                 from: "0.6.0")
     ],
     targets: [
-        .target(name: "MyProtocolTool",
-                dependencies: [ "NIOIRC" ]),
         .target(name: "MyIRCClient",
                 dependencies: [ "IRC" ])
     ]
 )
 ```
 
 
-## Using the SwiftNIO IRC protocol handler
-
-The IRC protocol is implemented as a regular
-`ChannelHandler`, similar to `NIOHTTP1`.
-It takes incoming `ByteBuffer` data, parses that, and emits `IRCMessage`
-items.
-Same the other way around, the user writes `IRCReply`
-objects, and the handler renders such into `ByteBuffer`s.
-
-To add the IRC handler to a NIO Channel pipeline:
-
-```swift
-import NIOIRC
-
-bootstrap.channelInitializer { channel in
-    channel.pipeline
-        .add(handler: IRCChannelHandler())
-        .then { ... }
-}
-```
-
-
 ### Who
 
 Brought to you by