Skip to content

Commit aec61b0

Browse files
calebklevetercalebkleveter
authored
Merge pull request #18 from Ether-CLI/develop
Ether 2018
2 parents bb2bb84 + 6e7b81e commit aec61b0

25 files changed

+762
-1349
lines changed

‎ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE/issue_template.md

File renamed without changes.

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [2018.05.18]
2+
3+
### Updated
4+
- Rewrote whole CLI with Console 3, Manifest, and the vapor-community/PackageCatalogAPI.
5+
16
## [1.10.0] 2018-02-18
27

38
### Added

‎Package.resolved

+131-23
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,165 @@
22
"object": {
33
"pins": [
44
{
5-
"package": "Bits",
6-
"repositoryURL": "https://github.com/vapor/bits.git",
5+
"package": "Console",
6+
"repositoryURL": "https://github.com/vapor/console.git",
7+
"state": {
8+
"branch": null,
9+
"revision": "5b9796d39f201b3dd06800437abd9d774a455e57",
10+
"version": "3.0.2"
11+
}
12+
},
13+
{
14+
"package": "Core",
15+
"repositoryURL": "https://github.com/vapor/core.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "a909eccc41941faac6fb9e511cdb9a5cb30a05de",
19+
"version": "3.1.7"
20+
}
21+
},
22+
{
23+
"package": "Crypto",
24+
"repositoryURL": "https://github.com/vapor/crypto.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "1b8c2ba5a42f1adf2aa812204678d8b16466fa59",
28+
"version": "3.1.2"
29+
}
30+
},
31+
{
32+
"package": "DatabaseKit",
33+
"repositoryURL": "https://github.com/vapor/database-kit.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "0db303439e5ef8b6df50a2b6c4029edddee90cb0",
37+
"version": "1.0.1"
38+
}
39+
},
40+
{
41+
"package": "HTTP",
42+
"repositoryURL": "https://github.com/vapor/http.git",
43+
"state": {
44+
"branch": null,
45+
"revision": "5e766f72d81ef5fe8805d704efdffd17e4906134",
46+
"version": "3.0.6"
47+
}
48+
},
49+
{
50+
"package": "Manifest",
51+
"repositoryURL": "https://github.com/Ether-CLI/Manifest.git",
52+
"state": {
53+
"branch": null,
54+
"revision": "a200f9a6af998f787ac4ea7b92802f7b139d499f",
55+
"version": "0.4.5"
56+
}
57+
},
58+
{
59+
"package": "Multipart",
60+
"repositoryURL": "https://github.com/vapor/multipart.git",
761
"state": {
862
"branch": null,
9-
"revision": "c32f5e6ae2007dccd21a92b7e33eba842dd80d2f",
63+
"revision": "7778dcb62f3efa845e8e2808937bb347575ba7ce",
64+
"version": "3.0.1"
65+
}
66+
},
67+
{
68+
"package": "Routing",
69+
"repositoryURL": "https://github.com/vapor/routing.git",
70+
"state": {
71+
"branch": null,
72+
"revision": "3219e328491b0853b8554c5a694add344d2c6cfb",
73+
"version": "3.0.1"
74+
}
75+
},
76+
{
77+
"package": "Service",
78+
"repositoryURL": "https://github.com/vapor/service.git",
79+
"state": {
80+
"branch": null,
81+
"revision": "281a70b69783891900be31a9e70051b6fe19e146",
82+
"version": "1.0.0"
83+
}
84+
},
85+
{
86+
"package": "swift-nio",
87+
"repositoryURL": "https://github.com/apple/swift-nio.git",
88+
"state": {
89+
"branch": null,
90+
"revision": "bad7c297427b5efedb96c4044f9e57b42881e9ea",
91+
"version": "1.7.0"
92+
}
93+
},
94+
{
95+
"package": "swift-nio-ssl",
96+
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
97+
"state": {
98+
"branch": null,
99+
"revision": "38955a5f806a952daf2b16fbfe9aa529749cf1dd",
10100
"version": "1.1.0"
11101
}
12102
},
13103
{
14-
"package": "Console",
15-
"repositoryURL": "https://github.com/vapor/console.git",
104+
"package": "swift-nio-ssl-support",
105+
"repositoryURL": "https://github.com/apple/swift-nio-ssl-support.git",
16106
"state": {
17107
"branch": null,
18-
"revision": "df9eb9a6afd03851abcb3d8204d04c368729776e",
19-
"version": "2.3.0"
108+
"revision": "c02eec4e0e6d351cd092938cf44195a8e669f555",
109+
"version": "1.0.0"
20110
}
21111
},
22112
{
23-
"package": "Core",
24-
"repositoryURL": "https://github.com/vapor/core.git",
113+
"package": "swift-nio-zlib-support",
114+
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
115+
"state": {
116+
"branch": null,
117+
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
118+
"version": "1.0.0"
119+
}
120+
},
121+
{
122+
"package": "TemplateKit",
123+
"repositoryURL": "https://github.com/vapor/template-kit.git",
124+
"state": {
125+
"branch": null,
126+
"revision": "43b57b5861d5181b906ac6411d28645e980bb638",
127+
"version": "1.0.1"
128+
}
129+
},
130+
{
131+
"package": "URLEncodedForm",
132+
"repositoryURL": "https://github.com/vapor/url-encoded-form.git",
25133
"state": {
26134
"branch": null,
27-
"revision": "f9f3a585ab0ea5764b46d7a36d9c0d9d508b9c63",
28-
"version": "2.2.0"
135+
"revision": "57cf7fb9c1a1014c50bc05123684a9139ad44127",
136+
"version": "1.0.3"
29137
}
30138
},
31139
{
32-
"package": "Debugging",
33-
"repositoryURL": "https://github.com/vapor/debugging.git",
140+
"package": "Validation",
141+
"repositoryURL": "https://github.com/vapor/validation.git",
34142
"state": {
35143
"branch": null,
36-
"revision": "fc5a27d6eb236141dc24e5f14eedaa2e035ae7b3",
37-
"version": "1.1.1"
144+
"revision": "ab6c5a352d97c8687b91ed4963aef8e7cfe0795b",
145+
"version": "2.0.0"
38146
}
39147
},
40148
{
41-
"package": "JSON",
42-
"repositoryURL": "https://github.com/vapor/json.git",
149+
"package": "Vapor",
150+
"repositoryURL": "https://github.com/vapor/vapor.git",
43151
"state": {
44152
"branch": null,
45-
"revision": "735800d8f2e75ebe3be25559eb6a781f4666dcfc",
46-
"version": "2.2.1"
153+
"revision": "39b4d3fa36e58c6f7415c9da6c65a703bec34cea",
154+
"version": "3.0.3"
47155
}
48156
},
49157
{
50-
"package": "Node",
51-
"repositoryURL": "https://github.com/vapor/node.git",
158+
"package": "WebSocket",
159+
"repositoryURL": "https://github.com/vapor/websocket.git",
52160
"state": {
53161
"branch": null,
54-
"revision": "c4ff32f07657aec849677e5aecb657bb6c85098d",
55-
"version": "2.1.4"
162+
"revision": "141cb4d3814dc8062cb0b2f43e72801b5dfcf272",
163+
"version": "1.0.1"
56164
}
57165
}
58166
]

