vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert enum case names to lower camel case

Browse Source 
https://swift.org/documentation/api-design-guidelines/#follow-case-conventions
This commit is contained in:
Matt Rubin 2017-04-24 00:19:27 -04:00
parent b074eff7d7
commit 5b41c977d2
6 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SwiftGit2/Credentials.swift
View File

@ -17,9 +17,9 @@ private class Wrapper<T> {
} }
public enum Credentials { public enum Credentials {
case Default() case `default`()
case Plaintext(username: String, password: String) case plaintext(username: String, password: String)
case SSHMemory(username: String, publicKey: String, privateKey: String, passphrase: String) case sshMemory(username: String, publicKey: String, privateKey: String, passphrase: String)
internal static func fromPointer(_ pointer: UnsafeMutableRawPointer) -> Credentials { internal static func fromPointer(_ pointer: UnsafeMutableRawPointer) -> Credentials {
return Unmanaged<Wrapper<Credentials>>.fromOpaque(UnsafeRawPointer(pointer)).takeRetainedValue().value return Unmanaged<Wrapper<Credentials>>.fromOpaque(UnsafeRawPointer(pointer)).takeRetainedValue().value
@ -38,11 +38,11 @@ internal func credentialsCallback(cred: UnsafeMutablePointer<UnsafeMutablePointe
let result: Int32 let result: Int32
switch Credentials.fromPointer(payload!) { switch Credentials.fromPointer(payload!) {
case .Default(): case .default():
result = git_cred_default_new(cred) result = git_cred_default_new(cred)
case .Plaintext(let username, let password): case .plaintext(let username, let password):
result = git_cred_userpass_plaintext_new(cred, username, password) result = git_cred_userpass_plaintext_new(cred, username, password)
case .SSHMemory(let username, let publicKey, let privateKey, let passphrase): case .sshMemory(let username, let publicKey, let privateKey, let passphrase):
result = git_cred_ssh_key_memory_new(cred, username, publicKey, privateKey, passphrase) result = git_cred_ssh_key_memory_new(cred, username, publicKey, privateKey, passphrase)
} }

40
SwiftGit2/Pointers.swift
View File

@ -23,33 +23,33 @@ public func == <P: PointerType>(lhs: P, rhs: P) -> Bool {
/// A pointer to a git object. /// A pointer to a git object.
public enum Pointer: PointerType { public enum Pointer: PointerType {
case Commit(OID) case commit(OID)
case Tree(OID) case tree(OID)
case Blob(OID) case blob(OID)
case Tag(OID) case tag(OID)
public var oid: OID { public var oid: OID {
switch self { switch self {
case let .Commit(oid): case let .commit(oid):
return oid return oid
case let .Tree(oid): case let .tree(oid):
return oid return oid
case let .Blob(oid): case let .blob(oid):
return oid return oid
case let .Tag(oid): case let .tag(oid):
return oid return oid
} }
} }
public var type: git_otype { public var type: git_otype {
switch self { switch self {
case .Commit: case .commit:
return GIT_OBJ_COMMIT return GIT_OBJ_COMMIT
case .Tree: case .tree:
return GIT_OBJ_TREE return GIT_OBJ_TREE
case .Blob: case .blob:
return GIT_OBJ_BLOB return GIT_OBJ_BLOB
case .Tag: case .tag:
return GIT_OBJ_TAG return GIT_OBJ_TAG
} }
} }
@ -58,13 +58,13 @@ public enum Pointer: PointerType {
init?(oid: OID, type: git_otype) { init?(oid: OID, type: git_otype) {
switch type { switch type {
case GIT_OBJ_COMMIT: case GIT_OBJ_COMMIT:
self = .Commit(oid) self = .commit(oid)
case GIT_OBJ_TREE: case GIT_OBJ_TREE:
self = .Tree(oid) self = .tree(oid)
case GIT_OBJ_BLOB: case GIT_OBJ_BLOB:
self = .Blob(oid) self = .blob(oid)
case GIT_OBJ_TAG: case GIT_OBJ_TAG:
self = .Tag(oid) self = .tag(oid)
default: default:
return nil return nil
} }
@ -80,13 +80,13 @@ extension Pointer: Hashable {
extension Pointer: CustomStringConvertible { extension Pointer: CustomStringConvertible {
public var description: String { public var description: String {
switch self { switch self {
case .Commit: case .commit:
return "commit(\(oid))" return "commit(\(oid))"
case .Tree: case .tree:
return "tree(\(oid))" return "tree(\(oid))"
case .Blob: case .blob:
return "blob(\(oid))" return "blob(\(oid))"
case .Tag: case .tag:
return "tag(\(oid))" return "tag(\(oid))"
} }
} }

16
SwiftGit2/References.swift
View File

@ -130,17 +130,17 @@ extension Branch: Hashable {
/// A git tag reference, which can be either a lightweight tag or a Tag object. /// A git tag reference, which can be either a lightweight tag or a Tag object.
public enum TagReference: ReferenceType { public enum TagReference: ReferenceType {
/// A lightweight tag, which is just a name and an OID. /// A lightweight tag, which is just a name and an OID.
case Lightweight(String, OID) case lightweight(String, OID)
/// An annotated tag, which points to a Tag object. /// An annotated tag, which points to a Tag object.
case Annotated(String, Tag) case annotated(String, Tag)
/// The full name of the reference (e.g., `refs/tags/my-tag`). /// The full name of the reference (e.g., `refs/tags/my-tag`).
public var longName: String { public var longName: String {
switch self { switch self {
case let .Lightweight(name, _): case let .lightweight(name, _):
return name return name
case let .Annotated(name, _): case let .annotated(name, _):
return name return name
} }
} }
@ -155,9 +155,9 @@ public enum TagReference: ReferenceType {
/// If this is an annotated tag, the OID will be the tag's target. /// If this is an annotated tag, the OID will be the tag's target.
public var oid: OID { public var oid: OID {
switch self { switch self {
case let .Lightweight(_, oid): case let .lightweight(_, oid):
return oid return oid
case let .Annotated(_, tag): case let .annotated(_, tag):
return tag.target.oid return tag.target.oid
} }
} }
@ -185,9 +185,9 @@ public enum TagReference: ReferenceType {
var pointer: OpaquePointer? = nil var pointer: OpaquePointer? = nil
let result = git_object_lookup(&pointer, repo, &oid, GIT_OBJ_TAG) let result = git_object_lookup(&pointer, repo, &oid, GIT_OBJ_TAG)
if result == GIT_OK.rawValue { if result == GIT_OK.rawValue {
self = .Annotated(name, Tag(pointer!)) self = .annotated(name, Tag(pointer!))
} else { } else {
self = .Lightweight(name, OID(oid)) self = .lightweight(name, OID(oid))
} }
git_object_free(pointer) git_object_free(pointer)
} }

10
SwiftGit2/Repository.swift
View File

@ -130,7 +130,7 @@ final public class Repository {
/// ///
/// Returns a `Result` with a `Repository` or an error. /// Returns a `Result` with a `Repository` or an error.
class public func clone(from remoteURL: URL, to localURL: URL, localClone: Bool = false, bare: Bool = false, class public func clone(from remoteURL: URL, to localURL: URL, localClone: Bool = false, bare: Bool = false,
credentials: Credentials = .Default(), checkoutStrategy: CheckoutStrategy = .Safe, credentials: Credentials = .default(), checkoutStrategy: CheckoutStrategy = .Safe,
checkoutProgress: CheckoutProgressBlock? = nil) -> Result<Repository, NSError> { checkoutProgress: CheckoutProgressBlock? = nil) -> Result<Repository, NSError> {
var options = cloneOptions( var options = cloneOptions(
bare: bare, localClone: localClone, bare: bare, localClone: localClone,
@ -287,13 +287,13 @@ final public class Repository {
/// Returns the object if it exists, or an error. /// Returns the object if it exists, or an error.
public func object(from pointer: Pointer) -> Result<ObjectType, NSError> { public func object(from pointer: Pointer) -> Result<ObjectType, NSError> {
switch pointer { switch pointer {
case let .Blob(oid): case let .blob(oid):
return blob(oid).map { $0 as ObjectType } return blob(oid).map { $0 as ObjectType }
case let .Commit(oid): case let .commit(oid):
return commit(oid).map { $0 as ObjectType } return commit(oid).map { $0 as ObjectType }
case let .Tag(oid): case let .tag(oid):
return tag(oid).map { $0 as ObjectType } return tag(oid).map { $0 as ObjectType }
case let .Tree(oid): case let .tree(oid):
return tree(oid).map { $0 as ObjectType } return tree(oid).map { $0 as ObjectType }
} }
} }

8
SwiftGit2Tests/ObjectsSpec.swift
View File

@ -174,7 +174,7 @@ class TreeEntrySpec: QuickSpec {
describe("Tree.Entry(attributes:object:name:)") { describe("Tree.Entry(attributes:object:name:)") {
it("should set its properties") { it("should set its properties") {
let attributes = Int32(GIT_FILEMODE_BLOB.rawValue) let attributes = Int32(GIT_FILEMODE_BLOB.rawValue)
let object = Pointer.Blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!) let object = Pointer.blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!)
let name = "README.md" let name = "README.md"
let entry = Tree.Entry(attributes: attributes, object: object, name: name) let entry = Tree.Entry(attributes: attributes, object: object, name: name)
@ -191,7 +191,7 @@ class TreeEntrySpec: QuickSpec {
let entry = repo.withGitObject(oid) { Tree.Entry(git_tree_entry_byindex($0, 0)) } let entry = repo.withGitObject(oid) { Tree.Entry(git_tree_entry_byindex($0, 0)) }
expect(entry.attributes).to(equal(Int32(GIT_FILEMODE_BLOB.rawValue))) expect(entry.attributes).to(equal(Int32(GIT_FILEMODE_BLOB.rawValue)))
expect(entry.object).to(equal(Pointer.Blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!))) expect(entry.object).to(equal(Pointer.blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!)))
expect(entry.name).to(equal("README.md")) expect(entry.name).to(equal("README.md"))
} }
} }
@ -240,7 +240,7 @@ class TreeSpec: QuickSpec {
let tree = repo.withGitObject(oid) { Tree($0) } let tree = repo.withGitObject(oid) { Tree($0) }
let entries = [ let entries = [
"README.md": Tree.Entry(attributes: Int32(GIT_FILEMODE_BLOB.rawValue), "README.md": Tree.Entry(attributes: Int32(GIT_FILEMODE_BLOB.rawValue),
object: .Blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!), object: .blob(OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!),
name: "README.md"), name: "README.md"),
] ]
expect(tree.entries).to(equal(entries)) expect(tree.entries).to(equal(entries))
@ -341,7 +341,7 @@ class TagSpec: QuickSpec {
let tagger = repo.withGitObject(oid) { Signature(git_tag_tagger($0).pointee) } let tagger = repo.withGitObject(oid) { Signature(git_tag_tagger($0).pointee) }
expect(tag.oid).to(equal(oid)) expect(tag.oid).to(equal(oid))
expect(tag.target).to(equal(Pointer.Commit(OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")!))) expect(tag.target).to(equal(Pointer.commit(OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")!)))
expect(tag.name).to(equal("tag-1")) expect(tag.name).to(equal("tag-1"))
expect(tag.tagger).to(equal(tagger)) expect(tag.tagger).to(equal(tagger))
expect(tag.message).to(equal("tag-1\n")) expect(tag.message).to(equal("tag-1\n"))

10
SwiftGit2Tests/RepositorySpec.swift
View File

@ -100,7 +100,7 @@ class RepositorySpec: QuickSpec {
it("should be able to clone a remote repository requiring credentials") { it("should be able to clone a remote repository requiring credentials") {
let remoteRepoURL = URL(string: privateRepo) let remoteRepoURL = URL(string: privateRepo)
let localURL = self.temporaryURL(forPurpose: "private-remote-clone") let localURL = self.temporaryURL(forPurpose: "private-remote-clone")
let credentials = Credentials.SSHMemory(username: gitUsername, let credentials = Credentials.sshMemory(username: gitUsername,
publicKey: publicKey, publicKey: publicKey,
privateKey: privateKey, privateKey: privateKey,
passphrase: passphrase) passphrase: passphrase)
@ -313,7 +313,7 @@ class RepositorySpec: QuickSpec {
let repo = Fixtures.simpleRepository let repo = Fixtures.simpleRepository
let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")! let oid = OID(string: "dc220a3f0c22920dab86d4a8d3a3cb7e69d6205a")!
let pointer = Pointer.Commit(oid) let pointer = Pointer.commit(oid)
let commit = repo.commit(oid).value! let commit = repo.commit(oid).value!
let result = repo.object(from: pointer).map { $0 as! Commit } let result = repo.object(from: pointer).map { $0 as! Commit }
expect(result).to(haveSucceeded(equal(commit))) expect(result).to(haveSucceeded(equal(commit)))
@ -323,7 +323,7 @@ class RepositorySpec: QuickSpec {
let repo = Fixtures.simpleRepository let repo = Fixtures.simpleRepository
let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")! let oid = OID(string: "f93e3a1a1525fb5b91020da86e44810c87a2d7bc")!
let pointer = Pointer.Tree(oid) let pointer = Pointer.tree(oid)
let tree = repo.tree(oid).value! let tree = repo.tree(oid).value!
let result = repo.object(from: pointer).map { $0 as! Tree } let result = repo.object(from: pointer).map { $0 as! Tree }
expect(result).to(haveSucceeded(equal(tree))) expect(result).to(haveSucceeded(equal(tree)))
@ -333,7 +333,7 @@ class RepositorySpec: QuickSpec {
let repo = Fixtures.simpleRepository let repo = Fixtures.simpleRepository
let oid = OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")! let oid = OID(string: "41078396f5187daed5f673e4a13b185bbad71fba")!
let pointer = Pointer.Blob(oid) let pointer = Pointer.blob(oid)
let blob = repo.blob(oid).value! let blob = repo.blob(oid).value!
let result = repo.object(from: pointer).map { $0 as! Blob } let result = repo.object(from: pointer).map { $0 as! Blob }
expect(result).to(haveSucceeded(equal(blob))) expect(result).to(haveSucceeded(equal(blob)))
@ -343,7 +343,7 @@ class RepositorySpec: QuickSpec {
let repo = Fixtures.simpleRepository let repo = Fixtures.simpleRepository
let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")! let oid = OID(string: "57943b8ee00348180ceeedc960451562750f6d33")!
let pointer = Pointer.Tag(oid) let pointer = Pointer.tag(oid)
let tag = repo.tag(oid).value! let tag = repo.tag(oid).value!
let result = repo.object(from: pointer).map { $0 as! Tag } let result = repo.object(from: pointer).map { $0 as! Tag }
expect(result).to(haveSucceeded(equal(tag))) expect(result).to(haveSucceeded(equal(tag)))