Merge branch 'master' into b0.15.0

* master:
  Release 0.14.0
  [Bundle] Update.
  [Rakefile] Allow to update the changelog during a release.
  [Gemspec] Bump dependency of Xcodeproj.
  [Changelog]
  Update AppleDoc install instructions
  [Rakefile] Fix Travis.
  [Rakefile] Fix Travis.
  [Rakefile] Fix Travis.
  [Specification] Don't include the name of the preferred dependency in to_s.
  [Lockfile] Make path if needed before writing.

CHANGELOG.md

@@ -11,7 +11,11 @@
 
 ## Master
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0.rc2...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...master)
+
+## 0.14.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0.rc2...0.14.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.2...0.3.3)
 
 ###### Bug fixes
 
@@ -20,6 +24,11 @@
   [#489](https://github.com/CocoaPods/CocoaPods/issues/489)
 - CocoaPods now uses a recent version of Octokit.
   [#490](https://github.com/CocoaPods/CocoaPods/issues/490)
+- Fixed a bug that caused Pods with preferred dependencies to be always
+  installed.
+  [Specs#464](https://github.com/CocoaPods/CocoaPods/issues/464)
+- Fixed Xcode 4.4+ artwork warning.
+  [Specs#508](https://github.com/CocoaPods/CocoaPods/issues/508)
 
 ## 0.14.0.rc2
 

Gemfile.lock

 GIT
   remote: git://github.com/CocoaPods/Xcodeproj.git
-  revision: 96cec1eed003f3477211fc02167a223857a0d6bc
+  revision: e3c513a66dee94b681588326bf1ce8ca4a30aef3
   specs:
-    xcodeproj (0.3.2)
+    xcodeproj (0.3.3)
       activesupport (~> 3.2.6)
 
 GIT
@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods (0.14.0.rc2)
+    cocoapods (0.14.0)
       activesupport (~> 3.2.6)
       colored (~> 1.2)
       escape (~> 0.0.4)
@@ -26,7 +26,7 @@ PATH
       octokit (~> 1.7)
       open4 (~> 1.3.0)
       rake (~> 0.9.0)
-      xcodeproj (>= 0.3.0)
+      xcodeproj (>= 0.3.3)
 
 GEM
   remote: http://rubygems.org/
@@ -45,15 +45,11 @@ GEM
       multipart-post (~> 1.1)
     faraday_middleware (0.8.8)
       faraday (>= 0.7.4, < 0.9)
-    ffi (1.1.5)
     github-markup (0.7.4)
     hashie (1.2.0)
     i18n (0.6.1)
     json (1.7.5)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
+    listen (0.5.0)
     metaclass (0.0.1)
     method_source (0.8)
     mocha (0.11.4)
@@ -62,7 +58,7 @@ GEM
       mocha (>= 0.9.8)
     multi_json (1.3.6)
     multipart-post (1.1.5)
-    octokit (1.11.0)
+    octokit (1.13.0)
       addressable (~> 2.2)
       faraday (~> 0.8)
       faraday_middleware (~> 0.8)
@@ -74,16 +70,12 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.3.1)
     rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
     rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
     redcarpet (2.1.1)
     slop (3.3.3)
     terminal-notifier (1.4.2)
-    vcr (2.2.4)
-    webmock (1.8.9)
+    vcr (2.2.5)
+    webmock (1.8.10)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yard (0.8.2.1)

README.md

@@ -33,8 +33,7 @@ $ [sudo] gem install cocoapods
 If you want to have CocoaPods generate documentation for each library, then install the [appledoc](http://gentlebytes.com/appledoc/) tool:
 
 ```
-$ brew install appledoc --HEAD
-$ ln -sf "`brew --prefix`/Cellar/appledoc/HEAD/Templates" ~/Library/Application\ Support/appledoc
+$ brew install appledoc
 ```
 
 Now that you've got CocoaPods installed you can easily add it to your project.

Rakefile

@@ -21,6 +21,7 @@ namespace :travis do
   task :install_opencflite_debs do
     sh "mkdir -p debs"
     Dir.chdir("debs") do
+      sh "wget http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu44_4.4.2-2ubuntu0.11.04.1_i386.deb" unless File.exist?("libicu44_4.4.2-2ubuntu0.11.04.1_i386.deb")
       base_url = "https://github.com/downloads/CocoaPods/OpenCFLite"
       %w{ opencflite1_248-1_i386.deb opencflite-dev_248-1_i386.deb }.each do |deb|
         sh "wget #{File.join(base_url, deb)}" unless File.exist?(deb)
@@ -92,6 +93,7 @@ namespace :gem do
       end
 
       diff_lines.delete('Gemfile.lock')
+      diff_lines.delete('CHANGELOG.md')
       if diff_lines != ['lib/cocoapods.rb']
         $stderr.puts "[!] Only change the version number in a release commit!"
         exit 1
@@ -137,7 +139,7 @@ namespace :gem do
     # silent_sh "rake examples:build"
 
     # Then release
-    sh "git commit lib/cocoapods.rb Gemfile.lock -m 'Release #{gem_version}'"
+    sh "git commit lib/cocoapods.rb Gemfile.lock CHANGELOG.md -m 'Release #{gem_version}'"
     sh "git tag -a #{gem_version} -m 'Release #{gem_version}'"
     sh "git push origin master"
     sh "git push origin --tags"

cocoapods.gemspec

@@ -26,15 +26,15 @@ Gem::Specification.new do |s|
   s.executables   = %w{ pod }
   s.require_paths = %w{ lib }
 
+  s.add_runtime_dependency 'xcodeproj',     '>= 0.3.3'
+
   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 'xcodeproj',     '>= 0.3.0'
   s.add_runtime_dependency 'activesupport', '~> 3.2.6'
 
   s.add_development_dependency 'bacon', '~> 1.1'

lib/cocoapods.rb

@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.14.0.rc2'
+  VERSION = '0.14.0'
 
   class PlainInformative < StandardError
   end

lib/cocoapods/local_pod.rb

@@ -95,10 +95,13 @@ module Pod
     end
 
     # @return [String] A string representation of the pod which indicates if
-    #                  the pods comes from a local source.
+    #                  the pods comes from a local source or has a preferred
+    #                  dependency.
     #
     def to_s
-      top_specification.to_s
+      s =  top_specification.to_s
+      s << " defaulting to #{top_specification.preferred_dependency} subspec" if top_specification.preferred_dependency
+      s
     end
 
     # @return [String] The name of the Pod.

lib/cocoapods/lockfile.rb

@@ -204,6 +204,7 @@ module Pod
     # @return [void] Writes the Lockfile to {#path}.
     #
     def write_to_disk(path)
+      path.dirname.mkpath unless path.dirname.exist?
       File.open(path, 'w') {|f| f.write(to_yaml) }
       defined_in_file = path
     end

lib/cocoapods/specification.rb

@@ -474,8 +474,7 @@ module Pod
     end
 
     def to_s
-      display_name = preferred_dependency.nil? ? name : "#{name}/#{preferred_dependency}"
-      "#{display_name} (#{version})"
+      "#{name} (#{version})"
     end
 
     def inspect