[Integration] Compare execution output and fix sorting issues in 1.8.7

Rakefile

@@ -280,7 +280,7 @@ namespace :spec do
 
     # Remove files not used for the comparison
     # To keep the git diff clean
-    FileList['spec/integration/*/after/{Podfile,**/*.xcodeproj,PodTest-hg-source}'].each do |to_delete|
+    FileList['spec/integration/*/after/{Podfile,*.podspec,**/*.xcodeproj,PodTest-hg-source}'].each do |to_delete|
       sh "rm -rf #{to_delete}"
     end
   end

lib/cocoapods/gem_version.rb

@@ -2,6 +2,6 @@ module Pod
 
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.17.0.alpha'
+  VERSION = '0.17.0.alpha' unless defined? Pod::VERSION
 end
 

lib/cocoapods/installer.rb

@@ -259,7 +259,7 @@ module Pod
     def install_pod_sources
       @installed_specs = []
       title_options = { :verbose_prefix => "-> ".green }
-      root_specs.each do |spec|
+      root_specs.sort_by(&:name).each do |spec|
         if names_of_pods_to_install.include?(spec.name)
           UI.titled_section("Installing #{spec}".green, title_options) do
             install_source_of_pod(spec.name)
@@ -330,7 +330,7 @@ module Pod
     #
     def install_targets
       UI.message"- Installing targets" do
-        libraries.each do |library|
+        libraries.sort_by(&:name).each do |library|
           next if library.target_definition.empty?
           target_installer = TargetInstaller.new(sandbox, library)
           target_installer.install!

lib/cocoapods/installer/analyzer.rb

@@ -47,12 +47,12 @@ module Pod
         update_repositories_if_needed
         @result = AnalysisResult.new
         @result.podfile_state = generate_podfile_state
+        @locked_dependencies  = generate_version_locking_dependencies
 
-        @result.libraries             = generated_libraries
-        @locked_dependencies = generate_version_locking_dependencies
-        @result.specs_by_target       = resolve_dependencies
-        @result.specifications        = generate_specifications
-        @result.sandbox_state         = generate_sandbox_state
+        @result.libraries       = generated_libraries
+        @result.specs_by_target = resolve_dependencies
+        @result.specifications  = generate_specifications
+        @result.sandbox_state   = generate_sandbox_state
         @result
       end
 
@@ -301,7 +301,7 @@ module Pod
           if sandbox_lockfile
             sandbox_subspecs_names = sandbox_lockfile.pod_names.group_by { |name| Specification.root_name(name) }
             sandbox_names = sandbox_subspecs_names.keys
-            all_names     = (resolved_names + sandbox_names).uniq
+            all_names     = (resolved_names + sandbox_names).uniq.sort
             root_specs    = result.specifications.map(&:root).uniq
 
             is_changed = lambda do |name|
@@ -534,10 +534,10 @@ module Pod
         # @return [void]
         #
         def print
-          added    .each { |pod| UI.message("A".green  + " #{pod}", '', 2) }
-          deleted  .each { |pod| UI.message("R".red    + " #{pod}", '', 2) }
-          changed  .each { |pod| UI.message("M".yellow + " #{pod}", '', 2) }
-          unchanged.each { |pod| UI.message("-"        + " #{pod}", '', 2) }
+          added    .sort.each { |pod| UI.message("A".green  + " #{pod}", '', 2) }
+          deleted  .sort.each { |pod| UI.message("R".red    + " #{pod}", '', 2) }
+          changed  .sort.each { |pod| UI.message("M".yellow + " #{pod}", '', 2) }
+          unchanged.sort.each { |pod| UI.message("-"        + " #{pod}", '', 2) }
         end
 
         # Adds the name of a Pod to the give state.

lib/cocoapods/installer/user_project_integrator.rb

@@ -110,7 +110,7 @@ module Pod
       # @return [void]
       #
       def integrate_user_targets
-        libraries_to_integrate.each do |lib|
+        libraries_to_integrate.sort_by(&:name).each do |lib|
           TargetIntegrator.new(lib).integrate!
         end
       end

