Merge branch 'master' into xcode-5-support

Conflicts:
	Gemfile.lock
	spec/cocoapods-integration-specs

CHANGELOG.md

@@ -24,6 +24,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [#1309](https://github.com/CocoaPods/CocoaPods/issues/1309)
   [#1329](https://github.com/CocoaPods/CocoaPods/issues/1329)
   
+* Ensure resource bundles are copied to installation location on install actions
+
+  [Chris Gummer](https://github.com/chrisgummer)
+  [#1364](https://github.com/CocoaPods/CocoaPods/issues/1364)
+
 ## 0.24.0
 
 ###### Enhancements

Gemfile

@@ -9,7 +9,7 @@ group :development do
   # To develop the deps in tandem use the `LOCAL GIT REPOS` feature of Bundler.
   # For more info see http://bundler.io/git.html#local
   gem 'cocoapods-core',       :git => "https://github.com/CocoaPods/Core.git", :branch => 'master'
-  gem 'xcodeproj',            :git => "https://github.com/CocoaPods/Xcodeproj.git", :branch => 'redacted-support'
+  gem 'xcodeproj',            :git => "https://github.com/CocoaPods/Xcodeproj.git", :branch => 'master'
   gem 'cocoapods-downloader', :git => "https://github.com/CocoaPods/cocoapods-downloader.git", :branch => 'master'
   gem 'claide',               :git => 'https://github.com/CocoaPods/CLAide.git', :branch => 'master'
 

Gemfile.lock

@@ -17,8 +17,8 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: bc3a7126fa421a962ec433ba2fac11e88da0a0f4
-  branch: redacted-support
+  revision: e31dd7db5c27869f7637d4c2b5d3ed9fdac68e8c
+  branch: master
   specs:
     xcodeproj (0.10.1)
       activesupport (~> 3.0)
@@ -49,9 +49,9 @@ GIT
 
 GIT
   remote: https://github.com/lemurheavy/coveralls-ruby.git
-  revision: 2a7d3f86f1353a97734cc7df476b898e92d89708
+  revision: b1a5dcc23a4a9cb02a6a1560c63861d102530cd9
   specs:
-    coveralls (0.6.7)
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
@@ -112,7 +112,7 @@ GEM
       yajl-ruby (~> 1.1.0)
     rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
@@ -128,9 +128,9 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    tins (0.9.0)
+    tins (0.10.0)
     yajl-ruby (1.1.0)
-    yard (0.8.7)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby

lib/cocoapods/generator/copy_resources_script.rb

@@ -125,6 +125,9 @@ EOS
       RSYNC_CALL = <<EOS
 
 rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+if [[ "${ACTION}" == "install" ]]; then
+  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+fi
 rm -f "$RESOURCES_TO_COPY"
 EOS
 

lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -106,7 +106,8 @@ module Pod
         # @return [void]
         #
         def self.add_developers_frameworks_if_needed(xcconfig)
-          if xcconfig.frameworks.include?('SenTestingKit')
+          matched_frameworks = xcconfig.frameworks & ['XCTest', 'SenTestingKit']
+          unless matched_frameworks.empty?
             search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
             DEVELOPER_FRAMEWORKS_SEARCH_PATHS.each do |search_path|
               unless search_paths.include?(search_path)

cocoapods-integration-specs @ 978d284a

-Subproject commit d6fffead62ec94ba3d40f7fa4d9d151d9853838b
+Subproject commit 978d284adbc07cc64c7172640b9706906fc300dc

spec/unit/generator/xcconfig/xcconfig_helper_spec.rb

@@ -156,6 +156,15 @@ module Pod
             frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"')
             frameworks_search_paths.should.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"')
           end
+
+          it "adds the developer frameworks search paths to the xcconfig if XCTest has been detected" do
+            xcconfig = Xcodeproj::Config.new({'OTHER_LDFLAGS' => '-framework XCTest'})
+            @sut.add_developers_frameworks_if_needed(xcconfig)
+            frameworks_search_paths = xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS']
+            frameworks_search_paths.should.include?('$(inherited)')
+            frameworks_search_paths.should.include?('"$(SDKROOT)/Developer/Library/Frameworks"')
+            frameworks_search_paths.should.include?('"$(DEVELOPER_LIBRARY_DIR)/Frameworks"')
+          end
         end
 
         #---------------------------------------------------------------------#