Merge branch 'master' of https://github.com/gnachman/iTerm2

.gitignore

@@ -7,15 +7,12 @@
 *.perspective
 *.perspectivev3
 iTerm2.xcodeproj/project.xcworkspace
-.gitignore
 build/
 .DS_Store
 iTerm.xcodeproj/*
-*.pbxproj
 canary.xml
 testing.xml
 testing_changes.html
-.gitignore
 iTerm.plist
 DerivedData/
 Intermediates/

Gemfile

 source 'https://rubygems.org'
+gem 'cocoapods'
 gem 'xcpretty'
 gem 'xcpretty-travis-formatter'

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (0.9.1)
+    cocoapods (0.39.0)
+      activesupport (>= 4.0.2)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.39.0)
+      cocoapods-downloader (~> 0.9.3)
+      cocoapods-plugins (~> 0.4.2)
+      cocoapods-search (~> 0.1.0)
+      cocoapods-stats (~> 0.6.2)
+      cocoapods-trunk (~> 0.6.4)
+      cocoapods-try (~> 0.5.1)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      molinillo (~> 0.4.0)
+      nap (~> 1.0)
+      xcodeproj (~> 0.28.2)
+    cocoapods-core (0.39.0)
+      activesupport (>= 4.0.2)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-downloader (0.9.3)
+    cocoapods-plugins (0.4.2)
+      nap
+    cocoapods-search (0.1.0)
+    cocoapods-stats (0.6.2)
+    cocoapods-trunk (0.6.4)
+      nap (>= 0.8, < 2.0)
+      netrc (= 0.7.8)
+    cocoapods-try (0.5.1)
+    colored (1.2)
+    escape (0.0.4)
+    fuzzy_match (2.0.4)
+    i18n (0.7.0)
+    json (1.8.3)
+    minitest (5.8.3)
+    molinillo (0.4.1)
+    nap (1.0.0)
+    netrc (0.7.8)
     rouge (1.10.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.28.2)
+      activesupport (>= 3)
+      claide (~> 0.9.1)
+      colored (~> 1.2)
     xcpretty (0.2.2)
       rouge (~> 1.8)
     xcpretty-travis-formatter (0.0.4)
@@ -11,8 +62,9 @@ PLATFORMS
   ruby
 DEPENDENCIES
+  cocoapods
   xcpretty
   xcpretty-travis-formatter
 BUNDLED WITH
-   1.10.6
+   1.11.2

Podfile

+platform :osx
+
+use_frameworks!
+
+target 'iTerm2XCTests', :exclusive => true do
+  pod 'OCMockito'
+end

Podfile.lock

+PODS:
+  - OCHamcrest (2.0.1)
+  - OCMockito (0.23):
+    - OCHamcrest
+
+DEPENDENCIES:
+  - OCMockito
+
+SPEC CHECKSUMS:
+  OCHamcrest: ea68af8cd60b33b6909d1650acc21d1a7d75e2f9
+  OCMockito: c74c530e894acc37a7dccd50b73a2dc2e89c3c3b
+
+COCOAPODS: 0.39.0

Pods/Headers/Private/OCHamcrest/HCAllOf.h

+../../../OCHamcrest/Source/Library/Logical/HCAllOf.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCAnyOf.h

+../../../OCHamcrest/Source/Library/Logical/HCAnyOf.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCAssertThat.h

+../../../OCHamcrest/Source/Core/HCAssertThat.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCBaseDescription.h

+../../../OCHamcrest/Source/Core/HCBaseDescription.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCBaseMatcher.h

+../../../OCHamcrest/Source/Core/HCBaseMatcher.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCClassMatcher.h

+../../../OCHamcrest/Source/Library/Object/HCClassMatcher.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCCollectMatchers.h

+../../../OCHamcrest/Source/Core/Helpers/HCCollectMatchers.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCConformsToProtocol.h

+../../../OCHamcrest/Source/Library/Object/HCConformsToProtocol.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCDescribedAs.h

+../../../OCHamcrest/Source/Library/Decorator/HCDescribedAs.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCDescription.h

+../../../OCHamcrest/Source/Core/HCDescription.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCHasCount.h

+../../../OCHamcrest/Source/Library/Collection/HCHasCount.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCHasDescription.h

+../../../OCHamcrest/Source/Library/Object/HCHasDescription.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCHasProperty.h

+../../../OCHamcrest/Source/Library/Object/HCHasProperty.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCInvocationMatcher.h

+../../../OCHamcrest/Source/Core/Helpers/HCInvocationMatcher.h
\ No newline at end of file

Pods/Headers/Private/OCHamcrest/HCIs.h

+../../../OCHamcrest/Source/Library/Decorator/HCIs.h
\ No newline at end of file