From 1286777f80d5a695502dccd4248ed64ecb8ee18d Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Fri, 25 May 2018 12:13:06 -0500 Subject: [PATCH 1/7] swift package update --- Package.resolved | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index d768864..5b61a3f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/vapor/core.git", "state": { "branch": null, - "revision": "a909eccc41941faac6fb9e511cdb9a5cb30a05de", - "version": "3.1.7" + "revision": "3b72f2cc3fb21d505fbe97215418951a8e4a2871", + "version": "3.2.1" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "80363d9d8c1c572d228350ea87132bfa49c8ca03", - "version": "1.7.1" + "revision": "77dc77b9b5cdddfb3c385c5ee6cb74153d284967", + "version": "1.7.2" } }, { From 75b9dbec721e9c5636dc3df2c787e24610053c1a Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Wed, 6 Jun 2018 17:22:12 -0500 Subject: [PATCH 2/7] Made package matching for Remove command case-insensitive --- Sources/Ether/Remove.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Ether/Remove.swift b/Sources/Ether/Remove.swift index 1c00163..9833670 100644 --- a/Sources/Ether/Remove.swift +++ b/Sources/Ether/Remove.swift @@ -44,7 +44,7 @@ public final class Remove: Command { let name = try context.argument("name") let pinCount = try Manifest.current.resolved().object.pins.count - guard let pin = try Manifest.current.resolved().object.pins.filter({ $0.package == name }).first else { + guard let pin = try Manifest.current.resolved().object.pins.filter({ $0.package.lowercased() == name.lowercased() }).first else { throw EtherError(identifier: "pinNotFound", reason: "No package was found with the name '\(name)'") } From 8e89f55b08f6538ca35e71376061637a0bc1bd2a Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Wed, 6 Jun 2018 17:24:10 -0500 Subject: [PATCH 3/7] Updated ether update script URI --- Sources/Ether/Update.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Ether/Update.swift b/Sources/Ether/Update.swift index ce31cdc..6766980 100644 --- a/Sources/Ether/Update.swift +++ b/Sources/Ether/Update.swift @@ -39,7 +39,7 @@ public final class Update: Command { let updating = context.console.loadingBar(title: "Updating Ether") _ = updating.start(on: context.container) - _ = try Process.execute("bash", ["-c", "curl https://raw.githubusercontent.com/calebkleveter/Ether/master/install.sh | bash"]) + _ = try Process.execute("bash", ["-c", "curl https://raw.githubusercontent.com/Ether-CLI/Ether/master/install.sh | bash"]) updating.succeed() self.printEtherArt(with: context.console) From 902f9ada8db4014b4d8de60dfb28e22b6a5863e5 Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Wed, 6 Jun 2018 17:26:09 -0500 Subject: [PATCH 4/7] Made package matching for Version Set command case-insensitive --- Sources/Ether/Version/VersionSet.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Ether/Version/VersionSet.swift b/Sources/Ether/Version/VersionSet.swift index ada67e5..75a9dab 100644 --- a/Sources/Ether/Version/VersionSet.swift +++ b/Sources/Ether/Version/VersionSet.swift @@ -52,7 +52,7 @@ public final class VersionSet: Command { let version = try context.argument("version") let versionLitteral = try self.version(from: context.options, with: version) - guard let url = try Manifest.current.resolved().object.pins.filter({ $0.package == package }).first?.repositoryURL else { + guard let url = try Manifest.current.resolved().object.pins.filter({ $0.package.lowercased() == package.lowercased() }).first?.repositoryURL else { throw EtherError(identifier: "pinNotFound", reason: "No pin entry found for package name '\(package)'") } guard let dependency = try Manifest.current.dependency(withURL: url) else { From 8cf47f8ea41b59c504b0fde7d8044781bdcf51c9 Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Fri, 15 Jun 2018 13:52:19 -0500 Subject: [PATCH 5/7] swift package update --- Package.resolved | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Package.resolved b/Package.resolved index 5b61a3f..3935e71 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/vapor/core.git", "state": { "branch": null, - "revision": "3b72f2cc3fb21d505fbe97215418951a8e4a2871", - "version": "3.2.1" + "revision": "e5582911ed940289212a36321e15ec561d947dbe", + "version": "3.3.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/vapor/crypto.git", "state": { "branch": null, - "revision": "1b8c2ba5a42f1adf2aa812204678d8b16466fa59", - "version": "3.1.2" + "revision": "4b85405430df1892ee3aa1554bdb477e96cf46ad", + "version": "3.2.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/vapor/database-kit.git", "state": { "branch": null, - "revision": "0db303439e5ef8b6df50a2b6c4029edddee90cb0", - "version": "1.0.1" + "revision": "4ac3e7437f9b95ce32b4d970bafa590bb3579647", + "version": "1.1.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/vapor/http.git", "state": { "branch": null, - "revision": "5e766f72d81ef5fe8805d704efdffd17e4906134", - "version": "3.0.6" + "revision": "8123ea00e9858b369cd168d0303d33e7d3804d19", + "version": "3.0.7" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "77dc77b9b5cdddfb3c385c5ee6cb74153d284967", - "version": "1.7.2" + "revision": "695afc5205aaa49fca092b94b479ff71c43d9d3c", + "version": "1.8.0" } }, { @@ -150,8 +150,8 @@ "repositoryURL": "https://github.com/vapor/vapor.git", "state": { "branch": null, - "revision": "39b4d3fa36e58c6f7415c9da6c65a703bec34cea", - "version": "3.0.3" + "revision": "09faa90db7ca49d7f75d5f8e385abce93bc7afb3", + "version": "3.0.4" } }, { From cf08868cea2655e4d20b3d296dd07e451a0c1839 Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Fri, 15 Jun 2018 17:32:10 -0500 Subject: [PATCH 6/7] Added 2018.06.15 entry to CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44681b3..f395de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## [2018.06.15] + +### Added +- `remove` and `version set` commands are case-insensitive. + +### Fixed +- Some problem where the package data fetch would hang. + ## [2018.05.25] ### Added From fb62b47ad5e842f24d0a5c9468bef2dba7859687 Mon Sep 17 00:00:00 2001 From: Caleb Kleveter Date: Fri, 15 Jun 2018 17:50:57 -0500 Subject: [PATCH 7/7] Fixed 'tamplate' command docs. Added Swifty version badge to README --- README.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 01c9d13..88d3f92 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ # Ether [![Mentioned in Awesome Vapor](https://awesome.re/mentioned-badge.svg)](https://github.com/Cellane/awesome-vapor) +![Built with Swift 4.2](https://img.shields.io/badge/swift-4.2-orange.svg) + ## What is it? @@ -134,15 +136,36 @@ Example output: Updating Ether [Done] -### Template +### Template Create Saves the current state of the project as a template that can be used later when creating a new project. - ether template + ether template create Example output: Saving Template [Done] + +### Template Remove + +Saves the current state of the project as a template that can be used later when creating a new project. + + ether template remove + +Example output: + + Deleting Template [Done] + +### Template List + +Saves the current state of the project as a template that can be used later when creating a new project. + + ether template list + +Example output: + + - Vapor + - CLI ### New