‎Package.swift

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import PackageDescription
55
let package = Package(
66
name: "Ether",
77
dependencies: [
8-
.package(url: "https://github.com/vapor/console.git", .exact("2.3.0")),
9-
.package(url: "https://github.com/vapor/json.git", .exact("2.2.1")),
10-
.package(url: "https://github.com/vapor/core.git", .exact("2.2.0"))
8+
.package(url: "https://github.com/vapor/vapor.git", from: "3.0.3"),
9+
.package(url: "https://github.com/vapor/console.git", from: "3.0.2"),
10+
.package(url: "https://github.com/vapor/core.git", from: "3.1.7"),
11+
.package(url: "https://github.com/Ether-CLI/Manifest.git", from: "0.4.4")
1112
],
1213
targets: [
13-
.target(name: "Helpers", dependencies: ["Core", "JSON"]),
14-
.target(name: "Ether", dependencies: ["Helpers", "Console", "JSON"]),
15-
.target(name: "Executable", dependencies: ["Ether"])
14+
.target(name: "Helpers", dependencies: ["Core", "Console"]),
15+
.target(name: "Ether", dependencies: ["Vapor", "Helpers", "Console", "Command", "Manifest", "Core"]),
16+
.target(name: "Executable", dependencies: ["Vapor", "Ether", "Console"])
1617
]
1718
)

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
# Ether
88

9+
[![Mentioned in Awesome Vapor](https://awesome.re/mentioned-badge.svg)](https://github.com/Cellane/awesome-vapor)
10+
911
**Notice!**
1012

1113
Ether is currently out of comission because the service that was used to fetch package data from (IBM's package catalog) is [no longer hosted](https://packagecatalog.com/). There is work going on for a [replacement](https://github.com/vapor-community/PackageCatalogAPI), but development is moving slowly. If you wold like to pitch in, pop on over to the [Vapor Slack](https://vapor.team/) and ping me @calebkleveter!

‎Sources/Ether/CleanManifest.swift

-42
This file was deleted.

0 commit comments

Comments
 (0)