Merge branch 'master' into dedicated-targets

* master: [Spec] Rebuild integration test fixtures. Use a different resources-to-copy.txt file for each target Grammar fix in CONTRIBUTING file Made SO link to our search query [CONTRIBUTING] Add back links to ML and SO. Thanks @secboffin. [CONTRIBUTING] Make it even clearer/simpler. Thanks to @Manfred. [CONTRIBUTING] Try to be as clear as possible about do's and don'ts. Conflicts: spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml spec/integration/install_add_pod/after/execution_output.txt spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml spec/integration/install_custom_workspace/after/execution_output.txt spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml spec/integration/install_external_source/after/execution_output.txt spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml spec/integration/install_multiple_targets/after/execution_output.txt spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml spec/integration/install_new/after/execution_output.txt spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml spec/integration/install_podfile_callbacks/after/execution_output.txt spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml spec/integration/install_podspec/after/execution_output.txt spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml spec/integration/install_spec_callbacks/after/execution_output.txt spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml spec/integration/install_subspecs/after/execution_output.txt spec/integration/update/after/Pods/Pods.xcodeproj.yaml spec/integration/update/after/execution_output.txt

Merge branch 'master' into dedicated-targets
* master: [Spec] Rebuild integration test fixtures. Use a different resources-to-copy.txt file for each target Grammar fix in CONTRIBUTING file Made SO link to our search query [CONTRIBUTING] Add back links to ML and SO. Thanks @secboffin. [CONTRIBUTING] Make it even clearer/simpler. Thanks to @Manfred. [CONTRIBUTING] Try to be as clear as possible about do's and don'ts. Conflicts: spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml spec/integration/install_add_pod/after/execution_output.txt spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml spec/integration/install_custom_workspace/after/execution_output.txt spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml spec/integration/install_external_source/after/execution_output.txt spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml spec/integration/install_multiple_targets/after/execution_output.txt spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml spec/integration/install_new/after/execution_output.txt spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml spec/integration/install_podfile_callbacks/after/execution_output.txt spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml spec/integration/install_podspec/after/execution_output.txt spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml spec/integration/install_spec_callbacks/after/execution_output.txt spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml spec/integration/install_subspecs/after/execution_output.txt spec/integration/update/after/Pods/Pods.xcodeproj.yaml spec/integration/update/after/execution_output.txt
d7f9903d · Fabio Pelosin · 17889326 · b1ac8b22 · d7f9903d · d7f9903d
Commit d7f9903d authored Jun 10, 2013 by Fabio Pelosin
32 changed files
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
-# Contributing
+# Do’s and Don’ts
-Before creating a issue or pull-request, be sure to search for existing tickets
+* **Search tickets before you file a new one.** Add to tickets if you have new information about the issue.
-first and provide additional feedback on those instead.
+* **Only file tickets about the CocoaPods tool itself.** This includes [CocoaPods](https://github.com/CocoaPods/CocoaPods/issues),
+  [CocoaPods/Core](https://github.com/CocoaPods/Core/issues), and [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/issues).
+  If your question is “How do I […]”, then please ask on [StackOverflow](http://stackoverflow.com/search?q=CocoaPods) or our [mailing-list](http://groups.google.com/group/cocoapods).
+* **Keep tickets short but sweet.** Make sure you include all the context needed to solve the issue. Don't overdo it. Great tickets allow us to focus on solving problems instead of discussing them.
+* **Take care of your ticket.** When you spend time to report a ticket with care we'll enjoy fixing it for you.
-## Issues
+## Bug reports
-The issues of this repository refer **only** to the development of the CocoaPods
-tool. These resources include:
- [CocoaPods](https://github.com/CocoaPods/CocoaPods/issues)
- [CocoaPods/Core](https://github.com/CocoaPods/Core/issues)
- [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/issues)
-Please refer to these other resources for things unrelated to the tool itself:
- [Mailing List](http://groups.google.com/group/cocoapods): Usage & general
-  questions.
- [CocoaPods/Specs](https://github.com/CocoaPods/Specs/issues): Submit new Pods and
-  report broken ones.
-Properly written and formatted issues are more likely to receive the
-appropriate attention. Or, as we say at Keeping-Sanity-in-OSS-HQ™: _“If you don’t care, we won’t care.”_
-#### Bug reports
 Please include _all_ relevant information, including the version of CocoaPods and
 any template printed by the tool.
@@ -45,7 +29,7 @@ add an [integration test](https://github.com/CocoaPods/CocoaPods/tree/master/spe
 which doesn't require any ruby knowledge.
-#### Feature requests
+## Feature requests
 Please try to be precise about the proposed outcome of the feature and how it
 would related to existing features.

--- a/lib/cocoapods/generator/copy_resources_script.rb
+++ b/lib/cocoapods/generator/copy_resources_script.rb
@@ -80,7 +80,7 @@ module Pod
      INSTALL_RESOURCES_FUCTION = <<EOS
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_add_pod/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_add_pod/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_add_pod/after/execution_output.txt
+++ b/spec/integration/install_add_pod/after/execution_output.txt
@@ -18,18 +18,17 @@ Downloading dependencies
 -> Installing JSONKit (1.5pre)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
+   $ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
   0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
 > Cloning to Pods folder
-     $ /usr/local/git/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f"
+     $ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_add_pod/Pods/JSONKit"
-     "ROOT/tmp/install_add_pod/Pods/JSONKit"
     Cloning into 'ROOT/tmp/install_add_pod/Pods/JSONKit'...
     done.
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
   Switched to a new branch 'activated-pod-commit'
 -> Using Reachability (3.1.0)

--- a/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
+++ b/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
+++ b/spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_custom_workspace/after/execution_output.txt
+++ b/spec/integration/install_custom_workspace/after/execution_output.txt
@@ -15,21 +15,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_custom_workspace/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks

--- a/spec/integration/install_external_source/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_external_source/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
+++ b/spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
@@ -66,7 +66,7 @@ Targets:
          WRAPPER_EXTENSION: app
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -82,7 +82,7 @@ Targets:
          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist

--- a/spec/integration/install_external_source/after/execution_output.txt
+++ b/spec/integration/install_external_source/after/execution_output.txt
@@ -5,10 +5,8 @@ Fetching external sources
 -> Pre-downloading: `PodTest` from `PodTest-hg-source`
 > Mercurial download
   $ /usr/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_external_source/Pods/PodTest"
-   *** failed to import extension mercurial_keyring: No module named httprepo
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-*** failed to import extension mercurial_keyring: No module named httprepo
 Resolving dependencies of `Podfile`
 Resolving dependencies for target `Pods' (iOS 4.3)

--- a/spec/integration/install_local_source/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_local_source/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
+++ b/spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
@@ -66,7 +66,7 @@ Targets:
          WRAPPER_EXTENSION: app
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -82,7 +82,7 @@ Targets:
          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist

--- a/spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
+++ b/spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
+++ b/spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
@@ -119,7 +119,7 @@ Targets:
        Build Settings:
          WRAPPER_EXTENSION: octest
          COMBINE_HIDPI_IMAGES: 'YES'
-          FRAMEWORK_SEARCH_PATHS: ! '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+          FRAMEWORK_SEARCH_PATHS: '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
          TEST_HOST: $(BUNDLE_LOADER)
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: SampleAppTests/SampleAppTests-Info.plist
@@ -131,7 +131,7 @@ Targets:
        Build Settings:
          WRAPPER_EXTENSION: octest
          COMBINE_HIDPI_IMAGES: 'YES'
-          FRAMEWORK_SEARCH_PATHS: ! '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+          FRAMEWORK_SEARCH_PATHS: '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
          TEST_HOST: $(BUNDLE_LOADER)
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: SampleAppTests/SampleAppTests-Info.plist

--- a/spec/integration/install_multiple_targets/after/execution_output.txt
+++ b/spec/integration/install_multiple_targets/after/execution_output.txt
@@ -18,37 +18,36 @@ Downloading dependencies
 -> Installing JSONKit (1.5pre)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
+   $ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
   0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
 > Cloning to Pods folder
-     $ /usr/local/git/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f"
+     $ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
-     "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
     Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
     done.
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
+   $ /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/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_multiple_targets/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks

--- a/spec/integration/install_new/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_new/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_new/after/execution_output.txt
+++ b/spec/integration/install_new/after/execution_output.txt
@@ -12,21 +12,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_new/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks

--- a/spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_podfile_callbacks/after/execution_output.txt
+++ b/spec/integration/install_podfile_callbacks/after/execution_output.txt
@@ -12,21 +12,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_podfile_callbacks/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks
    - Podfile

--- a/spec/integration/install_podspec/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_podspec/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_podspec/after/execution_output.txt
+++ b/spec/integration/install_podspec/after/execution_output.txt
@@ -15,21 +15,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_podspec/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks

--- a/spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
+++ b/spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_spec_callbacks/after/execution_output.txt
+++ b/spec/integration/install_spec_callbacks/after/execution_output.txt
@@ -15,21 +15,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/install_spec_callbacks/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks
    - Reachability

--- a/spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
+++ b/spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
+++ b/spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
+++ b/spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
@@ -69,7 +69,7 @@ Targets:
          WRAPPER_EXTENSION: app
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -85,7 +85,7 @@ Targets:
          OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
          FRAMEWORK_SEARCH_PATHS:
          - $(inherited)
-          - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+          - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
          IPHONEOS_DEPLOYMENT_TARGET: '6.1'
          GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
          INFOPLIST_FILE: iOS App/iOS App-Info.plist

--- a/spec/integration/install_subspecs/after/execution_output.txt
+++ b/spec/integration/install_subspecs/after/execution_output.txt
@@ -5,17 +5,13 @@ Fetching external sources
 -> Pre-downloading: `PodTest` from `PodTest-hg-source`
 > Mercurial download
   $ /usr/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
-   *** failed to import extension mercurial_keyring: No module named httprepo
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-*** failed to import extension mercurial_keyring: No module named httprepo
 -> Pre-downloading: `PodTest` from `PodTest-hg-source`
 > Mercurial download
   $ /usr/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
-   *** failed to import extension mercurial_keyring: No module named httprepo
   updating to branch default
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
-*** failed to import extension mercurial_keyring: No module named httprepo
 Resolving dependencies of `Podfile`
 Resolving dependencies for target `Pods' (iOS 6.1)

--- a/spec/integration/update/after/Pods/Pods-resources.sh
+++ b/spec/integration/update/after/Pods/Pods-resources.sh
 #!/bin/sh
-RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
+RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
 install_resource()

--- a/spec/integration/update/after/execution_output.txt
+++ b/spec/integration/update/after/execution_output.txt
@@ -15,21 +15,21 @@ Downloading dependencies
 -> Installing Reachability (3.1.0)
 > GitHub download
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git config core.bare
+   $ /usr/bin/git config core.bare
   true
-   $ /usr/local/git/bin/git rev-list --max-count=1 v3.1.0
+   $ /usr/bin/git rev-list --max-count=1 v3.1.0
   f7176f4798d068d233dca5223ae4bd9c8059e830
-   $ /usr/local/git/bin/git init
+   $ /usr/bin/git init
   Initialized empty Git repository in ROOT/tmp/update/Pods/Reachability/.git/
-   $ /usr/local/git/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
+   $ /usr/bin/git remote add origin 'CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6'
-   $ /usr/local/git/bin/git fetch origin tags/v3.1.0 2>&1
+   $ /usr/bin/git fetch origin tags/v3.1.0 2>&1
   From CACHES_DIR/GitHub/48f11286750afa2e2eb80564e288f42eed7cbab6
    * tag               v3.1.0     -> FETCH_HEAD
-   $ /usr/local/git/bin/git reset --hard FETCH_HEAD
+   $ /usr/bin/git reset --hard FETCH_HEAD
   HEAD is now at f7176f4 updated podspec
-   $ /usr/local/git/bin/git checkout -b activated-pod-commit 2>&1
+   $ /usr/bin/git checkout -b activated-pod-commit 2>&1
   Switched to a new branch 'activated-pod-commit'
  - Running pre install hooks