Merge branch 'master' of https://github.com/CocoaPods/CocoaPods

* 'master' of https://github.com/CocoaPods/CocoaPods: (21 commits)
  Release 0.20.2
  [Sandbox] Allow sandbox-pod to execute any tool inside a rbenv prefix.
  Bump to 0.20.2
  [CHANGELOG] Cleanup.
  [Spec] Update integrations specs for 0.20.2
  [CHANGELOG] Update for 0.20.2
  [Sandbox] Allow any tool inside the Xcode.app bundle to be executed.
  [Sandbox] Ensure RubyGems loads the CP gem on system Ruby.
  Revert Changelog curated-created thing
  CHANGELOG typo
  Release 0.20.1
  Update integration specs for new version number.
  [CHANGELOG] Update for 0.20.1
  [Sandbox] Fix issues when installed as a gem.
  [Gemspec] Make sandbox-pod executable visible
  [Config] Fix space before parentheses
  [Gemspec] Require CLAide 0.3.1
  Release 0.20.0
  Prepare for 0.20.0 release
  [Config] Use the pwd as installation root if no Podfile can be found
  ...

CHANGELOG.md

@@ -2,7 +2,37 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
-## Master
+## 0.20.2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.20.1...0.20.2)
+
+###### Bug fixes
+
+* Ensure that, in a sandbox-pod env, RubyGems loads the CocoaPods gem on system
+  Ruby (1.8.7).
+  [#939](https://github.com/CocoaPods/CocoaPods/issues/939#issuecomment-18396063)
+* Allow sandbox-pod to execute any tool inside the Xcode.app bundle.
+* Allow sandbox-pod to execute any tool inside a rbenv prefix.
+
+## 0.20.1
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.20.0...0.20.1)
+• [CLAide](https://github.com/CocoaPods/CLAide/compare/0.3.0...0.3.2)
+
+###### Bug fixes
+
+* Made sandbox-pod executable visible as it wasn't correctly configured in the
+  gemspec.
+* Made sandbox-pod executable actually work when installed as a gem. (In which
+  case every executable is wrapped in a wrapper bin script and the DATA constant
+  can no longer be used.)
+* Required CLAide 0.3.2 as 0.3.0 didn't include all the files in the gemspec
+  and 0.3.1 was not correctly processed by RubyGems.
+
+## 0.20.0
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.1...0.20.0)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.1...0.20.0)
+• [cocoapods-downloader](https://github.com/CocoaPods/CLAide/compare/0.1.0...0.1.1)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.5...0.6.0)
+• [CLAide](https://github.com/CocoaPods/CLAide/compare/0.2.0...0.3.0)
 
 ###### Enhancements
 

bin/pod

 #!/usr/bin/env ruby
 
-if $0 == __FILE__
+if $0 == __FILE__ && !ENV['COCOAPODS_NO_BUNDLER']
   ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
   require "rubygems"
   require "bundler/setup"
   $:.unshift File.expand_path('../../lib', __FILE__)
+elsif ENV['COCOAPODS_NO_BUNDLER']
+  require "rubygems"
+  gem "cocoapods"
 end
 
 if (ENV['CP_STDOUT_SYNC'] == 'TRUE')

bin/sandbox-pod

 #!/usr/bin/env ruby
+# encoding: utf-8
 
 # This bin wrapper runs the `pod` command in a OS X sandbox. The reason for this
 # is to ensure that people can’t use malicious code from pod specifications.
@@ -24,37 +25,13 @@
 if $0 == __FILE__
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
+
 require 'pathname'
 require 'cocoapods/config'
-
-
-pod_bin = File.expand_path('../pod', __FILE__)
-pod_prefix = File.expand_path('../..', pod_bin)
-
 require 'rbconfig'
-ruby_bin = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
-ruby_prefix = RbConfig::CONFIG['prefix']
-
-prefixes = ['/bin', '/usr/bin', '/usr/libexec']
-prefixes << `brew --prefix`.strip unless `which brew`.strip.empty?
-# From asking people, it seems MacPorts does not have a `prefix` command, like
-# Homebrew does, so make an educated guess:
-unless (port = `which port`.strip).empty?
-  prefixes << File.dirname(File.dirname(port))
-end
-
-developer_prefix = `xcode-select --print-path`.strip
-xcode_app_path = File.expand_path('../..', developer_prefix)
-
 require 'erb'
-profile = ERB.new(DATA.read, 0, '>').result(TOPLEVEL_BINDING)
-#puts profile
 
-command = ['/usr/bin/sandbox-exec', '-p', profile, pod_bin, *ARGV]
-exec *command
-
-
-__END__
+PROFILE_ERB_TEMPLATE = <<-EOS
 (version 1)
 (debug allow)
 
@@ -74,8 +51,6 @@ __END__
   (literal
     "<%= pod_bin %>"
     "<%= ruby_bin %>"
-    "<%= File.join(developer_prefix, 'usr/bin/xcrun') %>"
-    "<%= File.join(developer_prefix, 'usr/bin/xcodebuild') %>"
   )
   (regex 
 <% prefixes.each do |prefix| %>
@@ -128,3 +103,70 @@ __END__
 )
 
 (deny default)
+EOS
+
+
+class Profile
+
+  def pod_bin
+    File.expand_path('../pod', __FILE__)
+  end
+
+  def pod_prefix
+    File.expand_path('../..', pod_bin)
+  end
+
+  def ruby_bin
+    File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+  end
+
+  def ruby_prefix
+    RbConfig::CONFIG['prefix']
+  end
+
+  def prefix_from_bin(bin_name)
+    unless (path = `which #{bin_name}`.strip).empty?
+      File.dirname(File.dirname(path))
+    end
+  end
+
+  def prefixes
+    prefixes = ['/bin', '/usr/bin', '/usr/libexec', xcode_app_path]
+    prefixes << `brew --prefix`.strip unless `which brew`.strip.empty?
+
+    # From asking people, it seems MacPorts does not have a `prefix` command, like
+    # Homebrew does, so make an educated guess:
+    if port_prefix = prefix_from_bin('port')
+      prefixes << port_prefix
+    end
+
+    if rbenv_prefix = prefix_from_bin('rbenv')
+      prefixes << rbenv_prefix
+    end
+
+    prefixes
+  end
+
+  def developer_prefix
+    `xcode-select --print-path`.strip
+  end
+
+  def xcode_app_path
+    File.expand_path('../..', developer_prefix)
+  end
+
+  # TODO raise SAFE level (0) to 4 if possible.
+  def generate
+    ERB.new(PROFILE_ERB_TEMPLATE, 0, '>').result(binding)
+  end
+
+end
+
+# Ensure the `pod` bin doesn’t think it needs to use Bundler.
+ENV['COCOAPODS_NO_BUNDLER'] = '1'
+
+profile = Profile.new
+#puts profile.generate
+command = ['/usr/bin/sandbox-exec', '-p', profile.generate, profile.pod_bin, *ARGV]
+exec(*command)
+

cocoapods.gemspec

@@ -21,16 +21,16 @@ Gem::Specification.new do |s|
                   "in, third party open-source libraries, by creating a more centralized " \
                   "ecosystem."
 
-  s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHANGELOG.md }
+s.files = Dir["lib/**/*.rb"] + %w{ bin/pod bin/sandbox-pod README.md LICENSE CHANGELOG.md }
 
-  s.executables   = %w{ pod }
+  s.executables   = %w{ pod sandbox-pod }
   s.require_paths = %w{ lib }
 
   # Link with the version of CocoaPods-Core
   s.add_runtime_dependency 'cocoapods-core',       "= #{Pod::VERSION}"
-  s.add_runtime_dependency 'claide',               '~> 0.2.0'
-  s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.0'
-  s.add_runtime_dependency 'xcodeproj',            '~> 0.5.5'
+  s.add_runtime_dependency 'claide',               '~> 0.3.2'
+  s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1'
+  s.add_runtime_dependency 'xcodeproj',            '~> 0.6.0'
 
   s.add_runtime_dependency 'faraday',       '~> 0.8.1'
   s.add_runtime_dependency 'octokit',       '~> 1.7'

lib/cocoapods.rb

@@ -9,8 +9,7 @@ module Pod
   require 'cocoapods-core'
   require 'cocoapods/file_list'
   require 'cocoapods/config'
-
-  autoload :Downloader, 'cocoapods/downloader'
+  require 'cocoapods/downloader'
 
   # Indicates an user error. This is defined in cocoapods-core.
   #

lib/cocoapods/config.rb

@@ -127,13 +127,14 @@ module Pod
           if podfile_path_in_dir(current_path)
             @installation_root = current_path
             unless current_path == Pathname.pwd
-              UI.puts ("[in #{current_path}]")
+              UI.puts("[in #{current_path}]")
             end
             break
           else
             current_path = current_path.parent
           end
         end
+        @installation_root ||= Pathname.pwd
       end
       @installation_root
     end
@@ -181,7 +182,7 @@ module Pod
     # @return [Nil]
     #
     def podfile_path
-      @podfile_path ||= podfile_path_in_dir(installation_root) if installation_root
+      @podfile_path ||= podfile_path_in_dir(installation_root)
     end
 
     # Returns the path of the Lockfile.

lib/cocoapods/gem_version.rb

 module Pod
-
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.19.1' unless defined? Pod::VERSION
+  VERSION = '0.20.2' unless defined? Pod::VERSION
 end
 

spec/integration/install_add_pod/after/Podfile.lock

@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_add_pod/after/Pods/Manifest.lock

@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_add_pod/after/execution_output.txt

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

spec/integration/install_custom_workspace/after/Podfile.lock

@@ -8,4 +8,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_custom_workspace/after/Pods/Manifest.lock

@@ -8,4 +8,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_custom_workspace/after/execution_output.txt

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

spec/integration/install_external_source/after/Podfile.lock

@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_external_source/after/Pods/Manifest.lock

@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_external_source/after/execution_output.txt

@@ -4,7 +4,7 @@ Analyzing dependencies
 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"
+   $ /opt/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_external_source/Pods/PodTest"
    updating to branch default
    5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 

spec/integration/install_local_source/after/Podfile.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_local_source/after/Pods/Manifest.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_multiple_targets/after/Podfile.lock

@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_multiple_targets/after/Pods/Manifest.lock

@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_multiple_targets/after/execution_output.txt

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

spec/integration/install_new/after/Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_new/after/Pods/Manifest.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_new/after/execution_output.txt

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

spec/integration/install_podfile_callbacks/after/Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_podfile_callbacks/after/execution_output.txt

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

spec/integration/install_podspec/after/Podfile.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_podspec/after/Pods/Manifest.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_podspec/after/execution_output.txt

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

spec/integration/install_remove_pod/after/Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_remove_pod/after/Pods/Manifest.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_spec_callbacks/after/Podfile.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_spec_callbacks/after/Pods/Manifest.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_spec_callbacks/after/execution_output.txt

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

spec/integration/install_subspecs/after/Podfile.lock

@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_subspecs/after/Pods/Manifest.lock

@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/install_subspecs/after/execution_output.txt

@@ -4,12 +4,12 @@ Analyzing dependencies
 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"
+   $ /opt/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
    updating to branch default
    5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 -> Pre-downloading: `PodTest` from `PodTest-hg-source`
  > Mercurial download
-   $ /usr/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
+   $ /opt/local/bin/hg clone "PodTest-hg-source" "ROOT/tmp/install_subspecs/Pods/PodTest"
    updating to branch default
    5 files updated, 0 files merged, 0 files removed, 0 files unresolved
 

spec/integration/update/after/Podfile.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/update/after/Pods/Manifest.lock

@@ -7,4 +7,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2

spec/integration/update/after/execution_output.txt

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

spec/unit/config_spec.rb

@@ -59,9 +59,9 @@ module Pod
         end
       end
 
-      it "it returns a nil installation root if no Podfile can be found" do
+      it "it returns the working directory as the installation root if no Podfile can be found" do
         Dir.chdir(temporary_directory) do
-          config.installation_root.should == nil
+          config.installation_root.should == temporary_directory
         end
       end