Skip to content

Commit 64232f1

Browse files
Merge pull request #27 from Ether-CLI/develop
Fixed Package Data Fetch Hanging
2 parents 4045282 + fb62b47 commit 64232f1

File tree

6 files changed

+48
-17
lines changed

6 files changed

+48
-17
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [2018.06.15]
2+
3+
### Added
4+
- `remove` and `version set` commands are case-insensitive.
5+
6+
### Fixed
7+
- Some problem where the package data fetch would hang.
8+
19
## [2018.05.25]
210

311
### Added

Package.resolved

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
# Ether
88

99
[![Mentioned in Awesome Vapor](https://awesome.re/mentioned-badge.svg)](https://github.com/Cellane/awesome-vapor)
10+
![Built with Swift 4.2](https://img.shields.io/badge/swift-4.2-orange.svg)
11+
1012

1113
## What is it?
1214

@@ -134,15 +136,36 @@ Example output:
134136

135137
Updating Ether [Done]
136138

137-
### Template
139+
### Template Create
138140

139141
Saves the current state of the project as a template that can be used later when creating a new project.
140142

141-
ether template <name>
143+
ether template create <name>
142144

143145
Example output:
144146

145147
Saving Template [Done]
148+
149+
### Template Remove
150+
151+
Saves the current state of the project as a template that can be used later when creating a new project.
152+
153+
ether template remove <name>
154+
155+
Example output:
156+
157+
Deleting Template [Done]
158+
159+
### Template List
160+
161+
Saves the current state of the project as a template that can be used later when creating a new project.
162+
163+
ether template list
164+
165+
Example output:
166+
167+
- Vapor
168+
- CLI
146169

147170
### New
148171

Sources/Ether/Remove.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class Remove: Command {
4444
let name = try context.argument("name")
4545
let pinCount = try Manifest.current.resolved().object.pins.count
4646

47-
guard let pin = try Manifest.current.resolved().object.pins.filter({ $0.package == name }).first else {
47+
guard let pin = try Manifest.current.resolved().object.pins.filter({ $0.package.lowercased() == name.lowercased() }).first else {
4848
throw EtherError(identifier: "pinNotFound", reason: "No package was found with the name '\(name)'")
4949
}
5050

Sources/Ether/Update.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final class Update: Command {
3939
let updating = context.console.loadingBar(title: "Updating Ether")
4040
_ = updating.start(on: context.container)
4141

42-
_ = try Process.execute("bash", ["-c", "curl https://raw.githubusercontent.com/calebkleveter/Ether/master/install.sh | bash"])
42+
_ = try Process.execute("bash", ["-c", "curl https://raw.githubusercontent.com/Ether-CLI/Ether/master/install.sh | bash"])
4343

4444
updating.succeed()
4545
self.printEtherArt(with: context.console)

Sources/Ether/Version/VersionSet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class VersionSet: Command {
5252
let version = try context.argument("version")
5353
let versionLitteral = try self.version(from: context.options, with: version)
5454

55-
guard let url = try Manifest.current.resolved().object.pins.filter({ $0.package == package }).first?.repositoryURL else {
55+
guard let url = try Manifest.current.resolved().object.pins.filter({ $0.package.lowercased() == package.lowercased() }).first?.repositoryURL else {
5656
throw EtherError(identifier: "pinNotFound", reason: "No pin entry found for package name '\(package)'")
5757
}
5858
guard let dependency = try Manifest.current.dependency(withURL: url) else {

0 commit comments

Comments
 (0)