lib/cocoapods/resolver.rb

@@ -79,7 +79,8 @@ module Pod
       @cached_specs    = {}
       @specs_by_target = {}
 
-      podfile.target_definitions.values.each do |target|
+      target_definitions = podfile.target_definitions.values.sort_by{ |td| td.name.to_s }
+      target_definitions.each do |target|
         UI.section "Resolving dependencies for target `#{target.name}' (#{target.platform})" do
           @loaded_specs = []
           find_dependency_specs(podfile, target.dependencies, target)

spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml

@@ -42,24 +42,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_add_pod/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Finding Podfile changes

spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml

@@ -40,24 +40,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_external_source/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`

spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml

@@ -35,24 +35,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_local_source/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`

spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml

@@ -12,8 +12,8 @@ File References:
     - JSONKit.m
 - Products:
   - libPods.a
-  - libPods-test.a
   - libPods-SampleApp_2.a
+  - libPods-test.a
 - Targets Support Files:
   - Pods:
     - Pods.xcconfig
@@ -23,14 +23,6 @@ File References:
     - Pods-acknowledgements.plist
     - Pods-acknowledgements.markdown
     - Pods-dummy.m
-  - Pods-test:
-    - Pods-test.xcconfig
-    - Pods-test-header.h
-    - Pods-test-prefix.pch
-    - Pods-test-resources.sh
-    - Pods-test-acknowledgements.plist
-    - Pods-test-acknowledgements.markdown
-    - Pods-test-dummy.m
   - Pods-SampleApp_2:
     - Pods-SampleApp_2.xcconfig
     - Pods-SampleApp_2-header.h
@@ -39,6 +31,14 @@ File References:
     - Pods-SampleApp_2-acknowledgements.plist
     - Pods-SampleApp_2-acknowledgements.markdown
     - Pods-SampleApp_2-dummy.m
+  - Pods-test:
+    - Pods-test.xcconfig
+    - Pods-test-header.h
+    - Pods-test-prefix.pch
+    - Pods-test-resources.sh
+    - Pods-test-acknowledgements.plist
+    - Pods-test-acknowledgements.markdown
+    - Pods-test-dummy.m
 - Podfile
 
 
@@ -57,24 +57,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:
@@ -102,38 +104,43 @@ Targets:
           ARCHS: $(ARCHS_STANDARD_32_BIT)
           SKIP_INSTALL: 'YES'
         Base Configuration: Pods.xcconfig
-- Pods-test:
+- Pods-SampleApp_2:
     Build Phases:
     - SourcesBuildPhase:
       - JSONKit.m:
           COMPILER_FLAGS: -Wno-deprecated-objc-isa-usage -Wno-format
-      - Pods-test-dummy.m
+      - Reachability.m:
+          COMPILER_FLAGS: -fobjc-arc -DOS_OBJECT_USE_OBJC=0
+      - Pods-SampleApp_2-dummy.m
     - FrameworksBuildPhase:
       - Foundation.framework
     - HeadersBuildPhase:
       - JSONKit.h
+      - Reachability.h
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-SampleApp_2-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-test-prefix.pch
-        Base Configuration: Pods-test.xcconfig
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
+        Base Configuration: Pods-SampleApp_2.xcconfig
     - Debug:
         Build Settings:
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
@@ -142,7 +149,7 @@ Targets:
           - DEBUG=1
           - $(inherited)
           GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
-          GCC_PREFIX_HEADER: Pods-test-prefix.pch
+          GCC_PREFIX_HEADER: Pods-SampleApp_2-prefix.pch
           GCC_OPTIMIZATION_LEVEL: '0'
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
           GCC_C_LANGUAGE_STANDARD: gnu99
@@ -159,42 +166,41 @@ Targets:
           PODS_ROOT: ${SRCROOT}
           ARCHS: $(ARCHS_STANDARD_32_BIT)
           SKIP_INSTALL: 'YES'
