Merge branch 'master' into core-extraction

* master: (29 commits)
  Release 0.16.0
  [RakeFile] More fixes for release task.
  [Gemspec] Require xcodeproj 0.4.0.
  [RakeFile] Minor fix for release task.
  [FileList] User rake 1.9.4.
  Release 0.16.0.rc5
  [Travis] Need to wait a bit longer for standard Ruby 2 support.
  [Travis] Maybe I should use the alias?
  [Travis] Ruby 2.0.0 preview 1, yo!
  [Integrator] Properly detect if the lib has been integrated.
  [Lockfile] An inline podspec should always be considered needing installation.
  [CHANGELOG] Update with inline podspec deprecation.
  [Podfile] Update doc regarding the usage of `:podspec` instead of an inline spec.
  [Podfile] Inline specs are deprecated, use the `:podspec` option.
  Fix typo in podspec comments
  Release 0.16.0.rc4
  [FileList] Fix for Rake 0.9.3
  Fixed typo in spec template
  Release 0.16.0.rc3
  [gemspec] Update Xcodeproj dependency.
  ...

Conflicts:
	CHANGELOG.md
	Gemfile.lock
	cocoapods.gemspec
	lib/cocoapods.rb
	lib/cocoapods/installer/user_project_integrator.rb
	lib/cocoapods/lockfile.rb
	lib/cocoapods/podfile.rb
	lib/cocoapods/resolver.rb
	spec/functional/user_project_integrator_spec.rb

.travis.yml

@@ -2,8 +2,21 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+  # Not in Travis non-pro yet
+  #- 2.0.0
   # Rubinius in 1.8 mode on Travis does not work. It complains about st_data_t etc in Xcodeproj.
   #- rbx-18mode
   - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    #- rvm: 2.0.0
 install: NOEXEC=skip rake travis:setup
 script: bundle exec rake spec
+notifications:
+  # email: false
+  campfire:
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "qOE5zmgaHe/qQu3W9rmj7wygA5Ivl+cx50fqWGag2bdRl8ly5yj1NVoOKk/O\nZmQc4Lze+301uvTXi+r5v8A/tF6W1kUZw7yBiKuXoYFUGmDiVR9o2I/FPwkL\ngSzPJttrXTQfkQ4PbnrkX+JO+5bLWrKaO0hKXT4B2yUu4UXLVk0="

CHANGELOG.md

