Swift 2!

BuildaGitServer/GitHubEndpoints.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import XcodeServerSDK
+import BuildaUtils
 
 public class GitHubEndpoints {
 
@@ -137,22 +137,19 @@ public class GitHubEndpoints {
             assert(params?["repo"] != nil, "A repo must be specified")
             let repo = self.endpointURL(.Repos, params: params)
             return "\(repo)/merges"
-
-        default:
-            assertionFailure("Unsupported endpoint")
         }
     }
 
 
-    public func createRequest(method:HTTP.Method, endpoint:Endpoint, params: [String : String]? = nil, query: [String : String]? = nil, body:NSDictionary? = nil) -> NSMutableURLRequest? {
+    public func createRequest(method:HTTP.Method, endpoint:Endpoint, params: [String : String]? = nil, query: [String : String]? = nil, body:NSDictionary? = nil) throws -> NSMutableURLRequest {
 
         let endpointURL = self.endpointURL(endpoint, params: params)
         let queryString = HTTP.stringForQuery(query)
         let wholePath = "\(self.baseURL)\(endpointURL)\(queryString)"
 
         let url = NSURL(string: wholePath)!
 
-        var request = NSMutableURLRequest(URL: url)
+        let request = NSMutableURLRequest(URL: url)
 
         request.HTTPMethod = method.rawValue
         if let token = self.token {
@@ -161,14 +158,7 @@ public class GitHubEndpoints {
 
         if let body = body {
 
-            var error: NSError?
-            let data = NSJSONSerialization.dataWithJSONObject(body, options: .allZeros, error: &error)
-            if let error = error {
-                //parsing error
-                Log.error("Parsing error \(error.description)")
-                return nil
-            }
-
+            let data = try NSJSONSerialization.dataWithJSONObject(body, options: NSJSONWritingOptions())
             request.HTTPBody = data
         }
 

BuildaGitServer/GitHubRateLimit.swift

@@ -28,7 +28,6 @@ public struct GitHubRateLimit {
         let maxRateOfConsumptionPretty = maxRateOfConsumption.clipTo(2)
 
         //how much faster we can be consuming requests before we hit the maximum rate of 5000/hour
-        let extraRateOfConsumption = (maxRateOfConsumption - rateOfConsumption).clipTo(2)
         let usedRatePercent = (100.0 * rateOfConsumption / maxRateOfConsumption).clipTo(2)
 
         let report = "count: \(consumed)/\(self.limit), renews in \(Int(remainingTime)) seconds, rate: \(rateOfConsumptionPretty)/\(maxRateOfConsumptionPretty), using \(usedRatePercent)% of the allowed request rate."

BuildaGitServer/GitHubServer.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import XcodeServerSDK
+import BuildaUtils
 
 public class GitHubServer : GitServer {
 
@@ -180,16 +180,16 @@ extension GitHubServer {
 
         //merge the two params
         if let params = params {
-            for (let key, let value) in params {
+            for (key, value) in params {
                 allParams[key] = value
             }
         }
 
-        if let request = self.endpoints.createRequest(method, endpoint: endpoint, params: allParams, query: query, body: body) {
-
+        do {
+            let request = try self.endpoints.createRequest(method, endpoint: endpoint, params: allParams, query: query, body: body)
             self.sendRequestWithPossiblePagination(request, accumulatedResponseBody: NSArray(), completion: completion)
-        } else {
-            completion(response: nil, body: nil, error: Error.withInfo("Couldn't create Request"))
+        } catch {
+            completion(response: nil, body: nil, error: Error.withInfo("Couldn't create Request, error \(error)"))
         }
     }
 
@@ -373,7 +373,7 @@ extension GitHubServer {
             if let body = body as? NSArray {
                 let statuses: [Status] = GitHubArray(body)
                 //sort them by creation date
-                let mostRecentStatus = statuses.sorted({ return $0.created! > $1.created! }).first
+                let mostRecentStatus = statuses.sort({ return $0.created! > $1.created! }).first
                 completion(status: mostRecentStatus, error: nil)
             } else {
                 completion(status: nil, error: Error.withInfo("Wrong body \(body)"))
@@ -500,7 +500,7 @@ extension GitHubServer {
     *   POST merge a head branch/commit into a base branch.
     *   has a couple of different responses, a bit tricky
     */
-    public func mergeHeadIntoBase(#head: String, base: String, commitMessage: String, repo: String, completion: (result: GitHubEndpoints.MergeResult?, error: NSError?) -> ()) {
+    public func mergeHeadIntoBase(head head: String, base: String, commitMessage: String, repo: String, completion: (result: GitHubEndpoints.MergeResult?, error: NSError?) -> ()) {
 
         let params = [
             "repo": repo

BuildaGitServer/GitHubServerExtensions.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import XcodeServerSDK
+import BuildaUtils
 
 //functions to make working with github easier - utility functions
 public extension GitHubServer {

BuildaGitServer/GitServerPublic.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import XcodeServerSDK
+import BuildaUtils
 
 public class GitServer : HTTPServer {
 

BuildaGitServer/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.honzadvorsky.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

BuildaGitServer/Status.swift

@@ -56,7 +56,7 @@ public class Status : GitHubEntity, Equatable {
 
     public override func dictionarify() -> NSDictionary {
 
-        var dictionary = NSMutableDictionary()
+        let dictionary = NSMutableDictionary()
 
         dictionary["state"] = self.state.rawValue
         dictionary.optionallyAddValueForKey(self.description, key: "description")

BuildaGitServerTests/GitHubServerTests.swift

@@ -10,7 +10,6 @@ import Cocoa
 import XCTest
 import BuildaGitServer
 import BuildaUtils
-import XcodeServerSDK
 
 class GitHubSourceTests: XCTestCase {
 
@@ -33,17 +32,13 @@ class GitHubSourceTests: XCTestCase {
 
         let expect = expectationWithDescription("Waiting for url request")
 
-        if let request = self.github.endpoints.createRequest(method, endpoint: endpoint, params: params) {
-
-            self.github.http.sendRequest(request, completion: { (response, body, error) -> () in
-
-                completion(body: body, error: error)
-                expect.fulfill()
-            })
+        let request = try! self.github.endpoints.createRequest(method, endpoint: endpoint, params: params)
+
+        self.github.http.sendRequest(request, completion: { (response, body, error) -> () in
 
-        } else {
-            assertionFailure("Couldn't create request")
-        }
+            completion(body: body, error: error)
+            expect.fulfill()
+        })
 
         waitForExpectationsWithTimeout(10, handler: nil)
     }
@@ -124,7 +119,7 @@ class GitHubSourceTests: XCTestCase {
 
     func testCommitParsing() {
 
-        let dictionary = [
+        let dictionary: NSDictionary = [
             "sha": "08182438ed2ef3b34bd97db85f39deb60e2dcd7d",
             "url": "https://api.github.com/repos/czechboy0/Buildasaur/commits/08182438ed2ef3b34bd97db85f39deb60e2dcd7d"
         ]

BuildaGitServerTests/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.honzadvorsky.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Buildasaur/BuildTemplate.swift → BuildaKit/BuildTemplate.swift

@@ -11,57 +11,65 @@ import BuildaUtils
 import XcodeServerSDK
 
 private let kKeyUniqueId = "id"
+private let kKeyProjectName = "project_name"
 private let kKeyName = "name"
 private let kKeyScheme = "scheme"
 private let kKeySchedule = "schedule"
 private let kKeyCleaningPolicy = "cleaning_policy"
 private let kKeyTriggers = "triggers"
 private let kKeyTestingDevices = "testing_devices"
-private let kKeyDestinationType = "destination_type"
+private let kKeyDeviceFilter = "device_filter"
+private let kKeyPlatformType = "platform_type"
 private let kKeyShouldAnalyze = "should_analyze"
 private let kKeyShouldTest = "should_test"
 private let kKeyShouldArchive = "should_archive"
 
-class BuildTemplate: JSONSerializable {
+public class BuildTemplate: JSONSerializable {
+
+    public let uniqueId: String //unique id of this build template, so that we can rename them easily
+
+    public var projectName: String?
+    public var name: String?
+    public var scheme: String?
+    public var schedule: BotSchedule? //will be ignored for Synced bots, only useful for Manual creation. default: Manual
+    public var cleaningPolicy: BotConfiguration.CleaningPolicy
+    public var triggers: [Trigger]
+    public var shouldAnalyze: Bool?
+    public var shouldTest: Bool?
+    public var shouldArchive: Bool?
+    public var testingDeviceIds: [String]
+    public var deviceFilter: DeviceFilter.FilterType
+    public var platformType: DevicePlatform.PlatformType?
 
-    var uniqueId: String //unique id of this build template, so that we can rename them easily
-    var name: String?
-    var scheme: String?
-    var schedule: BotSchedule? //will be ignored for Synced bots, only useful for Manual creation. default: Manual
-    var cleaningPolicy: BotConfiguration.CleaningPolicy
-    var triggers: [Trigger]
-    var shouldAnalyze: Bool?
-    var shouldTest: Bool?
-    var shouldArchive: Bool?
-    var destinationType: BotConfiguration.TestingDestinationIdentifier
-    var testingDeviceIds: [String]
-
     func validate() -> Bool {
 
-        if count(self.uniqueId) == 0 { return false }
+        if self.uniqueId.isEmpty { return false }
         if self.name == nil { return false }
         if self.scheme == nil { return false }
         //TODO: add all the other required values! this will be called on saving from the UI to make sure we have all the required fields.
         return true
     }
 
-    init() {
+    public init(projectName: String) {
         self.uniqueId = NSUUID().UUIDString
-        self.name = "New Build Template Name"
+        self.projectName = projectName
+        self.name = "New Build Template"
         self.scheme = nil
         self.schedule = BotSchedule.manualBotSchedule()
         self.cleaningPolicy = BotConfiguration.CleaningPolicy.Never
         self.triggers = []
-        self.destinationType = BotConfiguration.TestingDestinationIdentifier.AllCompatible
         self.shouldAnalyze = false
         self.shouldTest = false
         self.shouldArchive = false
         self.testingDeviceIds = []
+        self.deviceFilter = .AllAvailableDevicesAndSimulators
+        self.platformType = nil
     }
 
-    required init?(json: NSDictionary) {
+    public required init?(json: NSDictionary) {
 
         self.uniqueId = json.optionalStringForKey(kKeyUniqueId) ?? ""
+        self.projectName = json.optionalStringForKey(kKeyProjectName)
         self.name = json.optionalStringForKey(kKeyName)
         self.scheme = json.optionalStringForKey(kKeyScheme)
         if let scheduleDict = json.optionalDictionaryForKey(kKeySchedule) {
@@ -81,37 +89,51 @@ class BuildTemplate: JSONSerializable {
         } else {
             self.triggers = []
         }
-        if
-            let destinationType = json.optionalIntForKey(kKeyDestinationType),
-            let destination = BotConfiguration.TestingDestinationIdentifier(rawValue: destinationType){
-            self.destinationType = destination
-        } else {
-            self.destinationType = .AllCompatible
-        }
+
         self.shouldAnalyze = json.optionalBoolForKey(kKeyShouldAnalyze)
         self.shouldTest = json.optionalBoolForKey(kKeyShouldTest)
         self.shouldArchive = json.optionalBoolForKey(kKeyShouldArchive)
+
         self.testingDeviceIds = json.optionalArrayForKey(kKeyTestingDevices) as? [String] ?? []
-
+
+        if
+            let deviceFilterInt = json.optionalIntForKey(kKeyDeviceFilter),
+            let deviceFilter = DeviceFilter.FilterType(rawValue: deviceFilterInt)
+        {
+            self.deviceFilter = deviceFilter
+        } else {
+            self.deviceFilter = .AllAvailableDevicesAndSimulators
+        }
+
+        if
+            let platformTypeString = json.optionalStringForKey(kKeyPlatformType),
+            let platformType = DevicePlatform.PlatformType(rawValue: platformTypeString) {
+                self.platformType = platformType
+        } else {
+            self.platformType = nil
+        }
+
         if !self.validate() {
             return nil
         }
     }
 
-    func jsonify() -> NSDictionary {
-        var dict = NSMutableDictionary()
+    public func jsonify() -> NSDictionary {
+        let dict = NSMutableDictionary()
 
         dict[kKeyUniqueId] = self.uniqueId
         dict[kKeyTriggers] = self.triggers.map({ $0.dictionarify() })
-        dict[kKeyTestingDevices] = self.testingDeviceIds
+        dict[kKeyDeviceFilter] = self.deviceFilter.rawValue
+        dict[kKeyTestingDevices] = self.testingDeviceIds ?? []
         dict[kKeyCleaningPolicy] = self.cleaningPolicy.rawValue
-        dict[kKeyDestinationType] = self.destinationType.rawValue
+        dict.optionallyAddValueForKey(self.projectName, key: kKeyProjectName)
         dict.optionallyAddValueForKey(self.name, key: kKeyName)
         dict.optionallyAddValueForKey(self.scheme, key: kKeyScheme)
         dict.optionallyAddValueForKey(self.schedule?.dictionarify(), key: kKeySchedule)
         dict.optionallyAddValueForKey(self.shouldAnalyze, key: kKeyShouldAnalyze)
         dict.optionallyAddValueForKey(self.shouldTest, key: kKeyShouldTest)
         dict.optionallyAddValueForKey(self.shouldArchive, key: kKeyShouldArchive)
+        dict.optionallyAddValueForKey(self.platformType?.rawValue, key: kKeyPlatformType)
 
         return dict
     }

BuildaKit/BuildaKit.h

@@ -0,0 +1,19 @@
+//
+//  BuildaKit.h
+//  BuildaKit
+//
+//  Created by Honza Dvorsky on 18/07/2015.
+//  Copyright © 2015 Honza Dvorsky. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for BuildaKit.
+FOUNDATION_EXPORT double BuildaKitVersionNumber;
+
+//! Project version string for BuildaKit.
+FOUNDATION_EXPORT const unsigned char BuildaKitVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <BuildaKit/PublicHeader.h>
+
+