Merge pull request #45 from Mordil/renaming

Rename `NIORedis` to `RedisNIO`

Author: Mordil

CODE_OF_CONDUCT.md

@@ -1,10 +1,10 @@
 # Code of Conduct
-To be a truly great community, NIORedis needs to welcome developers from all walks of life,
+To be a truly great community, RedisNIO needs to welcome developers from all walks of life,
 with different backgrounds, and with a wide range of experience. A diverse and friendly
 community will have more great ideas, more unique perspectives, and produce more great 
-code. We will work diligently to make the NIORedis community welcoming to everyone.
+code. We will work diligently to make the RedisNIO community welcoming to everyone.
 
-To give clarity of what is expected of our members, NIORedis has adopted the code of conduct 
+To give clarity of what is expected of our members, RedisNIO has adopted the code of conduct 
 defined by [contributor-covenant.org](https://www.contributor-covenant.org). This document is used across many open source 
 communities, and we think it articulates our values well. The full text is copied below:
 

CONTRIBUTING.md

@@ -7,7 +7,7 @@ that your contributions are licensed under the [Apache 2.0 license](https://www.
 
 Please ensure to specify the following:
 
-* NIORedis commit hash
+* RedisNIO commit hash
 * Simplest possible steps to reproduce
     * A pull request with a failing test case is preferred, but it's just as fine to write it in the issue description
 * Environment Information

CONTRIBUTORS.txt

@@ -1,5 +1,5 @@
 For the purpose of tracking copyright, this is the list of individuals and
-organizations who have contributed source code to NIORedis.
+organizations who have contributed source code to RedisNIO.
 
 For employees of an organization/company where the copyright of work done
 by employees of that company is held by the company itself, only the company

NOTICE.txt

@@ -1,14 +1,14 @@
 
-                            The NIORedis Project
+                            The RedisNIO Project
                             ====================
 
-Please visit the NIORedis web site for more information:
+Please visit the RedisNIO web site for more information:
 
   * https://github.com/mordil/nio-redis
 
-Copyright 2019 The NIORedis Project
+Copyright 2019 The RedisNIO Project
 
-The NIORedis Project licenses this file to you under the Apache License,
+The RedisNIO Project licenses this file to you under the Apache License,
 version 2.0 (the "License"); you may not use this file except in compliance
 with the License. You may obtain a copy of the License at:
 

Package.swift

@@ -1,13 +1,13 @@
 // swift-tools-version:5.0
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,17 +16,17 @@
 import PackageDescription
 
 let package = Package(
-    name: "nio-redis",
+    name: "redis-nio",
     products: [
-        .library(name: "NIORedis", targets: ["NIORedis"])
+        .library(name: "RedisNIO", targets: ["RedisNIO"])
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")
     ],
     targets: [
-        .target(name: "NIORedis", dependencies: ["NIO", "Logging", "Metrics"]),
-        .testTarget(name: "NIORedisTests", dependencies: ["NIORedis", "NIO"])
+        .target(name: "RedisNIO", dependencies: ["NIO", "Logging", "Metrics"]),
+        .testTarget(name: "RedisNIOTests", dependencies: ["RedisNIO", "NIO"])
     ]
 )

README.md

@@ -3,9 +3,9 @@
 [![Swift](https://img.shields.io/badge/Swift-5.0-brightgreen.svg?colorA=orange&colorB=4E4E4E)](https://swift.org)
 [![Redis](https://img.shields.io/badge/Redis-5-brightgreen.svg?colorA=red&colorB=4E4E4E)](https://redis.io/download)
 
-# NIORedis
+# Swift Redis NIO Client
 
-A non-blocking Swift driver for [Redis](https://redis.io/) built with [SwiftNIO](https://github.com/apple/swift-nio).
+A non-blocking Swift client for [Redis](https://redis.io/) built on top of [SwiftNIO](https://github.com/apple/swift-nio).
 
 This package defines everything you need to work with Redis through the [**Re**dis **S**eralization **P**rotocol (RESP)](https://redis.io/topics/protocol).
 
@@ -15,22 +15,22 @@ This package defines everything you need to work with Redis through the [**Re**d
 
 ## Installation
 
-To install `NIORedis`, just add the package as a dependency in your [**Package.swift**](https://github.com/apple/swift-package-manager/blob/master/Documentation/PackageDescriptionV4.md#dependencies)
+To install `RedisNIO`, just add the package as a dependency in your [**Package.swift**](https://github.com/apple/swift-package-manager/blob/master/Documentation/PackageDescriptionV4.md#dependencies)
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/Mordil/nio-redis.git", .upToNextMinor(from: "0.7.0")
+    .package(url: "https://github.com/Mordil/swift-redis-nio-client.git", .upToNextMinor(from: "0.8.0")
 ]
 ```
 
 and run the following command: `swift package resolve`
 
 ## Getting Started
 
-`NIORedis` is ready to use right after installation.
+`RedisNIO` is ready to use right after installation.
 
 ```swift
-import NIORedis
+import RedisNIO
 
 let connection = Redis.makeConnection(
     to: try .init(ipAddress: "127.0.0.1", port: 6379),
@@ -46,12 +46,12 @@ print(result) // Optional("some value")
 
 ## Contributing
 
-Check out [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to help with NIORedis.
+Check out [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to help with RedisNIO.
 
 It is highly recommended to use [Docker](https://docker.com) to install Redis locally.
 
 ```bash
-docker run -d -p 6379:6379 --name nioredis redis:5
+docker run -d -p 6379:6379 --name redisnio redis:5
 ```
 
 Otherwise, install Redis directly on your machine from [Redis.io](https://redis.io/download).

Sources/NIORedis/ChannelHandlers/RedisByteDecoder.swift renamed to Sources/RedisNIO/ChannelHandlers/RedisByteDecoder.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //

Sources/NIORedis/ChannelHandlers/RedisCommandHandler.swift renamed to Sources/RedisNIO/ChannelHandlers/RedisCommandHandler.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -40,7 +40,7 @@ open class RedisCommandHandler {
         logger.warning("Command handler deinit when queue is not empty. Current size: \(commandResponseQueue.count)")
     }
 
-    public init(logger: Logger = Logger(label: "NIORedis.CommandHandler")) {
+    public init(logger: Logger = Logger(label: "RedisNIO.CommandHandler")) {
         self.commandResponseQueue = []
         self.logger = logger
         self.logger[metadataKey: "CommandHandler"] = "\(UUID())"

Sources/NIORedis/ChannelHandlers/RedisMessageEncoder.swift renamed to Sources/RedisNIO/ChannelHandlers/RedisMessageEncoder.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -25,7 +25,7 @@ public final class RedisMessageEncoder: MessageToByteEncoder {
 
     private let logger: Logger
 
-    public init(logger: Logger = Logger(label: "NIORedis.RedisMessageEncoder")) {
+    public init(logger: Logger = Logger(label: "RedisNIO.RedisMessageEncoder")) {
         self.logger = logger
     }
 

Sources/NIORedis/Commands/BasicCommands.swift renamed to Sources/RedisNIO/Commands/BasicCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -148,7 +148,7 @@ extension RedisClient {
                 let value = result[0].string,
                 let position = Int(value)
             else {
-                throw NIORedisError.assertionFailure(message: "Unexpected value in response: \(result[0])")
+                throw RedisNIOError.assertionFailure(message: "Unexpected value in response: \(result[0])")
             }
             return position
         }

Sources/NIORedis/Commands/HashCommands.swift renamed to Sources/RedisNIO/Commands/HashCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //

Sources/NIORedis/Commands/ListCommands.swift renamed to Sources/RedisNIO/Commands/ListCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -380,11 +380,11 @@ extension RedisClient {
             .flatMapThrowing {
                 guard !$0.isNull else { return nil }
                 guard let response = [RESPValue]($0) else {
-                    throw NIORedisError.responseConversion(to: [RESPValue].self)
+                    throw RedisNIOError.responseConversion(to: [RESPValue].self)
                 }
                 assert(response.count == 2, "Unexpected response size returned!")
                 guard let key = response[0].string else {
-                    throw NIORedisError.assertionFailure(message: "Unexpected structure in response: \(response)")
+                    throw RedisNIOError.assertionFailure(message: "Unexpected structure in response: \(response)")
                 }
                 return (key, response[1])
             }

Sources/NIORedis/Commands/SetCommands.swift renamed to Sources/RedisNIO/Commands/SetCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //

Sources/NIORedis/Commands/SortedSetCommands.swift renamed to Sources/RedisNIO/Commands/SortedSetCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -31,7 +31,7 @@ extension RedisClient {
             let scoreItem = response[scoreIsFirst ? index : index + 1]
 
             guard let score = Double(scoreItem) else {
-                throw NIORedisError.assertionFailure(message: "Unexpected response: '\(scoreItem)'")
+                throw RedisNIOError.assertionFailure(message: "Unexpected response: '\(scoreItem)'")
             }
 
             let elementIndex = scoreIsFirst ? index + 1 : index
@@ -62,7 +62,7 @@ extension RedisClient {
         options: Set<String> = []
     ) -> EventLoopFuture<Int> {
         guard !options.contains("INCR") else {
-            return self.eventLoop.makeFailedFuture(NIORedisError.unsupportedOperation(
+            return self.eventLoop.makeFailedFuture(RedisNIOError.unsupportedOperation(
                 method: #function,
                 message: "INCR option is unsupported. Use zincrby(_:element:in:) instead."
             ))
@@ -421,14 +421,14 @@ extension RedisClient {
             .flatMapThrowing {
                 guard !$0.isNull else { return nil }
                 guard let response = [RESPValue]($0) else {
-                    throw NIORedisError.responseConversion(to: [RESPValue].self)
+                    throw RedisNIOError.responseConversion(to: [RESPValue].self)
                 }
                 assert(response.count == 3, "Unexpected response size returned!")
                 guard
                     let key = response[0].string,
                     let score = Double(response[1])
                 else {
-                    throw NIORedisError.assertionFailure(message: "Unexpected structure in response: \(response)")
+                    throw RedisNIOError.assertionFailure(message: "Unexpected structure in response: \(response)")
                 }
                 return (key, score, response[2])
             }

Sources/NIORedis/Commands/StringCommands.swift renamed to Sources/RedisNIO/Commands/StringCommands.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //

Sources/NIORedis/Exported.swift renamed to Sources/RedisNIO/Exported.swift

@@ -1,12 +1,12 @@
 //===----------------------------------------------------------------------===//
 //
-// This source file is part of the NIORedis open source project
+// This source file is part of the RedisNIO open source project
 //
-// Copyright (c) 2019 NIORedis project authors
+// Copyright (c) 2019 RedisNIO project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
-// See CONTRIBUTORS.txt for the list of NIORedis project authors
+// See CONTRIBUTORS.txt for the list of RedisNIO project authors
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -28,7 +28,7 @@ extension EventLoopFuture where Value == RESPValue {
     ) -> EventLoopFuture<T> where T: RESPValueConvertible
     {
         return self.flatMapThrowing {
-            guard let value = T($0) else { throw NIORedisError.responseConversion(to: type) }
+            guard let value = T($0) else { throw RedisNIOError.responseConversion(to: type) }
             return value
         }
     }