Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
  • 7 commits
  • 44 files changed
  • 0 commit comments
  • 3 contributors
Showing with 182 additions and 136 deletions.
  1. +15 −3 CHANGELOG.md
  2. +1 −1  bin/pod
  3. +58 −26 bin/sandbox-pod
  4. +3 −3 cocoapods.gemspec
  5. +1 −1  lib/cocoapods/config.rb
  6. +1 −1  lib/cocoapods/gem_version.rb
  7. +1 −1  spec/integration/install_add_pod/after/Podfile.lock
  8. +1 −1  spec/integration/install_add_pod/after/Pods/Manifest.lock
  9. +6 −5 spec/integration/install_add_pod/after/execution_output.txt
  10. +1 −1  spec/integration/install_custom_workspace/after/Podfile.lock
  11. +1 −1  spec/integration/install_custom_workspace/after/Pods/Manifest.lock
  12. +8 −8 spec/integration/install_custom_workspace/after/execution_output.txt
  13. +1 −1  spec/integration/install_external_source/after/Podfile.lock
  14. +1 −1  spec/integration/install_external_source/after/Pods/Manifest.lock
  15. +2 −2 spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
  16. +1 −1  spec/integration/install_external_source/after/execution_output.txt
  17. +1 −1  spec/integration/install_local_source/after/Podfile.lock
  18. +1 −1  spec/integration/install_local_source/after/Pods/Manifest.lock
  19. +2 −2 spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
  20. +1 −1  spec/integration/install_multiple_targets/after/Podfile.lock
  21. +1 −1  spec/integration/install_multiple_targets/after/Pods/Manifest.lock
  22. +2 −2 spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
  23. +14 −13 spec/integration/install_multiple_targets/after/execution_output.txt
  24. +1 −1  spec/integration/install_new/after/Podfile.lock
  25. +1 −1  spec/integration/install_new/after/Pods/Manifest.lock
  26. +8 −8 spec/integration/install_new/after/execution_output.txt
  27. +1 −1  spec/integration/install_podfile_callbacks/after/Podfile.lock
  28. +1 −1  spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
  29. +8 −8 spec/integration/install_podfile_callbacks/after/execution_output.txt
  30. +1 −1  spec/integration/install_podspec/after/Podfile.lock
  31. +1 −1  spec/integration/install_podspec/after/Pods/Manifest.lock
  32. +8 −8 spec/integration/install_podspec/after/execution_output.txt
  33. +1 −1  spec/integration/install_remove_pod/after/Podfile.lock
  34. +1 −1  spec/integration/install_remove_pod/after/Pods/Manifest.lock
  35. +1 −1  spec/integration/install_spec_callbacks/after/Podfile.lock
  36. +1 −1  spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
  37. +8 −8 spec/integration/install_spec_callbacks/after/execution_output.txt
  38. +1 −1  spec/integration/install_subspecs/after/Podfile.lock
  39. +1 −1  spec/integration/install_subspecs/after/Pods/Manifest.lock
  40. +2 −2 spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
  41. +2 −2 spec/integration/install_subspecs/after/execution_output.txt
  42. +1 −1  spec/integration/update/after/Podfile.lock
  43. +1 −1  spec/integration/update/after/Pods/Manifest.lock
  44. +8 −8 spec/integration/update/after/execution_output.txt
