Skip to content

Commit

Permalink
Merge pull request #18 from Ether-CLI/develop
Browse files Browse the repository at this point in the history
Ether 2018
  • Loading branch information
calebkleveter authored May 18, 2018
2 parents bb2bb84 + 6e7b81e commit aec61b0
Show file tree
Hide file tree
Showing 25 changed files with 762 additions and 1,349 deletions.
File renamed without changes.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [2018.05.18]

### Updated
- Rewrote whole CLI with Console 3, Manifest, and the vapor-community/PackageCatalogAPI.

## [1.10.0] 2018-02-18

### Added
Expand Down
154 changes: 131 additions & 23 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,165 @@
"object": {
"pins": [
{
"package": "Bits",
"repositoryURL": "https://github.com/vapor/bits.git",
"package": "Console",
"repositoryURL": "https://github.com/vapor/console.git",
"state": {
"branch": null,
"revision": "5b9796d39f201b3dd06800437abd9d774a455e57",
"version": "3.0.2"
}
},
{
"package": "Core",
"repositoryURL": "https://github.com/vapor/core.git",
"state": {
"branch": null,
"revision": "a909eccc41941faac6fb9e511cdb9a5cb30a05de",
"version": "3.1.7"
}
},
{
"package": "Crypto",
"repositoryURL": "https://github.com/vapor/crypto.git",
"state": {
"branch": null,
"revision": "1b8c2ba5a42f1adf2aa812204678d8b16466fa59",
"version": "3.1.2"
}
},
{
"package": "DatabaseKit",
"repositoryURL": "https://github.com/vapor/database-kit.git",
"state": {
"branch": null,
"revision": "0db303439e5ef8b6df50a2b6c4029edddee90cb0",
"version": "1.0.1"
}
},
{
"package": "HTTP",
"repositoryURL": "https://github.com/vapor/http.git",
"state": {
"branch": null,
"revision": "5e766f72d81ef5fe8805d704efdffd17e4906134",
"version": "3.0.6"
}
},
{
"package": "Manifest",
"repositoryURL": "https://github.com/Ether-CLI/Manifest.git",
"state": {
"branch": null,
"revision": "a200f9a6af998f787ac4ea7b92802f7b139d499f",
"version": "0.4.5"
}
},
{
"package": "Multipart",
"repositoryURL": "https://github.com/vapor/multipart.git",
"state": {
"branch": null,
"revision": "c32f5e6ae2007dccd21a92b7e33eba842dd80d2f",
"revision": "7778dcb62f3efa845e8e2808937bb347575ba7ce",
"version": "3.0.1"
}
},
{
"package": "Routing",
"repositoryURL": "https://github.com/vapor/routing.git",
"state": {
"branch": null,
"revision": "3219e328491b0853b8554c5a694add344d2c6cfb",
"version": "3.0.1"
}
},
{
"package": "Service",
"repositoryURL": "https://github.com/vapor/service.git",
"state": {
"branch": null,
"revision": "281a70b69783891900be31a9e70051b6fe19e146",
"version": "1.0.0"
}
},
{
"package": "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git",
"state": {
"branch": null,
"revision": "bad7c297427b5efedb96c4044f9e57b42881e9ea",
"version": "1.7.0"
}
},
{
"package": "swift-nio-ssl",
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
"state": {
"branch": null,
"revision": "38955a5f806a952daf2b16fbfe9aa529749cf1dd",
"version": "1.1.0"
}
},
{
"package": "Console",
"repositoryURL": "https://github.com/vapor/console.git",
"package": "swift-nio-ssl-support",
"repositoryURL": "https://github.com/apple/swift-nio-ssl-support.git",
"state": {
"branch": null,
"revision": "df9eb9a6afd03851abcb3d8204d04c368729776e",
"version": "2.3.0"
"revision": "c02eec4e0e6d351cd092938cf44195a8e669f555",
"version": "1.0.0"
}
},
{
"package": "Core",
"repositoryURL": "https://github.com/vapor/core.git",
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
}
},
{
"package": "TemplateKit",
"repositoryURL": "https://github.com/vapor/template-kit.git",
"state": {
"branch": null,
"revision": "43b57b5861d5181b906ac6411d28645e980bb638",
"version": "1.0.1"
}
},
{
"package": "URLEncodedForm",
"repositoryURL": "https://github.com/vapor/url-encoded-form.git",
"state": {
"branch": null,
"revision": "f9f3a585ab0ea5764b46d7a36d9c0d9d508b9c63",
"version": "2.2.0"
"revision": "57cf7fb9c1a1014c50bc05123684a9139ad44127",
"version": "1.0.3"
}
},
{
"package": "Debugging",
"repositoryURL": "https://github.com/vapor/debugging.git",
"package": "Validation",
"repositoryURL": "https://github.com/vapor/validation.git",
"state": {
"branch": null,
"revision": "fc5a27d6eb236141dc24e5f14eedaa2e035ae7b3",
"version": "1.1.1"
"revision": "ab6c5a352d97c8687b91ed4963aef8e7cfe0795b",
"version": "2.0.0"
}
},
{
"package": "JSON",
"repositoryURL": "https://github.com/vapor/json.git",
"package": "Vapor",
"repositoryURL": "https://github.com/vapor/vapor.git",
"state": {
"branch": null,
"revision": "735800d8f2e75ebe3be25559eb6a781f4666dcfc",
"version": "2.2.1"
"revision": "39b4d3fa36e58c6f7415c9da6c65a703bec34cea",
"version": "3.0.3"
}
},
{
"package": "Node",
"repositoryURL": "https://github.com/vapor/node.git",
"package": "WebSocket",
"repositoryURL": "https://github.com/vapor/websocket.git",
"state": {
"branch": null,
"revision": "c4ff32f07657aec849677e5aecb657bb6c85098d",
"version": "2.1.4"
"revision": "141cb4d3814dc8062cb0b2f43e72801b5dfcf272",
"version": "1.0.1"
}
}
]
Expand Down
13 changes: 7 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import PackageDescription
let package = Package(
name: "Ether",
dependencies: [
.package(url: "https://github.com/vapor/console.git", .exact("2.3.0")),
.package(url: "https://github.com/vapor/json.git", .exact("2.2.1")),
.package(url: "https://github.com/vapor/core.git", .exact("2.2.0"))
.package(url: "https://github.com/vapor/vapor.git", from: "3.0.3"),
.package(url: "https://github.com/vapor/console.git", from: "3.0.2"),
.package(url: "https://github.com/vapor/core.git", from: "3.1.7"),
.package(url: "https://github.com/Ether-CLI/Manifest.git", from: "0.4.4")
],
targets: [
.target(name: "Helpers", dependencies: ["Core", "JSON"]),
.target(name: "Ether", dependencies: ["Helpers", "Console", "JSON"]),
.target(name: "Executable", dependencies: ["Ether"])
.target(name: "Helpers", dependencies: ["Core", "Console"]),
.target(name: "Ether", dependencies: ["Vapor", "Helpers", "Console", "Command", "Manifest", "Core"]),
.target(name: "Executable", dependencies: ["Vapor", "Ether", "Console"])
]
)
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

# Ether

[![Mentioned in Awesome Vapor](https://awesome.re/mentioned-badge.svg)](https://github.com/Cellane/awesome-vapor)

**Notice!**

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!
Expand Down
42 changes: 0 additions & 42 deletions Sources/Ether/CleanManifest.swift

This file was deleted.

Loading

0 comments on commit aec61b0

Please sign in to comment.