Skip to content

Commit 04aa1f9

Browse files
committed
Polish project documents
Motivation: To give a better first impression, and providing more comprehensive information for first time viewers, the README file needed reworking. Modifications: - Add a CHANGELOG file that at least redirects readers to the releases page of GitLab - Update the CONTRIBUTORS list - Change project README to have more information, flow better, and to have a better "first impression" Result: The README should give a stronger indication into the project's health.
1 parent f2df346 commit 04aa1f9

File tree

5 files changed

+91
-29
lines changed

5 files changed

+91
-29
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
22
3+

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[SemVer](https://semver.org/) changes are documented for each release on the [releases page](https://gitlab.com/Mordil/swift-redi-stack/-/releases).

CONTRIBUTING.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,26 @@ Please ensure to specify the following:
1414
* For example, are you running in Docker? How are you connecting to it through Docker? What version of Docker?
1515
* OS version and output of `uname -a`
1616
* Swift version or output of `swift --version`
17+
18+
## Development
19+
20+
### Git Workflow
21+
22+
`master` is always the development branch.
23+
24+
For **minor** or **patch** SemVer changes, create a branch off of the tagged commit.
25+
26+
### Environment Setup
27+
28+
It is highly recommended to use [Docker](https://docker.com) to install Redis locally.
29+
30+
```bash
31+
docker run -d -p 6379:6379 --name redis redis:5
32+
```
33+
34+
Otherwise, install Redis directly on your machine from [Redis.io](https://redis.io/download).
1735

18-
## Submitting a Pull Request
36+
### Submitting a Pull Request
1937

2038
A great PR that is likely to be merged quickly is:
2139

CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ needs to be listed here.
1010
### Contributors
1111

1212
- Nathan Harris <[email protected]>
13+
- Ondrej Rafaj <[email protected]>
1314
- tanner0101 <[email protected]>
1415

1516
**Updating this list**

README.md

Lines changed: 69 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,46 @@
1-
| The [GitHub repository](https://github.com/Mordil/swift-redis-nio-client) is a **read-only** mirror of the GitLab repository. For issues and merge requests, [please visit GitLab](https://gitlab.com/mordil/swift-redis-nio-client). |
2-
|---|
1+
<div align="center">
2+
<p><img src="https://gitlab.com/Mordil/swift-redi-stack/wikis/uploads/cb4c517e40bd2f5ab796f1093efbd697/RediStack_social-preview_transparent.png" width="350" alt="RediStack logo"></p>
33

4-
[![License](https://img.shields.io/badge/License-Apache%202.0-yellow.svg)](./LICENSE.txt)
5-
[![Build](https://gitlab.com/Mordil/swift-redis-nio-client/badges/master/pipeline.svg)](https://gitlab.com/Mordil/swift-redis-nio-client/pipelines)
6-
[![Swift](https://img.shields.io/badge/Swift-5.0-brightgreen.svg?colorA=orange&colorB=4E4E4E)](https://swift.org)
7-
[![Redis](https://img.shields.io/badge/Redis-5-brightgreen.svg?colorA=red&colorB=4E4E4E)](https://redis.io/download)
4+
<p>
5+
<a href="https://gitlab.com/Mordil/swift-redis-nio-client/pipelines"><img src="https://gitlab.com/Mordil/swift-redis-nio-client/badges/master/pipeline.svg" alt="Build Status"></a>
6+
<a href="https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level"><img src="https://img.shields.io/badge/sswg-sandbox-lightgrey.svg" alt="SSWG Maturity"></a>
7+
<a href="https://gitlab.com/Mordil/swift-redi-stack/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/License-Apache%202.0-yellow.svg" alt="Apache 2 License"></a>
8+
<a href="https://swift.org"><img src="https://img.shields.io/badge/Swift-5.0+-orange.svg" alt="Swift 5.0+"></a>
9+
<a href="https://redis.io"><img src="https://img.shields.io/badge/Redis-5.0+-red.svg" alt="Redis 5.0+"></a>
10+
</p>
11+
</div>
812

9-
# Swift RediStack
13+
<table><thead><tr align="center"><th width="9999">
14+
The <a href="https://github.com/Mordil/swift-redi-stack" rel="nofollow noreferrer noopener" target="_blank">GitHub repository</a> is a <b>read-only</b> mirror of the GitLab repository. For issues and merge requests, <a href="https://gitlab.com/mordil/swift-redi-stack" rel="nofollow noreferrer noopener" target="_blank">please visit GitLab</a>.
15+
</th></tr></thead></table>
1016

11-
A non-blocking Swift client for [Redis](https://redis.io/) built on top of [SwiftNIO](https://github.com/apple/swift-nio).
17+
## Introduction
1218

13-
This package defines everything you need to work with Redis through the [**Re**dis **S**eralization **P**rotocol (RESP)](https://redis.io/topics/protocol).
19+
**RediStack** (pronounced like "ready stack") is a _non-blocking_ Swift client for [Redis](https://redis.io) built on top of [SwiftNIO](https://github.com/apple/swift-nio).
1420

15-
**RediStack** is part of the [Swift on Server Working Group](https://github.com/swift-server/sswg) ecosystem.
21+
It communicates over the network using Redis' [**Re**dis **S**eralization **P**rotocol (RESP2)](https://redis.io/topics/protocol).
1622

17-
| Proposal | Pitch | Discussion | Review | Vote |
18-
|----------|-------|------------|--------|------|
19-
| [SSWG-0004](https://github.com/swift-server/sswg/blob/master/proposals/0004-nio-redis.md) | [2019-01-07](https://forums.swift.org/t/swiftnio-redis-client/19325) | [2019-04-01](https://forums.swift.org/t/discussion-nioredis-nio-based-redis-driver/22455) | [2019-06-09](https://forums.swift.org/t/feedback-redisnio-a-nio-based-redis-driver/25521) | [2019-06-27](https://forums.swift.org/t/june-27th-2019/26580) |
23+
The table below lists the major releases alongside their compatible language, dependency, and Redis versions.
24+
25+
| SPM Version | [Swift](https://swift.org/download) | [Redis](https://redis.io) | [SwiftNIO](https://github.com/apple/swift-nio) | [SwiftLog](https://github.com/apple/swift-log) | [SwiftMetrics](https://github.com/apple/swift-metrics) |
26+
|:---:|:---:|:---:|:---:|:---:|:---:|
27+
| `from: "1.0.0-alpha.5"` | 5.0+ | 5.0+ | 2.x | 1.x | 1.x |
28+
29+
### Supported Operating Systems
30+
31+
**RediStack** runs anywhere that is officially supported by the [Swift project](https://swift.org/download/#releases). See the [test matrix below for more details](#language-and-platform-test-matrix).
2032

21-
## :package: Installation
33+
## Installing
2234

23-
To install **RediStack**, just add the package as a dependency in your [**Package.swift**](https://github.com/apple/swift-package-manager/blob/master/Documentation/PackageDescriptionV4.md#dependencies)
35+
To install **RediStack**, just add the package as a dependency in your **Package.swift**.
2436

2537
```swift
2638
dependencies: [
27-
.package(url: "https://github.com/Mordil/swift-redis-nio-client.git", from: "1.0.0-alpha.4")
39+
.package(url: "https://gitlab.com/mordil/swift-redi-stack.git", from: "1.0.0-alpha.5")
2840
]
2941
```
3042

31-
and run the following command: `swift package resolve`
32-
33-
## :zap: Getting Started
43+
## Getting Started
3444

3545
**RediStack** is quick to use - all you need is an [`EventLoop`](https://apple.github.io/swift-nio/docs/current/NIO/Protocols/EventLoop.html) from **SwiftNIO**.
3646

@@ -51,20 +61,51 @@ let result = try connection.set("my_key", to: "some value")
5161
print(result) // Optional("some value")
5262
```
5363

54-
## :closed_book: Documentation
64+
> _**Note**: Use of `wait()` was used here for simplicity. Never call this method on an `eventLoop`!_
65+
66+
## Documentation
67+
68+
The docs for the latest tagged release are always available at https://mordil.gitlab.io/swift-redi-stack.
5569

56-
API Documentation is generated every time a new release is published.
70+
## Changelog
5771

58-
The latest version's docs are always available at https://mordil.gitlab.io/swift-redis-nio-client
72+
[SemVer](https://semver.org/) changes are documented for each release on the [releases page](https://gitlab.com/Mordil/swift-redi-stack/-/releases).
5973

60-
## :construction: Contributing
74+
## Contributing
6175

6276
Check out [CONTRIBUTING.md](CONTRIBUTING.md) for more information on how to help with **RediStack**.
6377

64-
It is highly recommended to use [Docker](https://docker.com) to install Redis locally.
78+
## Contributors
6579

66-
```bash
67-
docker run -d -p 6379:6379 --name redis redis:5
68-
```
80+
Check out [CONTRIBUTORS.txt](CONTRIBUTORS.txt) to see the full list. This list is updated for each release.
81+
82+
## Swift on Server Ecosystem
83+
84+
**RediStack** is part of the [Swift on Server Working Group](https://github.com/swift-server/sswg) ecosystem - currently recommended as [**Sandbox Maturity**](https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level).
85+
86+
| Proposal | Pitch | Discussion | Review | Vote |
87+
|----------|-------|------------|--------|------|
88+
| [SSWG-0004](https://github.com/swift-server/sswg/blob/master/proposals/0004-nio-redis.md) | [2019-01-07](https://forums.swift.org/t/swiftnio-redis-client/19325) | [2019-04-01](https://forums.swift.org/t/discussion-nioredis-nio-based-redis-driver/22455) | [2019-06-09](https://forums.swift.org/t/feedback-redisnio-a-nio-based-redis-driver/25521) | [2019-06-27](https://forums.swift.org/t/june-27th-2019/26580) |
89+
90+
## Language and Platform Test Matrix
91+
92+
The following table shows the combination of Swift language versions and operating systems that
93+
receive regular unit testing (either in development, or with CI).
94+
95+
| Swift Version | macOS Mojave | Ubuntu 16.04 (Xenial) | Ubuntu 18.04 (Bionic) |
96+
|---|:---:|:---:|:---:|
97+
| 5.0 | X | X | X |
98+
| 5.1 | X | X | |
99+
| Trunk | X | X | |
100+
101+
## License
102+
103+
[Apache 2.0](./LICENSE.txt)
104+
105+
Copyright (c) 2019-present, Nathan Harris (@mordil)
106+
107+
_This project contains code written by others not affliated with this project. All copyright claims are reserved by them. For a full list, with their claimed rights, see [NOTICE.txt](./NOTICE.txt)_
108+
109+
_**Redis** is a registered trademark of **Redis Labs**. Any use of their trademark is under the established [trademark guidelines](https://redis.io/topics/trademark) and does not imply any affiliation with or endorsement by them, and all rights are reserved by them._
69110

70-
Otherwise, install Redis directly on your machine from [Redis.io](https://redis.io/download).
111+
_**Swift** is a registered trademark of **Apple, Inc**. Any use of their trademark does not imply any affiliation with or endorsement by them, and all rights are reserved by them._

0 commit comments

Comments
 (0)