18 CHANGELOG.md
View
@@ -2,11 +2,23 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
-## Master
+## 0.20.1
+
+###### Bug fixes
+[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)
+
+* 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.0...0.20.0)
-• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.19.0...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)
2  bin/pod
View
@@ -1,6 +1,6 @@
#!/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"
84 bin/sandbox-pod
View
@@ -1,4 +1,5 @@
#!/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)
@@ -128,3 +105,58 @@ __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 prefixes
+ 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
+ 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)
+
6 cocoapods.gemspec
View
@@ -21,14 +21,14 @@ 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.3.0'
+ 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'
2  lib/cocoapods/config.rb
View
@@ -127,7 +127,7 @@ def installation_root
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
2  lib/cocoapods/gem_version.rb
View
@@ -2,6 +2,6 @@ module Pod
# The version of the cocoapods command line tool.
#
- VERSION = '0.20.0' unless defined? Pod::VERSION
+ VERSION = '0.20.1' unless defined? Pod::VERSION
end
2  spec/integration/install_add_pod/after/Podfile.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_add_pod/after/Pods/Manifest.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
11 spec/integration/install_add_pod/after/execution_output.txt
View
@@ -18,17 +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" "ROOT/tmp/install_add_pod/Pods/JSONKit"
+ $ /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)
2  spec/integration/install_custom_workspace/after/Podfile.lock
View
@@ -8,4 +8,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_custom_workspace/after/Pods/Manifest.lock
View
@@ -8,4 +8,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/install_custom_workspace/after/execution_output.txt
View
@@ -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
2  spec/integration/install_external_source/after/Podfile.lock
View
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_external_source/after/Pods/Manifest.lock
View
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
4 spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
View
@@ -66,7 +66,7 @@ Targets:
WRAPPER_EXTENSION: app
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -82,7 +82,7 @@ Targets:
OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
2  spec/integration/install_external_source/after/execution_output.txt
View
@@ -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
2  spec/integration/install_local_source/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_local_source/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
4 spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
View
@@ -66,7 +66,7 @@ Targets:
WRAPPER_EXTENSION: app
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -82,7 +82,7 @@ Targets:
OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
2  spec/integration/install_multiple_targets/after/Podfile.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_multiple_targets/after/Pods/Manifest.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
4 spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
View
@@ -119,7 +119,7 @@ Targets:
Build Settings:
WRAPPER_EXTENSION: octest
COMBINE_HIDPI_IMAGES: 'YES'
- FRAMEWORK_SEARCH_PATHS: '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+ FRAMEWORK_SEARCH_PATHS: ! '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
TEST_HOST: $(BUNDLE_LOADER)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: SampleAppTests/SampleAppTests-Info.plist
@@ -131,7 +131,7 @@ Targets:
Build Settings:
WRAPPER_EXTENSION: octest
COMBINE_HIDPI_IMAGES: 'YES'
- FRAMEWORK_SEARCH_PATHS: '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
+ FRAMEWORK_SEARCH_PATHS: ! '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
TEST_HOST: $(BUNDLE_LOADER)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: SampleAppTests/SampleAppTests-Info.plist
27 spec/integration/install_multiple_targets/after/execution_output.txt
View
@@ -18,36 +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" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
+ $ /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
2  spec/integration/install_new/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_new/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/install_new/after/execution_output.txt
View
@@ -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
2  spec/integration/install_podfile_callbacks/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/install_podfile_callbacks/after/execution_output.txt
View
@@ -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
2  spec/integration/install_podspec/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_podspec/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/install_podspec/after/execution_output.txt
View
@@ -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
2  spec/integration/install_remove_pod/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_remove_pod/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_spec_callbacks/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/install_spec_callbacks/after/execution_output.txt
View
@@ -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
2  spec/integration/install_subspecs/after/Podfile.lock
View
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/install_subspecs/after/Pods/Manifest.lock
View
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
4 spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
View
@@ -69,7 +69,7 @@ Targets:
WRAPPER_EXTENSION: app
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
@@ -85,7 +85,7 @@ Targets:
OTHER_CFLAGS: -DNS_BLOCK_ASSERTIONS=1
FRAMEWORK_SEARCH_PATHS:
- $(inherited)
- - '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
+ - ! '"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Developer/Library/Frameworks"'
IPHONEOS_DEPLOYMENT_TARGET: '6.1'
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
INFOPLIST_FILE: iOS App/iOS App-Info.plist
4 spec/integration/install_subspecs/after/execution_output.txt
View
@@ -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
2  spec/integration/update/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
2  spec/integration/update/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
-COCOAPODS: 0.20.0
+COCOAPODS: 0.20.1
16 spec/integration/update/after/execution_output.txt
View
@@ -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

No commit comments for this range

Something went wrong with that request. Please try again.