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

Replace NSTimeZone with TimeZone

Browse Source
This commit is contained in:
Matt Rubin 2016-12-07 00:29:27 -05:00
parent b6c3c795bc
commit 003464dde8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SwiftGit2/Objects.swift
View File

@ -35,14 +35,14 @@ public struct Signature {
public let time: Date public let time: Date
/// The time zone that `time` should be interpreted relative to. /// The time zone that `time` should be interpreted relative to.
public let timeZone: NSTimeZone public let timeZone: TimeZone
/// Create an instance with a libgit2 `git_signature`. /// Create an instance with a libgit2 `git_signature`.
public init(_ signature: git_signature) { public init(_ signature: git_signature) {
name = String(validatingUTF8: signature.name)! name = String(validatingUTF8: signature.name)!
email = String(validatingUTF8: signature.email)! email = String(validatingUTF8: signature.email)!
time = Date(timeIntervalSince1970: TimeInterval(signature.when.time)) time = Date(timeIntervalSince1970: TimeInterval(signature.when.time))
timeZone = NSTimeZone(forSecondsFromGMT: NSInteger(60 * signature.when.offset)) timeZone = TimeZone(secondsFromGMT: 60 * Int(signature.when.offset))!
} }
} }
@ -56,7 +56,7 @@ public func == (lhs: Signature, rhs: Signature) -> Bool {
return lhs.name == rhs.name return lhs.name == rhs.name
&& lhs.email == rhs.email && lhs.email == rhs.email
&& lhs.time == rhs.time && lhs.time == rhs.time
&& lhs.timeZone.secondsFromGMT == rhs.timeZone.secondsFromGMT && lhs.timeZone == rhs.timeZone
} }
/// A git commit. /// A git commit.

2
SwiftGit2Tests/ObjectsSpec.swift
View File

@ -37,7 +37,7 @@ class SignatureSpec: QuickSpec {
expect(signature.name).to(equal("Matt Diephouse")) expect(signature.name).to(equal("Matt Diephouse"))
expect(signature.email).to(equal("matt@diephouse.com")) expect(signature.email).to(equal("matt@diephouse.com"))
expect(signature.time).to(equal(Date(timeIntervalSince1970: 1416186947))) expect(signature.time).to(equal(Date(timeIntervalSince1970: 1416186947)))
expect(signature.timeZone.abbreviation).to(equal("GMT-5")) expect(signature.timeZone.abbreviation()).to(equal("GMT-5"))
} }
} }