-        Base Configuration: Pods-test.xcconfig
-- Pods-SampleApp_2:
+        Base Configuration: Pods-SampleApp_2.xcconfig
+- Pods-test:
     Build Phases:
     - SourcesBuildPhase:
       - JSONKit.m:
           COMPILER_FLAGS: -Wno-deprecated-objc-isa-usage -Wno-format
-      - Reachability.m:
-          COMPILER_FLAGS: -fobjc-arc -DOS_OBJECT_USE_OBJC=0
-      - Pods-SampleApp_2-dummy.m
+      - Pods-test-dummy.m
     - FrameworksBuildPhase:
       - Foundation.framework
     - HeadersBuildPhase:
       - JSONKit.h
-      - Reachability.h
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-test-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-SampleApp_2-prefix.pch
-        Base Configuration: Pods-SampleApp_2.xcconfig
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
+        Base Configuration: Pods-test.xcconfig
     - Debug:
         Build Settings:
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
@@ -203,7 +209,7 @@ Targets:
           - DEBUG=1
           - $(inherited)
           GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
-          GCC_PREFIX_HEADER: Pods-SampleApp_2-prefix.pch
+          GCC_PREFIX_HEADER: Pods-test-prefix.pch
           GCC_OPTIMIZATION_LEVEL: '0'
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
           GCC_C_LANGUAGE_STANDARD: gnu99
@@ -220,7 +226,7 @@ Targets:
           PODS_ROOT: ${SRCROOT}
           ARCHS: $(ARCHS_STANDARD_32_BIT)
           SKIP_INSTALL: 'YES'
-        Base Configuration: Pods-SampleApp_2.xcconfig
+        Base Configuration: Pods-test.xcconfig
 
 
 

spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml

@@ -54,16 +54,16 @@ File References:
     - CoreData.framework
     - Foundation.framework
   - libPods.a
-  - libPods-test.a
   - libPods-SampleApp_2.a
+  - libPods-test.a
 - Products:
   - SampleApp.app
   - SampleAppTests.octest
   - SampleApp_2.app
   - NonIntegrated.app
 - Pods.xcconfig
-- Pods-test.xcconfig
 - Pods-SampleApp_2.xcconfig
+- Pods-test.xcconfig
 
 
 

spec/integration/install_multiple_targets/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`
+Resolving dependencies for target `SampleApp_2' (iOS 6.0)
+  - JSONKit
+  - Reachability (= 3.1.0)
 Resolving dependencies for target `default' (iOS 6.0)
   - Reachability (= 3.1.0)
 Resolving dependencies for target `test' (iOS 6.0)
   - JSONKit
