Skip to content

Commit a765914

Browse files
authored
Merge pull request #45 from Mordil/renaming
Rename `NIORedis` to `RedisNIO`
2 parents 7ae2024 + e81f954 commit a765914

39 files changed

+158
-158
lines changed

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Code of Conduct
2-
To be a truly great community, NIORedis needs to welcome developers from all walks of life,
2+
To be a truly great community, RedisNIO needs to welcome developers from all walks of life,
33
with different backgrounds, and with a wide range of experience. A diverse and friendly
44
community will have more great ideas, more unique perspectives, and produce more great
5-
code. We will work diligently to make the NIORedis community welcoming to everyone.
5+
code. We will work diligently to make the RedisNIO community welcoming to everyone.
66

7-
To give clarity of what is expected of our members, NIORedis has adopted the code of conduct
7+
To give clarity of what is expected of our members, RedisNIO has adopted the code of conduct
88
defined by [contributor-covenant.org](https://www.contributor-covenant.org). This document is used across many open source
99
communities, and we think it articulates our values well. The full text is copied below:
1010

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ that your contributions are licensed under the [Apache 2.0 license](https://www.
77

88
Please ensure to specify the following:
99

10-
* NIORedis commit hash
10+
* RedisNIO commit hash
1111
* Simplest possible steps to reproduce
1212
* A pull request with a failing test case is preferred, but it's just as fine to write it in the issue description
1313
* Environment Information

CONTRIBUTORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
For the purpose of tracking copyright, this is the list of individuals and
2-
organizations who have contributed source code to NIORedis.
2+
organizations who have contributed source code to RedisNIO.
33

44
For employees of an organization/company where the copyright of work done
55
by employees of that company is held by the company itself, only the company

NOTICE.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

2-
The NIORedis Project
2+
The RedisNIO Project
33
====================
44

5-
Please visit the NIORedis web site for more information:
5+
Please visit the RedisNIO web site for more information:
66

77
* https://github.com/mordil/nio-redis
88

9-
Copyright 2019 The NIORedis Project
9+
Copyright 2019 The RedisNIO Project
1010

11-
The NIORedis Project licenses this file to you under the Apache License,
11+
The RedisNIO Project licenses this file to you under the Apache License,
1212
version 2.0 (the "License"); you may not use this file except in compliance
1313
with the License. You may obtain a copy of the License at:
1414

Package.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// swift-tools-version:5.0
22
//===----------------------------------------------------------------------===//
33
//
4-
// This source file is part of the NIORedis open source project
4+
// This source file is part of the RedisNIO open source project
55
//
6-
// Copyright (c) 2019 NIORedis project authors
6+
// Copyright (c) 2019 RedisNIO project authors
77
// Licensed under Apache License v2.0
88
//
99
// See LICENSE.txt for license information
10-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
10+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1111
//
1212
// SPDX-License-Identifier: Apache-2.0
1313
//
@@ -16,17 +16,17 @@
1616
import PackageDescription
1717

1818
let package = Package(
19-
name: "nio-redis",
19+
name: "redis-nio",
2020
products: [
21-
.library(name: "NIORedis", targets: ["NIORedis"])
21+
.library(name: "RedisNIO", targets: ["RedisNIO"])
2222
],
2323
dependencies: [
2424
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
2525
.package(url: "https://github.com/apple/swift-metrics.git", from: "1.0.0"),
2626
.package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")
2727
],
2828
targets: [
29-
.target(name: "NIORedis", dependencies: ["NIO", "Logging", "Metrics"]),
30-
.testTarget(name: "NIORedisTests", dependencies: ["NIORedis", "NIO"])
29+
.target(name: "RedisNIO", dependencies: ["NIO", "Logging", "Metrics"]),
30+
.testTarget(name: "RedisNIOTests", dependencies: ["RedisNIO", "NIO"])
3131
]
3232
)

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[![Swift](https://img.shields.io/badge/Swift-5.0-brightgreen.svg?colorA=orange&colorB=4E4E4E)](https://swift.org)
44
[![Redis](https://img.shields.io/badge/Redis-5-brightgreen.svg?colorA=red&colorB=4E4E4E)](https://redis.io/download)
55

6-
# NIORedis
6+
# Swift Redis NIO Client
77

8-
A non-blocking Swift driver for [Redis](https://redis.io/) built with [SwiftNIO](https://github.com/apple/swift-nio).
8+
A non-blocking Swift client for [Redis](https://redis.io/) built on top of [SwiftNIO](https://github.com/apple/swift-nio).
99

1010
This package defines everything you need to work with Redis through the [**Re**dis **S**eralization **P**rotocol (RESP)](https://redis.io/topics/protocol).
1111

@@ -15,22 +15,22 @@ This package defines everything you need to work with Redis through the [**Re**d
1515

1616
## Installation
1717

18-
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)
18+
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)
1919

2020
```swift
2121
dependencies: [
22-
.package(url: "https://github.com/Mordil/nio-redis.git", .upToNextMinor(from: "0.7.0")
22+
.package(url: "https://github.com/Mordil/swift-redis-nio-client.git", .upToNextMinor(from: "0.8.0")
2323
]
2424
```
2525

2626
and run the following command: `swift package resolve`
2727

2828
## Getting Started
2929

30-
`NIORedis` is ready to use right after installation.
30+
`RedisNIO` is ready to use right after installation.
3131

3232
```swift
33-
import NIORedis
33+
import RedisNIO
3434

3535
let connection = Redis.makeConnection(
3636
to: try .init(ipAddress: "127.0.0.1", port: 6379),
@@ -46,12 +46,12 @@ print(result) // Optional("some value")
4646

4747
## Contributing
4848

49-
Check out [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to help with NIORedis.
49+
Check out [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to help with RedisNIO.
5050

5151
It is highly recommended to use [Docker](https://docker.com) to install Redis locally.
5252

5353
```bash
54-
docker run -d -p 6379:6379 --name nioredis redis:5
54+
docker run -d -p 6379:6379 --name redisnio redis:5
5555
```
5656

5757
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -40,7 +40,7 @@ open class RedisCommandHandler {
4040
logger.warning("Command handler deinit when queue is not empty. Current size: \(commandResponseQueue.count)")
4141
}
4242

43-
public init(logger: Logger = Logger(label: "NIORedis.CommandHandler")) {
43+
public init(logger: Logger = Logger(label: "RedisNIO.CommandHandler")) {
4444
self.commandResponseQueue = []
4545
self.logger = logger
4646
self.logger[metadataKey: "CommandHandler"] = "\(UUID())"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -25,7 +25,7 @@ public final class RedisMessageEncoder: MessageToByteEncoder {
2525

2626
private let logger: Logger
2727

28-
public init(logger: Logger = Logger(label: "NIORedis.RedisMessageEncoder")) {
28+
public init(logger: Logger = Logger(label: "RedisNIO.RedisMessageEncoder")) {
2929
self.logger = logger
3030
}
3131

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -148,7 +148,7 @@ extension RedisClient {
148148
let value = result[0].string,
149149
let position = Int(value)
150150
else {
151-
throw NIORedisError.assertionFailure(message: "Unexpected value in response: \(result[0])")
151+
throw RedisNIOError.assertionFailure(message: "Unexpected value in response: \(result[0])")
152152
}
153153
return position
154154
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -380,11 +380,11 @@ extension RedisClient {
380380
.flatMapThrowing {
381381
guard !$0.isNull else { return nil }
382382
guard let response = [RESPValue]($0) else {
383-
throw NIORedisError.responseConversion(to: [RESPValue].self)
383+
throw RedisNIOError.responseConversion(to: [RESPValue].self)
384384
}
385385
assert(response.count == 2, "Unexpected response size returned!")
386386
guard let key = response[0].string else {
387-
throw NIORedisError.assertionFailure(message: "Unexpected structure in response: \(response)")
387+
throw RedisNIOError.assertionFailure(message: "Unexpected structure in response: \(response)")
388388
}
389389
return (key, response[1])
390390
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -31,7 +31,7 @@ extension RedisClient {
3131
let scoreItem = response[scoreIsFirst ? index : index + 1]
3232

3333
guard let score = Double(scoreItem) else {
34-
throw NIORedisError.assertionFailure(message: "Unexpected response: '\(scoreItem)'")
34+
throw RedisNIOError.assertionFailure(message: "Unexpected response: '\(scoreItem)'")
3535
}
3636

3737
let elementIndex = scoreIsFirst ? index + 1 : index
@@ -62,7 +62,7 @@ extension RedisClient {
6262
options: Set<String> = []
6363
) -> EventLoopFuture<Int> {
6464
guard !options.contains("INCR") else {
65-
return self.eventLoop.makeFailedFuture(NIORedisError.unsupportedOperation(
65+
return self.eventLoop.makeFailedFuture(RedisNIOError.unsupportedOperation(
6666
method: #function,
6767
message: "INCR option is unsupported. Use zincrby(_:element:in:) instead."
6868
))
@@ -421,14 +421,14 @@ extension RedisClient {
421421
.flatMapThrowing {
422422
guard !$0.isNull else { return nil }
423423
guard let response = [RESPValue]($0) else {
424-
throw NIORedisError.responseConversion(to: [RESPValue].self)
424+
throw RedisNIOError.responseConversion(to: [RESPValue].self)
425425
}
426426
assert(response.count == 3, "Unexpected response size returned!")
427427
guard
428428
let key = response[0].string,
429429
let score = Double(response[1])
430430
else {
431-
throw NIORedisError.assertionFailure(message: "Unexpected structure in response: \(response)")
431+
throw RedisNIOError.assertionFailure(message: "Unexpected structure in response: \(response)")
432432
}
433433
return (key, score, response[2])
434434
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
File renamed without changes.

Sources/NIORedis/Extensions/SwiftNIO.swift renamed to Sources/RedisNIO/Extensions/SwiftNIO.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the NIORedis open source project
3+
// This source file is part of the RedisNIO open source project
44
//
5-
// Copyright (c) 2019 NIORedis project authors
5+
// Copyright (c) 2019 RedisNIO project authors
66
// Licensed under Apache License v2.0
77
//
88
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of NIORedis project authors
9+
// See CONTRIBUTORS.txt for the list of RedisNIO project authors
1010
//
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
@@ -28,7 +28,7 @@ extension EventLoopFuture where Value == RESPValue {
2828
) -> EventLoopFuture<T> where T: RESPValueConvertible
2929
{
3030
return self.flatMapThrowing {
31-
guard let value = T($0) else { throw NIORedisError.responseConversion(to: type) }
31+
guard let value = T($0) else { throw RedisNIOError.responseConversion(to: type) }
3232
return value
3333
}
3434
}

0 commit comments

Comments
 (0)