Merge branch 'core-extraction' into installer_clean_up

* core-extraction: (92 commits) Minor fixes. [Changelog] [SpecHelper] More refinement for bacon support. [TargetInstaller] Extracted XCConfig generation to Generator::XCConfing. Release 0.16.0 [RakeFile] More fixes for release task. [Gemspec] Require xcodeproj 0.4.0. [RakeFile] Minor fix for release task. [TargetInstaller] Fixed spec. [Command::Search] Catch DSL errors and present a warning. [UI] Minor adaptation for Core extraction. [List] Adapted for Core extraction. [Gemfile] Updated bundle. [Sandbox] Adapted for changes in Core. [LocalPod] Adapted for Core extraction. [Fixtures] Updates. [SpecHelper] Improved bacon support. [Sandobox] Adapted for Core extraction. [Resolver] adapted for Core extraction [Linter] Adoped Core Linter and renamed to DeepLinter (WIP). ... Conflicts: lib/cocoapods/command/install.rb lib/cocoapods/command/linter.rb lib/cocoapods/installer.rb lib/cocoapods/lockfile.rb lib/cocoapods/resolver.rb spec/unit/installer_spec.rb
CocoaPods · Nov 22, 2012 · ee854c1 · ee854c1
2 parents 697f8bd + 908790f
commit ee854c1
Show file tree

Hide file tree