@@ -20,11 +20,55 @@
 - Added Podfile to the Pods project.
   [#476](https://github.com/CocoaPods/CocoaPods/issues/476)
 
-## Master
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc2...master) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0.rc1...master)
+## 0.16.0
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc5...master)
+
+###### Enhancements
+
+- Use Rake 0.9.4
+  [#657](https://github.com/CocoaPods/CocoaPods/issues/657)
+
+
+## 0.16.0.rc5
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc4...0.16.0.rc5)
+
+###### Deprecated
+
+- The usage of specifications defined in a Podfile is deprecated. Use the
+  `:podspec` option with a file path instead. Complete removal will most
+  probably happen in 0.17.0.
+  [#549](https://github.com/CocoaPods/CocoaPods/issues/549)
+  [#616](https://github.com/CocoaPods/CocoaPods/issues/616)
+  [#525](https://github.com/CocoaPods/CocoaPods/issues/525)
+
+###### Bug fixes
+
+- Always consider inline podspecs as needing installation.
+- Fix detection when the lib has already been integrated with the user’s target.
+  [#643](https://github.com/CocoaPods/CocoaPods/issues/643)
+  [#614](https://github.com/CocoaPods/CocoaPods/issues/614)
+  [#613](https://github.com/CocoaPods/CocoaPods/issues/613)
+
+## 0.16.0.rc4
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc3...0.16.0.rc4)
+
+###### Bug fixes
+
+- Fix for Rake 0.9.3
+  [#657](https://github.com/CocoaPods/CocoaPods/issues/657)
+
+## 0.16.0.rc3
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc2...0.16.0.rc3) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.0.rc1...0.4.0.rc6)
+
+###### Enhancements
+
+- Added support for copying frameworks to the app bundle.
+  [#597](https://github.com/CocoaPods/CocoaPods/pull/597)
 
 ###### Bug fixes
 
+- Ignore PBXReferenceProxy while integrating into user project.
+  [#626](https://github.com/CocoaPods/CocoaPods/issues/626)
 - Added support for PBXAggregateTarget and PBXLegacyTarget.
   [#615](https://github.com/CocoaPods/CocoaPods/issues/615)
 - Added support for PBXReferenceProxy.

Gemfile.lock

@@ -9,9 +9,9 @@ GIT
 
 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: 97a5a444ecfadf52e42afdbbf054f078f7c2cc5d
+  revision: d599d4ed17763aa5eb03382a17a6243e11beda2e
   specs:
-    xcodeproj (0.4.0.rc5)
+    xcodeproj (0.4.0)
       activesupport (~> 3.2.6)
       colored (~> 1.2)
 
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods (0.16.0.rc2)
+    cocoapods (0.17.0.alpha)
       activesupport (~> 3.2.6)
       claide (~> 0.1)
       cocoapods-core
@@ -37,13 +37,13 @@ PATH
       json (~> 1.7.3)
       octokit (~> 1.7)
       open4 (~> 1.3.0)
-      rake (~> 0.9.0)
-      xcodeproj (~> 0.4.0.rc1)
+      rake (~> 0.9.4)
+      xcodeproj (~> 0.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
@@ -62,14 +62,14 @@ GEM
     hashie (1.2.0)
     i18n (0.6.1)
     json (1.7.5)
-    listen (0.5.3)
+    listen (0.6.0)
     metaclass (0.0.1)
     method_source (0.8.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.1)
       mocha (>= 0.9.8)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     multipart-post (1.1.5)
     octokit (1.18.0)
       addressable (~> 2.2)
@@ -82,13 +82,13 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rake (0.9.2.2)
+    rake (0.9.5)
     rb-fsevent (0.9.2)
     redcarpet (2.2.2)
     slop (3.3.3)
     terminal-notifier (1.4.2)
     vcr (2.3.0)
-    webmock (1.8.11)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.8.3)

Rakefile

@@ -96,7 +96,7 @@ namespace :gem do
       diff_lines.delete('CHANGELOG.md')
       if diff_lines != ['lib/cocoapods.rb']
         $stderr.puts "[!] Only change the version number in a release commit!"
-        # exit 1
+        exit 1
       end
     end
 
@@ -108,7 +108,7 @@ namespace :gem do
     required_xcodeproj_version = xcodeproj.requirement.requirements.first.last.to_s
 
     puts "* Checking if xcodeproj #{required_xcodeproj_version} exists on the gem host"
-    search_result = silent_sh("gem search --pre --remote xcodeproj")
+    search_result = silent_sh("gem search --all --remote xcodeproj")
     remote_xcodeproj_versions = search_result.match(/xcodeproj \((.*)\)/m)[1].split(', ')
     unless remote_xcodeproj_versions.include?(required_xcodeproj_version)
       $stderr.puts "[!] The Xcodeproj version `#{required_xcodeproj_version}' required by " \

cocoapods.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'cocoapods-core'
   s.add_runtime_dependency 'claide',        '~> 0.1'
-  s.add_runtime_dependency 'xcodeproj',     '~> 0.4.0.rc1'
+  s.add_runtime_dependency 'xcodeproj',     '~> 0.4.0'
 
   s.add_runtime_dependency 'faraday',       '~> 0.8.1'
   s.add_runtime_dependency 'octokit',       '~> 1.7'
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'escape',        '~> 0.0.4'
   s.add_runtime_dependency 'json',          '~> 1.7.3'
   s.add_runtime_dependency 'open4',         '~> 1.3.0'
-  s.add_runtime_dependency 'rake',          '~> 0.9.0'
+  s.add_runtime_dependency 'rake',          '~> 0.9.4'
   s.add_runtime_dependency 'activesupport', '~> 3.2.6'
 
   s.add_development_dependency 'bacon', '~> 1.1'

lib/cocoapods.rb

@@ -57,4 +57,5 @@ end
 
 if ENV['COCOA_PODS_ENV'] == 'development'
   require 'awesome_print'
+  require 'pry'
 end

lib/cocoapods/command/spec.rb

@@ -234,7 +234,7 @@ Pod::Spec.new do |s|
   # s.description  = <<-DESC
   #                   An optional longer description of #{data[:name]}
   #
-  #                   * Markdonw format.
+  #                   * Markdown format.
   #                   * Don't worry about the indent, we strip it!
   #                  DESC
   s.homepage     = "#{data[:homepage]}"
@@ -268,7 +268,7 @@ Pod::Spec.new do |s|
   #
   # s.author       = '#{data[:author_name]}', 'other author'
 
-  # Specify the location from where the source should be retreived.
+  # Specify the location from where the source should be retrieved.
   #
   s.source       = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
   # s.source       = { :svn => 'http://EXAMPLE/#{data[:name]}/tags/1.0.0' }
@@ -302,9 +302,9 @@ Pod::Spec.new do |s|
   # made available to the application. If the pattern is a directory then the
   # path will automatically have '*.h' appended.
   #
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
-  # If you do not explicitely set the list of public header files,
+  # If you do not explicitly set the list of public header files,
   # all headers of source_files will be made public.
   #
   # s.public_header_files = 'Classes/**/*.h'
@@ -312,7 +312,7 @@ Pod::Spec.new do |s|
   # A list of resources included with the Pod. These are copied into the
   # target bundle with a build phase script.
   #
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
   # s.resource  = "icon.png"
   # s.resources = "Resources/*.png"
@@ -320,7 +320,7 @@ Pod::Spec.new do |s|
   # A list of paths to preserve after installing the Pod.
   # CocoaPods cleans by default any file that is not used.
   # Please don't include documentation, example, and test files.
-  # Also allows the use of the FileList class like `source_files does.
+  # Also allows the use of the FileList class like `source_files' does.
   #
   # s.preserve_paths = "FilesToSave", "MoreFilesToSave"
 

lib/cocoapods/generator/copy_resources_script.rb

@@ -15,6 +15,10 @@ install_resource()
       echo "ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
       ibtool --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
       ;;
+    *.framework)
+      echo "rsync -rp ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -rp "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
     *)
       echo "cp -R ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
       cp -R "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

lib/cocoapods/installer/user_project_integrator.rb

@@ -184,6 +184,12 @@ module Pod
             t.frameworks_build_phase.files.any? do |bf|
               bf.file_ref.name == library.name
             end
+          end.reject do |target|
+          # TODO: check merge for commit 6311a9b5e044a9d403838f1c65894c15d806f3f0
+            target.frameworks_build_phase.files.any? do |build_file|
+              file_ref = build_file.file_ref
+              !file_ref.proxy? && file_ref.display_name == @target_definition.lib_name
+            end
           end
         end
 

lib/cocoapods/resolver.rb

@@ -139,9 +139,9 @@ module Pod
     def removed_pods
       return [] unless lockfile
       unless @removed_pods
-        previusly_installed = lockfile.pod_names.map { |pod_name| pod_name.split('/').first }
+        previously_installed = lockfile.pods_names.map { |pod_name| pod_name.split('/').first }
         installed = specs.map { |spec| spec.name.split('/').first }
-        @removed_pods = previusly_installed - installed
+        @removed_pods = previously_installed - installed
       end
       @removed_pods
     end

lib/cocoapods/user_interface.rb

@@ -114,7 +114,7 @@ module Pod
       # that the user should take.
       #
       # @param [String]  message The message to print.
-      # @param [Actions] actions The actions that the user should take.
+      # @param [Array]   actions The actions that the user should take.
       #
       # return [void]
       #

lib/cocoapods/version.rb

 module Pod
-  VERSION = '0.16.0.rc2'
+  VERSION = '0.17.0.alpha'
 end

spec/fixtures/SampleProject/Sample Lib/Sample Lib.xcodeproj/project.pbxproj

+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		51E94E13164472080035348C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E12164472080035348C /* Foundation.framework */; };
+		51E94E18164472090035348C /* Sample_Lib.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 51E94E17164472090035348C /* Sample_Lib.h */; };
+		51E94E1A164472090035348C /* Sample_Lib.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E94E19164472090035348C /* Sample_Lib.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		51E94E0D164472080035348C /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/${PRODUCT_NAME}";
+			dstSubfolderSpec = 16;
+			files = (
+				51E94E18164472090035348C /* Sample_Lib.h in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		51E94E0F164472080035348C /* libSample Lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSample Lib.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		51E94E12164472080035348C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		51E94E16164472090035348C /* Sample Lib-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sample Lib-Prefix.pch"; sourceTree = "<group>"; };
+		51E94E17164472090035348C /* Sample_Lib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Sample_Lib.h; sourceTree = "<group>"; };
+		51E94E19164472090035348C /* Sample_Lib.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Sample_Lib.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		51E94E0C164472080035348C /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				51E94E13164472080035348C /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		51E94E04164472080035348C = {
+			isa = PBXGroup;
+			children = (
+				51E94E14164472090035348C /* Sample Lib */,
+				51E94E11164472080035348C /* Frameworks */,
+				51E94E10164472080035348C /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		51E94E10164472080035348C /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				51E94E0F164472080035348C /* libSample Lib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		51E94E11164472080035348C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				51E94E12164472080035348C /* Foundation.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		51E94E14164472090035348C /* Sample Lib */ = {
+			isa = PBXGroup;
+			children = (
+				51E94E17164472090035348C /* Sample_Lib.h */,
+				51E94E19164472090035348C /* Sample_Lib.m */,
+				51E94E15164472090035348C /* Supporting Files */,
+			);
+			path = "Sample Lib";
+			sourceTree = "<group>";
+		};
+		51E94E15164472090035348C /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				51E94E16164472090035348C /* Sample Lib-Prefix.pch */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		51E94E0E164472080035348C /* Sample Lib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */;
+			buildPhases = (
+				51E94E0B164472080035348C /* Sources */,
+				51E94E0C164472080035348C /* Frameworks */,
+				51E94E0D164472080035348C /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Sample Lib";
+			productName = "Sample Lib";
+			productReference = 51E94E0F164472080035348C /* libSample Lib.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		51E94E06164472080035348C /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0450;
+				ORGANIZATIONNAME = CocoaPods;
+			};
+			buildConfigurationList = 51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 51E94E04164472080035348C;
+			productRefGroup = 51E94E10164472080035348C /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				51E94E0E164472080035348C /* Sample Lib */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		51E94E0B164472080035348C /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				51E94E1A164472090035348C /* Sample_Lib.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		51E94E1B164472090035348C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		51E94E1C164472090035348C /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		51E94E1E164472090035348C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DSTROOT = /tmp/Sample_Lib.dst;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Sample Lib/Sample Lib-Prefix.pch";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		51E94E1F164472090035348C /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DSTROOT = /tmp/Sample_Lib.dst;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "Sample Lib/Sample Lib-Prefix.pch";
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		51E94E09164472080035348C /* Build configuration list for PBXProject "Sample Lib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				51E94E1B164472090035348C /* Debug */,
+				51E94E1C164472090035348C /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		51E94E1D164472090035348C /* Build configuration list for PBXNativeTarget "Sample Lib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				51E94E1E164472090035348C /* Debug */,
+				51E94E1F164472090035348C /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 51E94E06164472080035348C /* Project object */;
+}

spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample Lib-Prefix.pch

+//
+// Prefix header for all source files of the 'Sample Lib' target in the 'Sample Lib' project
+//
+
+#ifdef __OBJC__
+  #import <Foundation/Foundation.h>
+#endif

spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample_Lib.h

+//
+//  Sample_Lib.h
+//  Sample Lib
+//
+//  Created by Eloy Durán on 11/2/12.
+//  Copyright (c) 2012 CocoaPods. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Sample_Lib : NSObject
+
+@end

spec/fixtures/SampleProject/Sample Lib/Sample Lib/Sample_Lib.m

+//
+//  Sample_Lib.m
+//  Sample Lib
+//
+//  Created by Eloy Durán on 11/2/12.
+//  Copyright (c) 2012 CocoaPods. All rights reserved.
+//
+
+#import "Sample_Lib.h"
+
+@implementation Sample_Lib
+
+@end

spec/fixtures/SampleProject/SampleProject.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		51075D541521D0C100E39B41 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 51075D521521D0C100E39B41 /* InfoPlist.strings */; };
 		51075D561521D0C100E39B41 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 51075D551521D0C100E39B41 /* main.m */; };
 		51075D5A1521D0C100E39B41 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 51075D591521D0C100E39B41 /* AppDelegate.m */; };
