Spring cleaning (fixed tests, project, updated cocoapods)

BuildaKitTests/Mocks.swift

@@ -9,7 +9,6 @@
 import Foundation
 import BuildaUtils
 @testable import BuildaGitServer
-import Buildasaur
 import XcodeServerSDK
 import BuildaKit
 

BuildaKitTests/SyncPair_PR_Bot_Tests.swift

@@ -11,7 +11,6 @@ import XCTest
 import BuildaUtils
 import BuildaGitServer
 import XcodeServerSDK
-import Buildasaur
 import BuildaKit
 
 //for tuples, XCTAssert... doesn't work for them

BuildaKitTests/SyncerTests.swift

@@ -11,7 +11,6 @@ import XCTest
 import BuildaUtils
 import BuildaGitServer
 import XcodeServerSDK
-import Buildasaur
 import BuildaKit
 
 class SyncerTests: XCTestCase {

Buildasaur.xcodeproj/xcshareddata/xcschemes/Buildasaur.xcscheme

@@ -11,8 +11,7 @@
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3A56876F1A3B93BD0066DB2B"
@@ -26,8 +25,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3A46A2D51B081EF400F0FA4B"
@@ -41,8 +39,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3A58B1391A3B9604003E0266"
@@ -56,8 +53,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3A15464A1B02A32C001EEB45"
@@ -71,8 +67,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AAF6EA31A3CE54900C657FB"
@@ -86,8 +81,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AAF6EC71A3CE57100C657FB"
@@ -101,8 +95,7 @@
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES"
-            hideIssues = "NO">
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3AAF6EED1A3CE5BA00C657FB"
@@ -117,8 +110,7 @@
       buildConfiguration = "Testing"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -140,16 +132,6 @@
                ReferencedContainer = "container:Buildasaur.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3A7F0CBB1BC14E640079A511"
-               BuildableName = "BuildasaurUITests.xctest"
-               BlueprintName = "BuildasaurUITests"
-               ReferencedContainer = "container:Buildasaur.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

Podfile

@@ -1,6 +1,5 @@
 
 plugin 'cocoapods-keys', {
-  :project => "Buildasaur.xcodeproj",
   :keys => [
     "GitHubAPIClientId",
     "GitHubAPIClientSecret",
@@ -11,6 +10,8 @@ plugin 'cocoapods-keys', {
 source 'https://github.com/CocoaPods/Specs.git'
 source 'https://github.com/czechboy0/Podspecs.git'
 
+project 'Buildasaur', 'Testing' => :debug
+
 platform :osx, '10.11'
 use_frameworks!
 inhibit_all_warnings!
@@ -39,8 +40,8 @@ def buildasaur_app_pods
 end
 
 def test_pods
-    # pod 'Nimble', '~> 3.0.0'
-    pod 'Nimble', :git => "https://github.com/Quick/Nimble.git", :commit => "b9256b0bdecc4ef1f659b7663dcd3aab6f43fb5f"
+    pod 'Nimble', :git => "https://github.com/Quick/Nimble.git", :commit => "1730543fcd8b7d7258a3270bb6d3118921d46f9d"
+    pod 'DVR', '~> 0.2.1-snap1'
 end
 
 target 'Buildasaur' do
@@ -54,7 +55,7 @@ target 'BuildaKit' do
 end
 
 target 'BuildaKitTests' do
-    also_xcode_pods
+    buildasaur_app_pods
     test_pods
 end
 
@@ -65,8 +66,8 @@ end
 
 target 'BuildaGitServerTests' do
     pods_for_errbody
+    rac
     test_pods
-    pod 'DVR', '~> 0.2.1-snap1'
 end
 
 target 'BuildaHeartbeatKit' do

Podfile.lock

@@ -2,13 +2,13 @@ PODS:
   - Alamofire (2.0.0-beta.3)
   - BuildaUtils (0.2.8):
     - SwiftSafe (~> 0.1)
-  - Crashlytics (3.6.0):
+  - Crashlytics (3.7.0):
     - Fabric (~> 1.6.3)
-  - CryptoSwift (0.2.2)
+  - CryptoSwift (0.2.3)
   - DVR (0.2.1-snap1)
   - ekgclient (0.3.2):
     - Alamofire (= 2.0.0-beta.3)
-  - Fabric (1.6.4)
+  - Fabric (1.6.6)
   - Ji (1.2.0):
     - Ji/Ji (= 1.2.0)
   - Ji/Ji (1.2.0):
@@ -17,7 +17,7 @@ PODS:
   - KeychainAccess (2.3.3)
   - Keys (1.0.0)
   - Nimble (3.1.0)
-  - OAuthSwift (0.5.0)
+  - OAuthSwift (0.5.1)
   - ReactiveCocoa (4.0.1):
     - ReactiveCocoa/UI (= 4.0.1)
     - Result (~> 1.0.2)
@@ -32,7 +32,7 @@ PODS:
   - Result (1.0.2)
   - Sparkle (1.13.1)
   - SwiftSafe (0.1)
-  - XcodeServerSDK (0.5.7):
+  - XcodeServerSDK (0.5.8):
     - BuildaUtils (~> 0.2.3)
 
 DEPENDENCIES:
@@ -44,7 +44,7 @@ DEPENDENCIES:
   - Ji (~> 1.2.0)
   - KeychainAccess
   - Keys (from `Pods/CocoaPodsKeys`)
-  - Nimble (from `https://github.com/Quick/Nimble.git`, commit `b9256b0bdecc4ef1f659b7663dcd3aab6f43fb5f`)
+  - Nimble (from `https://github.com/Quick/Nimble.git`, commit `1730543fcd8b7d7258a3270bb6d3118921d46f9d`)
   - OAuthSwift
   - ReactiveCocoa (~> 4.0.1)
   - Sparkle
@@ -54,33 +54,33 @@ EXTERNAL SOURCES:
   Keys:
     :path: Pods/CocoaPodsKeys
   Nimble:
-    :commit: b9256b0bdecc4ef1f659b7663dcd3aab6f43fb5f
+    :commit: 1730543fcd8b7d7258a3270bb6d3118921d46f9d
     :git: https://github.com/Quick/Nimble.git
 
 CHECKOUT OPTIONS:
   Nimble:
-    :commit: b9256b0bdecc4ef1f659b7663dcd3aab6f43fb5f
+    :commit: 1730543fcd8b7d7258a3270bb6d3118921d46f9d
     :git: https://github.com/Quick/Nimble.git
 
 SPEC CHECKSUMS:
   Alamofire: 39dddb7d3725d1771b1d2f7099c8bd45bd83ffbb
   BuildaUtils: 0974c128ace30916b9b9429e8585c1c6402593dd
-  Crashlytics: e4e8d02914f2608fbc7bf42b1a7af838b0db67a2
-  CryptoSwift: d382228d6301c09474132417878a741c2a2e68cd
+  Crashlytics: c3a2333dea9e2733d2777f730910321fc9e25c0d
+  CryptoSwift: b2bf37b8e7cc6d682ef3365cb966bc5ae5174aa5
   DVR: 05cb292d3f71608e0a35afa85d475cbb56e37132
   ekgclient: 615e09c9193ea1fa1ef2850863a97a218b161aa4
-  Fabric: ed41fd62173c6bdea24ab02c9d7707161eabb750
+  Fabric: 1abc1e59f11fa39ede6f690ef7309d8563e3ec59
   Ji: ddebb22f9ac445db6e884b66f78ea74fb135fdb7
   KeychainAccess: 9b7e49e48277e329b1b3195e54697ed313d30acf
   Keys: 9c35bf00f612ee1d48556f4a4b9b4551e224e90f
   Nimble: eb2a9b164b9a3f16df6581c692a0bfced7d072a4
-  OAuthSwift: f2e0de083739da5697be095c9af2671242a4ed8b
+  OAuthSwift: d63f7f329f49787319a7e35974c18b10865fe636
   ReactiveCocoa: f7011630aee4deeb16352fcb1b50d6bde9db4f90
   Result: dd3dd71af3fa2e262f1a999e14fba2c25ec14f16
   Sparkle: 2fbd47b869621d1e679c7554e3e19dda02104818
   SwiftSafe: 77ffd12b02678790bec1ef56a2d14ec5036f1fd6
-  XcodeServerSDK: 34e18e12f683fec69ad0a1897d1f5447a660a927
+  XcodeServerSDK: c8ab7afc40cd7eedee41ef6bc0abfd2687aff115
 
-PODFILE CHECKSUM: 47dfc44995c8dd4b0d70371531ae9e3eac1d991e
+PODFILE CHECKSUM: 6ad46ead67ccbcc642faf2bcb006f3ddabd3ccba
 
-COCOAPODS: 1.0.0.beta.3
+COCOAPODS: 1.0.0.beta.4

fastlane/Fastfile

@@ -14,7 +14,8 @@ end
 
 lane :prebuild do
 
-  install_cocoapods_if_needed
+  # Causes problems, don't run for now
+  # install_cocoapods_if_needed
 
   # if you're not me, you need to inject your own GitHub etc app API keys.
   # but don't worry, those are only needed if you'll be using OAuth to authenticate
@@ -34,30 +35,22 @@ end
 lane :install_cocoapods_if_needed do
   ['cocoapods', 'cocoapods-keys'].each do |g|
     begin
-      sh "test $(gem list -i #{g}) == false && gem install #{g}"
+      sh "test $(gem list -i #{g}) == false && gem install #{g} --pre"
     rescue Exception
     end
   end
 end
 
 private_lane :inject_dummy_credentials do
-    # inspired by https://github.com/artsy/eidolon/blob/master/fastlane/Fastfile
     keys = [
       'GitHubAPIClientId', 
       'GitHubAPIClientSecret',
       'BitBucketAPIClientId',
       'BitBucketAPIClientSecret'
     ]
-    commands = keys.map { |key|
-      begin
-        sh "pod keys rm #{key} Buildasaur"
-        sh "pod keys rm #{key} Buildasaur.xcodeproj"
-      rescue Exception
-      end
-
-      "pod keys set #{key} 'INSERT_YOUR_OWN_KEY_HERE' Buildasaur"
-    }.join(' ; ')
-    sh "cd .. ; #{commands}"
+    keys.each { |key|
+      ENV[key] = "FAKE_KEY"
+    }
 end
 
 lane :test do