-Resolving dependencies for target `SampleApp_2' (iOS 6.0)
-  - JSONKit
-  - Reachability (= 3.1.0)
 
 Comparing resolved specification to the sandbox manifest
-  A Reachability
   A JSONKit
+  A Reachability
 
 Downloading dependencies
 
+-> Installing JSONKit (1.5pre)
+ > GitHub download
+   $ /usr/bin/git config core.bare
+   true
+   $ /usr/bin/git config core.bare
+   true
+   $ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
+   0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
+ > Cloning to Pods folder
+     $ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
+     Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
+     done.
+   $ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
+   Switched to a new branch 'activated-pod-commit'
+
 -> Installing Reachability (3.1.0)
  > GitHub download
    $ /usr/bin/git config core.bare
@@ -36,21 +51,6 @@ Downloading dependencies
    $ /usr/bin/git checkout -b activated-pod-commit 2>&1
    Switched to a new branch 'activated-pod-commit'
 
--> Installing JSONKit (1.5pre)
- > GitHub download
-   $ /usr/bin/git config core.bare
-   true
-   $ /usr/bin/git config core.bare
-   true
-   $ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
-   0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
- > Cloning to Pods folder
-     $ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
-     Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
-     done.
-   $ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
-   Switched to a new branch 'activated-pod-commit'
-
 Generating Pods project
   - Creating Pods project
   - Running pre install hooks
@@ -67,15 +67,6 @@ Generating Pods project
       - Generating acknowledgements at `Pods/Pods-acknowledgements.plist`
       - Generating acknowledgements at `Pods/Pods-acknowledgements.markdown`
       - Generating dummy source file at `Pods/Pods-dummy.m`
-    - Installing target `Pods-test` iOS 6.0
-      - Adding Build files
-      - Generating xcconfig file at `Pods/Pods-test.xcconfig`
-      - Generating target header at `Pods/Pods-test-header.h`
-      - Generating prefix header at `Pods/Pods-test-prefix.pch`
-      - Generating copy resources script at `Pods/Pods-test-resources.sh`
-      - Generating acknowledgements at `Pods/Pods-test-acknowledgements.plist`
-      - Generating acknowledgements at `Pods/Pods-test-acknowledgements.markdown`
-      - Generating dummy source file at `Pods/Pods-test-dummy.m`
     - Installing target `Pods-SampleApp_2` iOS 6.0
       - Adding Build files
       - Generating xcconfig file at `Pods/Pods-SampleApp_2.xcconfig`
@@ -85,6 +76,15 @@ Generating Pods project
       - Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.plist`
       - Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.markdown`
       - Generating dummy source file at `Pods/Pods-SampleApp_2-dummy.m`
+    - Installing target `Pods-test` iOS 6.0
+      - Adding Build files
+      - Generating xcconfig file at `Pods/Pods-test.xcconfig`
+      - Generating target header at `Pods/Pods-test-header.h`
+      - Generating prefix header at `Pods/Pods-test-prefix.pch`
+      - Generating copy resources script at `Pods/Pods-test-resources.sh`
+      - Generating acknowledgements at `Pods/Pods-test-acknowledgements.plist`
+      - Generating acknowledgements at `Pods/Pods-test-acknowledgements.markdown`
+      - Generating dummy source file at `Pods/Pods-test-dummy.m`
   - Running post install hooks
   - Writing Xcode project file to `Pods/Pods.xcodeproj`
   - Writing Lockfile in `Podfile.lock`
@@ -96,6 +96,6 @@ Integrating client projects
 
 Integrating `libPods.a` into target `SampleApp` of project `SampleApp.xcodeproj`.
 
-Integrating `libPods-test.a` into target `SampleAppTests` of project `SampleApp.xcodeproj`.
-
 Integrating `libPods-SampleApp_2.a` into target `SampleApp_2` of project `SampleApp.xcodeproj`.
+
+Integrating `libPods-test.a` into target `SampleAppTests` of project `SampleApp.xcodeproj`.

spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml

@@ -36,24 +36,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_new/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`

spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml

@@ -36,25 +36,27 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
+          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
           GCC_ENABLE_OBJC_GC: supported
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          PODS_ROOT: ${SRCROOT}
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
+          SKIP_INSTALL: 'YES'
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_podfile_callbacks/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`
@@ -32,6 +32,8 @@ Downloading dependencies
 
 Generating Pods project
   - Creating Pods project
+
+[!] Podfile#config is deprecated. The config is accessible from the parameter passed to the hooks
   - Running pre install hooks
     - Podfile
   - Adding source files to Pods project

spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml

@@ -35,24 +35,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_podspec/after/Reachability.podspec

-Pod::Spec.new do |s|
-  s.name         = 'Reachability'
-  s.version      = '3.1.0'
-  s.license      = 'BSD'
-  s.homepage     = 'https://github.com/tonymillion/Reachability'
-  s.authors      = { 'Tony Million' => 'tonymillion@gmail.com' }
-  s.summary      = 'ARC and GCD Compatible Reachability Class for iOS. Drop in replacement for Apple Reachability.'
-  s.source       = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
-  s.source_files = 'Reachability.{h,m}'
-  s.framework    = 'SystemConfiguration'
-  s.requires_arc = false
-end

spec/integration/install_podspec/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`

spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml

@@ -36,24 +36,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_remove_pod/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Finding Podfile changes

spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml

@@ -39,24 +39,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/install_spec_callbacks/after/Reachability.podspec

