Merge branch 'master' into sandbox_reorganization_544

* master:
  Reference the integration spec files from a submodule pointing to CocoaPods/cocoapods-integration-specs
  Remove integration specs files

Conflicts:
	spec/integration/install_add_pod/after/Podfile.lock
	spec/integration/install_add_pod/after/Pods/BuildHeaders/Reachability/Reachability.h
	spec/integration/install_add_pod/after/Pods/Generated/Manifest.lock
	spec/integration/install_add_pod/after/Pods/Generated/Pods-JSONKit-dummy.m
	spec/integration/install_add_pod/after/Pods/Generated/Pods-JSONKit-prefix.pch
	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_add_pod/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_add_pod/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_add_pod/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_add_pod/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_add_pod/after/Pods/Generated/Pods-environment.h
	spec/integration/install_add_pod/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/JSONKit.h
	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/JSONKit.m
	spec/integration/install_add_pod/after/Pods/Generated/Sources/JSONKit/README.md
	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_add_pod/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_add_pod/after/Pods/Headers/Reachability/Reachability.h
	spec/integration/install_add_pod/after/Pods/Pods-resources.sh
	spec/integration/install_add_pod/after/Pods/Pods.xcconfig
	spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml
	spec/integration/install_add_pod/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_add_pod/after/execution_output.txt
	spec/integration/install_custom_workspace/after/Podfile.lock
	spec/integration/install_custom_workspace/after/Pods/Generated/Manifest.lock
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability-dummy.m
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability-prefix.pch
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-Reachability.xcconfig
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-acknowledgements.markdown
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-acknowledgements.plist
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-dummy.m
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-environment.h
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_1-resources.sh
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability-dummy.m
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability-prefix.pch
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-Reachability.xcconfig
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.markdown
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.plist
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-dummy.m
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-environment.h
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods-SampleApp_2-resources.sh
	spec/integration/install_custom_workspace/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_custom_workspace/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_custom_workspace/after/Workspace.xcworkspace/contents.xcworkspacedata
	spec/integration/install_custom_workspace/after/execution_output.txt
	spec/integration/install_external_source/after/Podfile.lock
	spec/integration/install_external_source/after/Pods/Generated/Local Podspecs/PodTest.podspec
	spec/integration/install_external_source/after/Pods/Generated/Manifest.lock
	spec/integration/install_external_source/after/Pods/Generated/Pods-PodTest-dummy.m
	spec/integration/install_external_source/after/Pods/Generated/Pods-PodTest-prefix.pch
	spec/integration/install_external_source/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_external_source/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_external_source/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_external_source/after/Pods/Generated/Pods-environment.h
	spec/integration/install_external_source/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_external_source/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_external_source/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_external_source/after/execution_output.txt
	spec/integration/install_local_source/after/Podfile.lock
	spec/integration/install_local_source/after/Pods/Generated/Local Podspecs/Reachability.podspec
	spec/integration/install_local_source/after/Pods/Generated/Manifest.lock
	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_local_source/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_local_source/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_local_source/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_local_source/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_local_source/after/Pods/Generated/Pods-environment.h
	spec/integration/install_local_source/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_local_source/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_local_source/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_local_source/after/execution_output.txt
	spec/integration/install_multiple_targets/after/Podfile.lock
	spec/integration/install_multiple_targets/after/Pods/Generated/Manifest.lock
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-JSONKit-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-JSONKit-prefix.pch
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability-prefix.pch
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-Reachability.xcconfig
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.markdown
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-acknowledgements.plist
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-environment.h
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-SampleApp_2-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-environment.h
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-JSONKit-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-JSONKit-prefix.pch
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-acknowledgements.markdown
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-acknowledgements.plist
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-dummy.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-environment.h
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods-test-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/JSONKit.h
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/JSONKit.m
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/JSONKit/README.md
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_multiple_targets/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_multiple_targets/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_multiple_targets/after/execution_output.txt
	spec/integration/install_new/after/Podfile.lock
	spec/integration/install_new/after/Pods/Generated/Manifest.lock
	spec/integration/install_new/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_new/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_new/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_new/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_new/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_new/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_new/after/Pods/Generated/Pods-environment.h
	spec/integration/install_new/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_new/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_new/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_new/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_new/after/execution_output.txt
	spec/integration/install_podfile_callbacks/after/Podfile.lock
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Manifest.lock
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-environment.h
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_podfile_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_podfile_callbacks/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_podfile_callbacks/after/execution_output.txt
	spec/integration/install_podspec/after/Podfile.lock
	spec/integration/install_podspec/after/Pods/Generated/Local Podspecs/Reachability.podspec
	spec/integration/install_podspec/after/Pods/Generated/Manifest.lock
	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_podspec/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_podspec/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_podspec/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_podspec/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_podspec/after/Pods/Generated/Pods-environment.h
	spec/integration/install_podspec/after/Pods/Generated/Pods-resources.sh
	spec/integration/install_podspec/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_podspec/after/Pods/Generated/Sources/Reachability/README.md
	spec/integration/install_podspec/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_podspec/after/execution_output.txt
	spec/integration/install_remove_pod/after/Podfile.lock
	spec/integration/install_remove_pod/after/Pods/BuildHeaders/Reachability/Reachability.h
	spec/integration/install_remove_pod/after/Pods/Generated/Manifest.lock
	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_remove_pod/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_remove_pod/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_remove_pod/after/Pods/Generated/Pods-environment.h
	spec/integration/install_remove_pod/after/Pods/Headers/Reachability/Reachability.h
	spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
	spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
	spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml
	spec/integration/install_remove_pod/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_remove_pod/after/execution_output.txt
	spec/integration/install_spec_callbacks/after/Podfile.lock
	spec/integration/install_spec_callbacks/after/Pods/Generated/Local Podspecs/Reachability.podspec
	spec/integration/install_spec_callbacks/after/Pods/Generated/Manifest.lock
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-acknowledgements.markdown
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-acknowledgements.plist
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-dummy.m
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods-environment.h
	spec/integration/install_spec_callbacks/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.h
	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/Reachability.m
	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/TestClass.h
	spec/integration/install_spec_callbacks/after/Pods/Generated/Sources/Reachability/TestClass.m
	spec/integration/install_spec_callbacks/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_spec_callbacks/after/execution_output.txt
	spec/integration/install_subspecs/after/Podfile.lock
	spec/integration/install_subspecs/after/Pods/Generated/Local Podspecs/PodTest.podspec
	spec/integration/install_subspecs/after/Pods/Generated/Manifest.lock
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-PodTest-dummy.m
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-PodTest-prefix.pch
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-acknowledgements.markdown
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-acknowledgements.plist
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-dummy.m
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-environment.h
	spec/integration/install_subspecs/after/Pods/Generated/Pods-OS X App-resources.sh
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-PodTest-dummy.m
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-PodTest-prefix.pch
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-acknowledgements.markdown
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-acknowledgements.plist
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-dummy.m
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-environment.h
	spec/integration/install_subspecs/after/Pods/Generated/Pods-iOS App-resources.sh
	spec/integration/install_subspecs/after/Pods/Generated/Pods.xcodeproj.yaml
	spec/integration/install_subspecs/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/install_subspecs/after/execution_output.txt
	spec/integration/update/after/Podfile.lock
	spec/integration/update/after/Pods/Generated/Manifest.lock
	spec/integration/update/after/Pods/Generated/Pods-Reachability-dummy.m
	spec/integration/update/after/Pods/Generated/Pods-Reachability-prefix.pch
	spec/integration/update/after/Pods/Generated/Pods-Reachability.xcconfig
	spec/integration/update/after/Pods/Generated/Pods-dummy.m
	spec/integration/update/after/Pods/Generated/Pods-environment.h
	spec/integration/update/after/Pods/Pods-Acknowledgements.markdown
	spec/integration/update/after/Pods/Pods-Acknowledgements.plist
	spec/integration/update/after/Pods/Pods-resources.sh
	spec/integration/update/after/Pods/Pods.xcconfig
	spec/integration/update/after/Pods/Pods.xcodeproj.yaml
	spec/integration/update/after/Pods/Reachability/README.md
	spec/integration/update/after/Pods/Reachability/Reachability.h
	spec/integration/update/after/Pods/Reachability/Reachability.m
	spec/integration/update/after/SampleApp.xcworkspace/contents.xcworkspacedata
	spec/integration/update/after/execution_output.txt