Showing 102 changed files with 8,244 additions and 7,600 deletions.
diff --git a/.travis.yml b/.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="
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,95 @@
-## Master
+## Branch 0.17
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.2...master) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.5...master)
+###### DSL Changes
+
+- Deprecated header_mappings hook for specifications.
+- `preferred_dependency` has been renamed to `default_subspec`.
+- Added `s.exclude_source_files` and related attributes to the specification class.
+- Added support for prefix_header_file in subspecs
+- Added support for prefix_header_contents in subspecs
+- Removed exclude_header_search_paths
+- Added screenshot attribute
+- Renamed preferred_dependency
+
+###### Enhancements
+
+- Extracted command-line command & option handling into
+  [CLAide](https://github.com/CocoaPods/CLAide).
+- Added PathList class.
+
+- Added Podfile to the Pods project.
+  [#476](https://github.com/CocoaPods/CocoaPods/issues/476)
+
+## 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.
+  [#612](https://github.com/CocoaPods/CocoaPods/issues/612)
+
+## 0.16.0.rc2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.0.rc1...0.16.0.rc2)
+
+###### Bug fixes
+
+- Fix for uninitialized constant Xcodeproj::Constants error.
+
+## 0.16.0.rc1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.2...0.16.0.rc1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.5...0.4.0.rc1)
+
+###### Enhancements
 
 - Xcodeproj partial rewrite.
-  [#576](https://github.com/CocoaPods/CocoaPods/pull/576)
-  - Performance improvements in the `Generating supporting files` phase.
+  [#565](https://github.com/CocoaPods/CocoaPods/issues/565)
+  [#561](https://github.com/CocoaPods/CocoaPods/pull/561)
+  - Performance improvements in the `Generating support files` phase.
   - Better support for editing existing projects and sorting groups.
 
 ## 0.15.2
@@ -156,6 +241,7 @@
 - The subversion downloader now does an export instead of a checkout, which
   makes it play nicer with SCMs that store metadata in each directory.
   [#245](https://github.com/CocoaPods/CocoaPods/issues/245)
+- Now the Podfile is added to the Pods project for convenient editing.
 
 ###### Bug fixes
 

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,8 @@ source "http://rubygems.org"
 gemspec
 
 group :development do
-  gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git", :branch => "refactor"
+  gem "cocoapods-core", :git => "git://github.com/CocoaPods/Core.git"
+  gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"
   gem "mocha", "~> 0.11.4"
   gem "bacon"
   gem "mocha-on-bacon"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,19 @@
+GIT
+  remote: git://github.com/CocoaPods/Core.git
+  revision: e41f3c851003589aaddde533dd6e90a81d095621
+  specs:
+    cocoapods-core (0.16.0.rc2)
+      activesupport (~> 3.2.6)
+      faraday (~> 0.8.1)
+      octokit (~> 1.7)
+
 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: 280a500ed5ee5a5f6bb4e3c5edcfef0240fa427b
-  branch: refactor
+  revision: d599d4ed17763aa5eb03382a17a6243e11beda2e
   specs:
-    xcodeproj (0.3.5)
+    xcodeproj (0.4.0)
       activesupport (~> 3.2.6)
+      colored (~> 1.2)
 
 GIT
   remote: https://github.com/alloy/kicker.git
@@ -18,46 +27,49 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods (0.15.2)
+    cocoapods (0.17.0.alpha)
       activesupport (~> 3.2.6)
+      claide (~> 0.1)
+      cocoapods-core
       colored (~> 1.2)
       escape (~> 0.0.4)
       faraday (~> 0.8.1)
       json (~> 1.7.3)
       octokit (~> 1.7)
       open4 (~> 1.3.0)
-      rake (~> 0.9.0)
-      xcodeproj (~> 0.3.5)
+      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)
     awesome_print (1.1.0)
     bacon (1.1.0)
+    claide (0.2.0)
     coderay (1.0.8)
     colored (1.2)
     crack (0.3.1)
     escape (0.0.4)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
+    faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     github-markup (0.7.4)
     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)
@@ -70,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.2.5)
-    webmock (1.8.11)
+    vcr (2.3.0)
+    webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.8.3)
@@ -88,6 +100,7 @@ DEPENDENCIES
   awesome_print
   bacon
   cocoapods!
+  cocoapods-core!
   github-markup
   kicker!
   mocha (~> 0.11.4)

diff --git a/Rakefile b/Rakefile
@@ -108,9 +108,9 @@ 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 --remote xcodeproj")
-    remote_xcodeproj_version = search_result.match(/xcodeproj \(([\d\.]+)\)/m)[1]
-    unless Gem::Version.new(required_xcodeproj_version) <= Gem::Version.new(remote_xcodeproj_version)
+    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 " \
                    "this version of CocoaPods does not exist on the gem host. " \
                    "Either push that first, or fix the version requirement."
@@ -211,7 +211,7 @@ namespace :spec do
     tarballs = FileList['spec/fixtures/**/*.tar.gz']
     tarballs.each do |tarball|
       basename = File.basename(tarball)
-      sh "cd #{File.dirname(tarball)} && rm #{basename} && tar -zcf #{basename} #{basename[0..-8]}"
+      sh "cd #{File.dirname(tarball)} && rm #{basename} && env COPYFILE_DISABLE=1 tar -zcf #{basename} #{basename[0..-8]}"
     end
   end
 

diff --git a/bin/pod b/bin/pod
@@ -13,4 +13,4 @@ end
 
 require 'cocoapods'
 
-Pod::Command.run(*ARGV)
+Pod::Command.run(ARGV)
diff --git a/cocoapods.gemspec b/cocoapods.gemspec
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path('../lib', __FILE__)
-require 'cocoapods'
+require 'cocoapods/version'
 
 Gem::Specification.new do |s|
   s.name     = "cocoapods"
@@ -26,15 +26,17 @@ Gem::Specification.new do |s|
   s.executables   = %w{ pod }
   s.require_paths = %w{ lib }
 
-  s.add_runtime_dependency 'xcodeproj',     '~> 0.3.5'
+  s.add_runtime_dependency 'cocoapods-core'
+  s.add_runtime_dependency 'claide',        '~> 0.1'
+  s.add_runtime_dependency 'xcodeproj',     '~> 0.4.0'
 
   s.add_runtime_dependency 'faraday',       '~> 0.8.1'
   s.add_runtime_dependency 'octokit',       '~> 1.7'
   s.add_runtime_dependency 'colored',       '~> 1.2'
   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'