-Pod::Spec.new do |s|
-  s.name         = 'Reachability'
-  s.version      = '3.1.0'
-  s.license      = 'BSD'
-  s.homepage     = 'https://github.com/tonymillion/Reachability'
-  s.authors      = { 'Tony Million' => 'tonymillion@gmail.com' }
-  s.summary      = 'ARC and GCD Compatible Reachability Class for iOS. Drop in replacement for Apple Reachability.'
-  s.source       = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
-  s.source_files = 'Reachability.{h,m}', 'TestClass.{h,m}'
-  s.framework    = 'SystemConfiguration'
-  s.requires_arc = false
-
-  def s.pre_install(pod, target_definition)
-
-    # Replace strings in existing files
-    pod.source_files.each do |file|
-      replaced = file.read.gsub("kReachabilityChangedNotification", "kTEST")
-      File.open(file, 'w') { |f| f.write(replaced) }
-    end
-
-    # Add new files
-    File.open(pod.root + "TestClass.h", 'w') { |file| file.write("// TEST") }
-    File.open(pod.root + "TestClass.m", 'w') { |file| file.write("// TEST") }
-
-    dependencies = target_definition.dependencies.map(&:to_s) * ", "
-    File.open(pod.root + "DependenciesList.txt", 'w') { |file| file.write(dependencies) }
-
-  end
-
-  def s.post_install(target)
-
-  end
-end