.gitmodules

@@ -17,3 +17,6 @@
 [submodule "spec/fixtures/integration/Reachability"]
 	path = spec/fixtures/integration/Reachability
 	url = https://github.com/tonymillion/Reachability.git
+[submodule "spec/cocoapods-integration-specs"]
+	path = spec/cocoapods-integration-specs
+	url = https://github.com/CocoaPods/cocoapods-integration-specs

Rakefile

@@ -182,7 +182,12 @@ namespace :spec do
   #--------------------------------------#
 
   desc "Run the integration spec"
-  task :integration => :unpack_fixture_tarballs do
+  task :integration do
+    unless File.exists?('spec/cocoapods-integration-specs')
+      $stderr.puts "Integration files not checked out. Run `rake bootstrap`"
+      exit 1
+    end
+
     sh "bundle exec bacon spec/integration.rb"
   end
 
@@ -268,7 +273,7 @@ namespace :spec do
     title 'Storing fixtures'
     # Copy the files to the files produced by the specs to the after folders
     FileList['tmp/*'].each do |source|
-      destination = "spec/integration/#{source.gsub('tmp/','')}/after"
+      destination = "spec/cocoapods-integration-specs/#{source.gsub('tmp/','')}/after"
       if File.exists?(destination)
         sh "rm -rf #{destination}"
         sh "mv #{source} #{destination}"
@@ -280,6 +285,9 @@ namespace :spec do
     FileList['spec/integration/*/after/{Podfile,*.podspec,**/*.xcodeproj,PodTest-hg-source}'].each do |to_delete|
       sh "rm -rf #{to_delete}"
     end
+
+    puts
+    puts "Integration fixtures updated, commit and push in the `spec/cocoapods-integration-specs` submodule"
   end
 
   #--------------------------------------#

spec/integration.rb

@@ -73,7 +73,7 @@
 #         the name of the folder of the tests.
 #
 def copy_files(folder)
-  source = File.expand_path("../integration/#{folder}/before", __FILE__)
+  source = File.expand_path("../cocoapods-integration-specs/#{folder}/before", __FILE__)
   destination = TMP_DIR + folder
   destination.mkpath
   FileUtils.cp_r(Dir.glob("#{source}/*"), destination)
@@ -135,7 +135,7 @@ def run_post_execution_actions(folder)
 #         the name of the folder of the tests.
 #
 def check_with_folder(folder)
-  source = File.expand_path("../integration/#{folder}", __FILE__)
+  source = File.expand_path("../cocoapods-integration-specs/#{folder}", __FILE__)
   Dir.glob("#{source}/after/**/*") do |expected_path|
     next unless File.file?(expected_path)
     relative_path = expected_path.gsub("#{source}/after/", '')
@@ -297,7 +297,7 @@ def focused_check(arguments, folder)
 
 #-----------------------------------------------------------------------------#
 
-describe "Integration take 2" do
+describe "Integration" do
   TMP_DIR.rmtree if TMP_DIR.exist?
   TMP_DIR.mkpath