+		51E94E2A1644722C0035348C /* libSample Lib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E94E28164472200035348C /* libSample Lib.a */; };
 		A346497214F9BE9A0080D870 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497114F9BE9A0080D870 /* UIKit.framework */; };
 		A346497414F9BE9A0080D870 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497314F9BE9A0080D870 /* Foundation.framework */; };
 		A346497614F9BE9A0080D870 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A346497514F9BE9A0080D870 /* CoreGraphics.framework */; };
@@ -21,6 +22,16 @@
 		A346498214F9BE9A0080D870 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A346498114F9BE9A0080D870 /* AppDelegate.m */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		51E94E27164472200035348C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 51E94E0F164472080035348C;
+			remoteInfo = "Sample Lib";
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
 		51075D4A1521D0C100E39B41 /* TestRunner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestRunner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		51075D511521D0C100E39B41 /* TestRunner-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestRunner-Info.plist"; sourceTree = "<group>"; };
@@ -29,6 +40,7 @@
 		51075D571521D0C100E39B41 /* TestRunner-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TestRunner-Prefix.pch"; sourceTree = "<group>"; };
 		51075D581521D0C100E39B41 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		51075D591521D0C100E39B41 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		51E94E201644721F0035348C /* Sample Lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Sample Lib.xcodeproj"; path = "Sample Lib/Sample Lib.xcodeproj"; sourceTree = "<group>"; };
 		A346496D14F9BE9A0080D870 /* SampleProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SampleProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A346497114F9BE9A0080D870 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		A346497314F9BE9A0080D870 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -56,6 +68,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				51E94E2A1644722C0035348C /* libSample Lib.a in Frameworks */,
 				A346497214F9BE9A0080D870 /* UIKit.framework in Frameworks */,
 				A346497414F9BE9A0080D870 /* Foundation.framework in Frameworks */,
 				A346497614F9BE9A0080D870 /* CoreGraphics.framework in Frameworks */,