spec/integration/install_spec_callbacks/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`

spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml

@@ -12,17 +12,9 @@ File References:
       - subspec_2.h
       - subspec_2.m
 - Products:
-  - libPods-iOS App.a
   - libPods-OS X App.a
+  - libPods-iOS App.a
 - Targets Support Files:
-  - Pods-iOS App:
-    - Pods-iOS App.xcconfig
-    - Pods-iOS App-header.h
-    - Pods-iOS App-prefix.pch
-    - Pods-iOS App-resources.sh
-    - Pods-iOS App-acknowledgements.plist
-    - Pods-iOS App-acknowledgements.markdown
-    - Pods-iOS App-dummy.m
   - Pods-OS X App:
     - Pods-OS X App.xcconfig
     - Pods-OS X App-header.h
@@ -31,128 +23,140 @@ File References:
     - Pods-OS X App-acknowledgements.plist
     - Pods-OS X App-acknowledgements.markdown
     - Pods-OS X App-dummy.m
+  - Pods-iOS App:
+    - Pods-iOS App.xcconfig
+    - Pods-iOS App-header.h
+    - Pods-iOS App-prefix.pch
+    - Pods-iOS App-resources.sh
+    - Pods-iOS App-acknowledgements.plist
+    - Pods-iOS App-acknowledgements.markdown
+    - Pods-iOS App-dummy.m
 - Podfile
 
 
 
 Targets:
-- Pods-iOS App:
+- Pods-OS X App:
     Build Phases:
     - SourcesBuildPhase:
-      - subspec_1.m
-      - Pods-iOS App-dummy.m
+      - subspec_2.m
+      - Pods-OS X App-dummy.m
     - FrameworksBuildPhase:
-      - Foundation.framework
+      - Cocoa.framework
     - HeadersBuildPhase:
-      - subspec_1.h
+      - subspec_2.h
     Build Configurations:
     - Release:
         Build Settings:
-          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          MACOSX_DEPLOYMENT_TARGET: '10.6'
+          GCC_PREFIX_HEADER: Pods-OS X App-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
+          DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
-          GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
-          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
           OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          GCC_VERSION: com.apple.compilers.llvm.clang.1_0
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-iOS App-prefix.pch
-        Base Configuration: Pods-iOS App.xcconfig
+          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
+          SDKROOT: macosx
+          PRODUCT_NAME: $(TARGET_NAME)
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          PODS_ROOT: ${SRCROOT}
+          ARCHS: $(ARCHS_STANDARD_64_BIT)
+          GCC_ENABLE_OBJC_EXCEPTIONS: 'YES'
+          SKIP_INSTALL: 'YES'
+          COMBINE_HIDPI_IMAGES: 'YES'
+        Base Configuration: Pods-OS X App.xcconfig
     - Debug:
         Build Settings:
-          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
           DSTROOT: /tmp/xcodeproj.dst
           GCC_PREPROCESSOR_DEFINITIONS:
           - DEBUG=1
           - $(inherited)
+          ONLY_ACTIVE_ARCH: 'YES'
           GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
-          GCC_PREFIX_HEADER: Pods-iOS App-prefix.pch
+          MACOSX_DEPLOYMENT_TARGET: '10.6'
+          GCC_PREFIX_HEADER: Pods-OS X App-prefix.pch
           GCC_OPTIMIZATION_LEVEL: '0'
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
           GCC_C_LANGUAGE_STANDARD: gnu99
           OTHER_LDFLAGS: ''
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
           ALWAYS_SEARCH_USER_PATHS: 'NO'
-          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
           COPY_PHASE_STRIP: 'NO'
-          SDKROOT: iphoneos
+          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
+          SDKROOT: macosx
           PRODUCT_NAME: $(TARGET_NAME)
           GCC_DYNAMIC_NO_PIC: 'NO'
           INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
-          PODS_ROOT: ${SRCROOT}
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
           SKIP_INSTALL: 'YES'
-        Base Configuration: Pods-iOS App.xcconfig
-- Pods-OS X App:
+          ARCHS: $(ARCHS_STANDARD_64_BIT)
+          PODS_ROOT: ${SRCROOT}
+          GCC_ENABLE_OBJC_EXCEPTIONS: 'YES'
+          COMBINE_HIDPI_IMAGES: 'YES'
+        Base Configuration: Pods-OS X App.xcconfig
+- Pods-iOS App:
     Build Phases:
     - SourcesBuildPhase:
-      - subspec_2.m
-      - Pods-OS X App-dummy.m
+      - subspec_1.m
+      - Pods-iOS App-dummy.m
     - FrameworksBuildPhase:
-      - Cocoa.framework
+      - Foundation.framework
     - HeadersBuildPhase:
-      - subspec_2.h
+      - subspec_1.h
     Build Configurations:
     - Release:
         Build Settings:
-          COPY_PHASE_STRIP: 'YES'
-          DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
+          VALIDATE_PRODUCT: 'YES'
+          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-iOS App-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
           GCC_C_LANGUAGE_STANDARD: gnu99
-          GCC_ENABLE_OBJC_EXCEPTIONS: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          MACOSX_DEPLOYMENT_TARGET: '10.6'
-          SKIP_INSTALL: 'YES'
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
-          ARCHS: $(ARCHS_STANDARD_64_BIT)
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          SDKROOT: macosx
-          COMBINE_HIDPI_IMAGES: 'YES'
-          GCC_PREFIX_HEADER: Pods-OS X App-prefix.pch
-        Base Configuration: Pods-OS X App.xcconfig
+          COPY_PHASE_STRIP: 'YES'
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
+        Base Configuration: Pods-iOS App.xcconfig
     - Debug:
         Build Settings:
+          PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
           DSTROOT: /tmp/xcodeproj.dst
           GCC_PREPROCESSOR_DEFINITIONS:
           - DEBUG=1
           - $(inherited)
-          ONLY_ACTIVE_ARCH: 'YES'
           GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
-          MACOSX_DEPLOYMENT_TARGET: '10.6'
-          GCC_PREFIX_HEADER: Pods-OS X App-prefix.pch
+          GCC_PREFIX_HEADER: Pods-iOS App-prefix.pch
           GCC_OPTIMIZATION_LEVEL: '0'
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
           GCC_C_LANGUAGE_STANDARD: gnu99
           OTHER_LDFLAGS: ''
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
           ALWAYS_SEARCH_USER_PATHS: 'NO'
-          COPY_PHASE_STRIP: 'NO'
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          SDKROOT: macosx
+          COPY_PHASE_STRIP: 'NO'
+          SDKROOT: iphoneos
           PRODUCT_NAME: $(TARGET_NAME)
           GCC_DYNAMIC_NO_PIC: 'NO'
           INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          SKIP_INSTALL: 'YES'
-          ARCHS: $(ARCHS_STANDARD_64_BIT)
+          IPHONEOS_DEPLOYMENT_TARGET: '4.3'
           PODS_ROOT: ${SRCROOT}
-          GCC_ENABLE_OBJC_EXCEPTIONS: 'YES'
-          COMBINE_HIDPI_IMAGES: 'YES'
-        Base Configuration: Pods-OS X App.xcconfig
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
+          SKIP_INSTALL: 'YES'
+        Base Configuration: Pods-iOS App.xcconfig
 
 
 

spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml

@@ -35,13 +35,13 @@ File References:
     - AppKit.framework
     - CoreData.framework
     - Foundation.framework
-  - libPods-iOS App.a
   - libPods-OS X App.a
+  - libPods-iOS App.a
 - Products:
   - iOS App.app
   - OS X App.app
-- Pods-iOS App.xcconfig
 - Pods-OS X App.xcconfig
+- Pods-iOS App.xcconfig
 
 
 

spec/integration/install_subspecs/after/execution_output.txt

-$ pod install --no-update --no-doc --verbose --no-color
+$ pod install --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Resolving dependencies of `Podfile`
-Resolving dependencies for target `default' (iOS 6.1)
-Resolving dependencies for target `iOS App' (iOS 4.3)
-  - PodTest/subspec_1 (from `PodTest-hg-source`)
+Resolving dependencies for target `OS X App' (OS X 10.6)
+  - PodTest/subspec_2 (from `PodTest-hg-source`)
     -> Pre-downloading: `PodTest`
       > Mercurial download
        $ /usr/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
        updating to branch default
        5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-Resolving dependencies for target `OS X App' (OS X 10.6)
-  - PodTest/subspec_2 (from `PodTest-hg-source`)
+Resolving dependencies for target `default' (iOS 6.1)
+Resolving dependencies for target `iOS App' (iOS 4.3)
+  - PodTest/subspec_1 (from `PodTest-hg-source`)
 
 Comparing resolved specification to the sandbox manifest
   A PodTest
@@ -27,15 +27,6 @@ Generating Pods project
   - Adding resources to Pods project
   - Linking headers
   - Installing targets
-    - Installing target `Pods-iOS App` iOS 4.3
-      - Adding Build files
-      - Generating xcconfig file at `Pods/Pods-iOS App.xcconfig`
-      - Generating target header at `Pods/Pods-iOS App-header.h`
-      - Generating prefix header at `Pods/Pods-iOS App-prefix.pch`
-      - Generating copy resources script at `Pods/Pods-iOS App-resources.sh`
-      - Generating acknowledgements at `Pods/Pods-iOS App-acknowledgements.plist`
-      - Generating acknowledgements at `Pods/Pods-iOS App-acknowledgements.markdown`
-      - Generating dummy source file at `Pods/Pods-iOS App-dummy.m`
     - Installing target `Pods-OS X App` OS X 10.6
       - Adding Build files
       - Generating xcconfig file at `Pods/Pods-OS X App.xcconfig`
@@ -45,6 +36,15 @@ Generating Pods project
       - Generating acknowledgements at `Pods/Pods-OS X App-acknowledgements.plist`
       - Generating acknowledgements at `Pods/Pods-OS X App-acknowledgements.markdown`
       - Generating dummy source file at `Pods/Pods-OS X App-dummy.m`
+    - Installing target `Pods-iOS App` iOS 4.3
+      - Adding Build files
+      - Generating xcconfig file at `Pods/Pods-iOS App.xcconfig`
+      - Generating target header at `Pods/Pods-iOS App-header.h`
+      - Generating prefix header at `Pods/Pods-iOS App-prefix.pch`
+      - Generating copy resources script at `Pods/Pods-iOS App-resources.sh`
+      - Generating acknowledgements at `Pods/Pods-iOS App-acknowledgements.plist`
+      - Generating acknowledgements at `Pods/Pods-iOS App-acknowledgements.markdown`
+      - Generating dummy source file at `Pods/Pods-iOS App-dummy.m`
   - Running post install hooks
   - Writing Xcode project file to `Pods/Pods.xcodeproj`
   - Writing Lockfile in `Podfile.lock`
@@ -54,6 +54,6 @@ Integrating client projects
 
 [!] From now on use `SampleApp.xcworkspace`.
 
-Integrating `libPods-iOS App.a` into target `iOS App` of project `SampleApp.xcodeproj`.
-
 Integrating `libPods-OS X App.a` into target `OS X App` of project `SampleApp.xcodeproj`.
+
+Integrating `libPods-iOS App.a` into target `iOS App` of project `SampleApp.xcodeproj`.

spec/integration/spec_lint/after/execution_output.txt

-$ pod spec lint --quick --verbose --no-color
+$ pod spec lint --quick --verbose --no-color 2>&1
  -> Reachability
 -> Reachability
 
 Analyzed 1 podspec.

spec/integration/update/after/Pods/Pods.xcodeproj.yaml

@@ -36,24 +36,26 @@ Targets:
     Build Configurations:
     - Release:
         Build Settings:
+          VALIDATE_PRODUCT: 'YES'
           PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
+          DSTROOT: /tmp/xcodeproj.dst
+          GCC_PREFIX_HEADER: Pods-prefix.pch
           PODS_HEADERS_SEARCH_PATHS: ${PODS_BUILD_HEADERS_SEARCH_PATHS}
-          PODS_ROOT: ${SRCROOT}
-          SDKROOT: iphoneos
-          VALIDATE_PRODUCT: 'YES'
           GCC_C_LANGUAGE_STANDARD: gnu99
-          SKIP_INSTALL: 'YES'
-          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
-          DSTROOT: /tmp/xcodeproj.dst
-          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          OTHER_LDFLAGS: ''
+          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
           GCC_VERSION: com.apple.compilers.llvm.clang.1_0
-          ARCHS: $(ARCHS_STANDARD_32_BIT)
-          PRODUCT_NAME: $(TARGET_NAME)
+          ALWAYS_SEARCH_USER_PATHS: 'NO'
+          SDKROOT: iphoneos
           GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
-          OTHER_LDFLAGS: ''
-          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
           COPY_PHASE_STRIP: 'YES'
-          GCC_PREFIX_HEADER: Pods-prefix.pch
+          PRODUCT_NAME: $(TARGET_NAME)
+          IPHONEOS_DEPLOYMENT_TARGET: '6.0'
+          INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
+          SKIP_INSTALL: 'YES'
+          PODS_ROOT: ${SRCROOT}
+          OTHER_CPLUSPLUSFLAGS: -DNS_BLOCK_ASSERTIONS=1
+          ARCHS: $(ARCHS_STANDARD_32_BIT)
         Base Configuration: Pods.xcconfig
     - Debug:
         Build Settings:

spec/integration/update/after/execution_output.txt

-$ pod update --no-update --no-doc --verbose --no-color
+$ pod update --no-update --no-doc --verbose --no-color 2>&1
 Resolving dependencies
 
 Finding Podfile changes

spec/integration_2.rb

@@ -90,7 +90,7 @@ end
 def launch_binary(arguments, folder)
   # TODO CP 0.16 doesn't offer the possibility to skip just the installation
   # of the docs.
-  command = "#{POD_BINARY} #{arguments} --verbose --no-color"
+  command = "#{POD_BINARY} #{arguments} --verbose --no-color 2>&1"
   Dir.chdir(TMP_DIR + folder) do
     output = `#{command}`
     it "$ pod #{arguments}" do
@@ -147,9 +147,6 @@ def check_with_folder(folder)
       when %r[/xcuserdata/], %r[\.pbxproj$]
         # Projects are compared through the more readable yaml representation
         next
-      when %r[execution_output\.txt$]
-        # skip for now as the Pod might or might not be in the cache TODO
-        next
       end
 
       it relative_path do