Skip to content

Commit

Permalink
Renamed project to Ether
Browse files Browse the repository at this point in the history
  • Loading branch information
calebkleveter committed May 25, 2017
1 parent bfe6972 commit d327e19
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Package.pins
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"package": "Core",
"reason": null,
"repositoryURL": "https://github.com/vapor/core.git",
"version": "2.0.1"
"version": "2.0.2"
},
{
"package": "Debugging",
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import PackageDescription

let package = Package(
name: "Haze",
name: "Ether",
targets: [
Target(name: "Helpers"),
Target(name: "Haze", dependencies: ["Helpers"]),
Target(name: "Executable", dependencies: ["Haze"])
Target(name: "Ether", dependencies: ["Helpers"]),
Target(name: "Executable", dependencies: ["Ether"])
],
dependencies: [
.Package(url: "https://github.com/vapor/console.git", majorVersion: 2),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

import Console

enum HazeError: Error {
enum EtherError: Error {
case fail(String)
}

func fail(bar: LoadingBar, with message: String) -> Error {
bar.fail()
return HazeError.fail(message)
return EtherError.fail(message)
}
2 changes: 1 addition & 1 deletion Sources/Haze/Install.swift → Sources/Ether/Install.swift
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public final class Install: Command {
let regex = try NSRegularExpression(pattern: "(\\.Package([\\w\\s\\d\\,\\:\\(\\)\\@\\-\\\"\\/\\.])+\\))(?:\\R?)", options: .anchorsMatchLines)

let manager = FileManager.default
if !manager.fileExists(atPath: "\(manager.currentDirectoryPath)/Package.swift") { throw HazeError.fail("There is no Package.swift file in the current directory") }
if !manager.fileExists(atPath: "\(manager.currentDirectoryPath)/Package.swift") { throw EtherError.fail("There is no Package.swift file in the current directory") }
let packageData = manager.contents(atPath: "\(manager.currentDirectoryPath)/Package.swift")
let oldPins = try manager.contents(atPath: "\(manager.currentDirectoryPath)/Package.pins")?.json()?["pins"] as? [JSON]

Expand Down
2 changes: 1 addition & 1 deletion Sources/Haze/Remove.swift → Sources/Ether/Remove.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class Remove: Command {
let regex = try NSRegularExpression(pattern: "\\,?\n \\.Package\\(url:\\s?\\\"([\\d\\-\\.\\@\\w\\/\\:])+\(name)\\.git\\\"\\,\\s?([\\w\\d\\:\\(\\)\\s\\,])+\\)", options: .caseInsensitive)
let oldPins = try manager.contents(atPath: "\(manager.currentDirectoryPath)/Package.pins")?.json()?["pins"] as? [JSON]

if !manager.fileExists(atPath: "\(manager.currentDirectoryPath)/Package.swift") { throw HazeError.fail("There is no Package.swift file in the current directory") }
if !manager.fileExists(atPath: "\(manager.currentDirectoryPath)/Package.swift") { throw EtherError.fail("There is no Package.swift file in the current directory") }
let packageData = manager.contents(atPath: "\(manager.currentDirectoryPath)/Package.swift")

guard let packageString = String(data: packageData!, encoding: .utf8) else { throw fail(bar: removingProgressBar, with: "Unable to read Package.swift") }
Expand Down
2 changes: 1 addition & 1 deletion Sources/Haze/Search.swift → Sources/Ether/Search.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public final class Search: Command {

func fail(_ message: String) -> Error {
searchingBar.fail()
return HazeError.fail(message)
return EtherError.fail(message)
}

var totalResults: Int?
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Sources/Executable/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// SOFTWARE.

import Console
import Haze
import Ether
import libc

var arguments = CommandLine.arguments
Expand Down
2 changes: 1 addition & 1 deletion Sources/Helpers/APIClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import Foundation
import Core

public let CKNetworkingErrorDomain = "com.caleb-kleveter.Haze.NetworkingError"
public let CKNetworkingErrorDomain = "com.caleb-kleveter.Ether.NetworkingError"
public let MissingHTTPResponseError: Int = 0

public typealias JSON = [String: AnyObject]
Expand Down

0 comments on commit d327e19

Please sign in to comment.