@@ -86,9 +99,18 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		51E94E211644721F0035348C /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				51E94E28164472200035348C /* libSample Lib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		A346496214F9BE990080D870 = {
 			isa = PBXGroup;
 			children = (
+				51E94E201644721F0035348C /* Sample Lib.xcodeproj */,
 				A346497714F9BE9A0080D870 /* SampleProject */,
 				51075D4F1521D0C100E39B41 /* TestRunner */,
 				A346497014F9BE9A0080D870 /* Frameworks */,
@@ -192,6 +214,12 @@
 			mainGroup = A346496214F9BE990080D870;
 			productRefGroup = A346496E14F9BE9A0080D870 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 51E94E211644721F0035348C /* Products */;
+					ProjectRef = 51E94E201644721F0035348C /* Sample Lib.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				A346496C14F9BE9A0080D870 /* SampleProject */,
@@ -200,6 +228,16 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		51E94E28164472200035348C /* libSample Lib.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libSample Lib.a";
+			remoteRef = 51E94E27164472200035348C /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		51075D481521D0C100E39B41 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;

spec/unit/installer/user_project_integrator_spec.rb

@@ -186,6 +186,12 @@ describe TargetIntegrator = Pod::Installer::UserProjectIntegrator::TargetIntegra
   #     # as it will return only those that still need integration.
   #     app_target = app_integrator.user_project.targets.find { |t| t.name == 'SampleProject' }
   #     app_target.frameworks_build_phase.files.last.remove_from_project
+  #
+    # # Set the name of the libPods.a PBXFileReference to `nil` to ensure the file’s basename
+    # # is used instead. Not sure yet what makes it so that the name is nil in the first place.
+    # test_target = test_runner_integrator.user_project.targets.find { |t| t.name == 'TestRunner' }
+    # build_file = test_target.frameworks_build_phase.files.last
+    # build_file.file_ref.name = nil
   #
   #     app_integrator.expects(:add_pods_library)
   #     test_runner_integrator.expects(:add_pods_library).never