Merge pull request #2371 from mrackwitz/clintegracon

Use CLIntegracon for Integration Tests

CHANGELOG.md

@@ -4,10 +4,16 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ## Master
 
-* Display indication for deprecated pods when searching for Pods. 
+##### Enhancements
+
+* Display indication for deprecated pods when searching for Pods.
   [Hugo Tunius][k0nserv]
   [#2180](https://github.com/CocoaPods/CocoaPods/issues/2180)
 
+* Use gem CLIntegracon for the integration tests.  
+  [Marius Rackwitz][mrackwitz]
+  [#2371](https://github.com/CocoaPods/CocoaPods/issues/2371)
+
 ##### Bug Fixes
 
 * Fixed pod repo push to first check if Specs directory exists and if so push
@@ -2465,5 +2471,5 @@ allowing you to automate Xcode related tasks.
 [irrationalfab]: https://github.com/irrationalfab
 [kylef]: (https://github.com/kylef)
 [neonichu]: (https://github.com/neonichu)
+[mrackwitz]: https://github.com/mrackwitz
 [k0nserv]: https://github.com/k0nserv
-

Gemfile

@@ -21,6 +21,7 @@ group :development do
   gem "bacon"
   gem "mocha-on-bacon"
   gem 'prettybacon'
+  gem 'clintegracon'
   gem 'webmock', "< 1.16"
 
   # For the integration tests

Gemfile.lock

@@ -92,6 +92,9 @@ GEM
     addressable (2.3.6)
     awesome_print (1.2.0)
     bacon (1.2.0)
+    clintegracon (0.5.2)
+      colored (~> 1.2)
+      diffy
     coderay (1.1.0)
     colored (1.2)
     coveralls (0.7.0)
@@ -175,6 +178,7 @@ DEPENDENCIES
   awesome_print
   bacon
   claide!
+  clintegracon
   cocoapods!
   cocoapods-core!
   cocoapods-downloader!

spec/integration/xcodeproj_project_yaml.rb

+require "xcodeproj"
+require "yaml"
+
+class Xcodeproj::Project
+  def to_yaml
+    pretty_print_output = pretty_print
+    sections = []
+    sorted_keys = ["File References", "Targets", "Build Configurations"]
+    sorted_keys.each do |key|
+      yaml =  { key => pretty_print_output[key] }.to_yaml
+      sections << yaml
+    end
+    (sections * "\n\n").gsub!("---", '')
+  end
+end