Skip to content

C
cocoapods
Commit 0304d9d6 authored by Fabio Pelosin's avatar Fabio Pelosin
Browse files
Options

Merge branch 'master' into dedicated-targets 

* master: (46 commits)
  Use Kicker from master
  [Changelog] Fixed crash due to Podfile.lock containing multiple version requirements.
  [Integration] Update fixtures
  * Truncating the resources-to-copy.txt file if it already exists.
  [Travis] Attempt to fix 1.9.3 Issues
  Remove Rake dependency
  [Specs] Remove old uneeded integration spec
  [Core] Update for recent changes
  [Bundler] Add Gemfile.lock to source control and update Bundler on release
  Remove Octokit dep 2
  [WIP] Remove Octokit dep
  Fix missing space in output.
  english fix for 'Podfile does not contain any dependency'
  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.
  ...

Conflicts:
	spec/integration/install_add_pod/after/Pods/Pods-resources.sh
	spec/integration/install_custom_workspace/after/Podfile.lock
	spec/integration/install_custom_workspace/after/Pods/Manifest.lock
	spec/integration/install_external_source/after/Pods/Pods-resources.sh
	spec/integration/install_local_source/after/Pods/Pods-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
	spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
	spec/integration/install_new/after/Pods/Pods-resources.sh
	spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
	spec/integration/install_podspec/after/Pods/Pods-resources.sh
	spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
	spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
	spec/integration/install_subspecs/after/Podfile.lock
	spec/integration/install_subspecs/after/Pods/Manifest.lock
	spec/integration/update/after/Pods/Pods-resources.sh
	spec/integration_spec.rb
	spec/unit/installer_spec.rb
parents a7607455 c4fedc56
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1047 additions and 885 deletions
.gitignore
View file @ 0304d9d6
...@@ -10,7 +10,6 @@ xcuserdata ...@@ -10,7 +10,6 @@ xcuserdata
project.xcworkspace project.xcworkspace
DerivedData DerivedData
/concatenated.* /concatenated.*
Gemfile.lock
# Yardoc # Yardoc
.yardoc .yardoc
......
.travis.yml
View file @ 0304d9d6
...@@ -2,7 +2,7 @@ language: objective-c ...@@ -2,7 +2,7 @@ language: objective-c
env: env:
# This is what 10.8.x comes with and we want to support that. # This is what 10.8.x comes with and we want to support that.
- RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem update --system && sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com - RVM_RUBY_VERSION=system NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem update --system && sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com
- RVM_RUBY_VERSION=1.9.3 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2 && curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com - RVM_RUBY_VERSION=1.9.3-p392 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo ln -s /usr/bin/llvm-gcc-4.2 /usr/bin/gcc-4.2 && curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem' SSL_CERT_FILE=/usr/local/share/cacert.pem GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com
before_install: before_install:
- source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION - source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir] install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
......
CHANGELOG.md
View file @ 0304d9d6
...@@ -2,10 +2,53 @@ ...@@ -2,10 +2,53 @@
To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html). To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
## Master ## Master
###### Enhancements ###### Enhancements
* Reduced external dependencies and deprecation of Rake::FileList.
[#1080](https://github.com/CocoaPods/CocoaPods/issues/1080)
###### Bug fixes
* Fixed crash due to Podfile.lock containing multiple version requirements for
a Pod. [#1076](https://github.com/CocoaPods/CocoaPods/issues/1076)
## 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
* Introduces an experimental sandbox feature. * Introduces an experimental sandbox feature.
[#939](https://github.com/CocoaPods/CocoaPods/issues/939) [#939](https://github.com/CocoaPods/CocoaPods/issues/939)
...@@ -31,13 +74,17 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -31,13 +74,17 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
**NOTE**: _The above example is actually one that we know of. We’re not sure **NOTE**: _The above example is actually one that we know of. We’re not sure
yet which process causes this, but there shouldn’t be a need for any process yet which process causes this, but there shouldn’t be a need for any process
to read data from the root path anyways._ to read data from the root path anyways._
**NOTE 2**: _At the moment the sandbox is not compatible with the `:path` option **NOTE 2**: _At the moment the sandbox is not compatible with the `:path` option
when referencing Pods that are not stored within the directory of the Podfile._ when referencing Pods that are not stored within the directory of the Podfile._
* The naked `pod` command now defaults to `pod install`. * The naked `pod` command now defaults to `pod install`.
[#958](https://github.com/CocoaPods/CocoaPods/issues/958) [#958](https://github.com/CocoaPods/CocoaPods/issues/958)
* CocoaPods will look for the Podfile in the ancestors paths if one is
not available in the working directory.
[#940](https://github.com/CocoaPods/CocoaPods/issues/940)
* Documentation generation has been removed from CocoaPods as it graduated * Documentation generation has been removed from CocoaPods as it graduated
to CocoaDocs. This decision was taken because CocoaDocs is a much better to CocoaDocs. This decision was taken because CocoaDocs is a much better
solution which doesn't clutter Xcode's docsets while still allowing solution which doesn't clutter Xcode's docsets while still allowing
...@@ -48,6 +95,15 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -48,6 +95,15 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
reintegrated as plugin (see reintegrated as plugin (see
[#1037](https://github.com/CocoaPods/CocoaPods/issues/1037)). [#1037](https://github.com/CocoaPods/CocoaPods/issues/1037)).
* Improved performance of the copy resources script and thus build time of
the integrated targets. Contribution by [@onato](https://github.com/onato)
[#1050](https://github.com/CocoaPods/CocoaPods/issues/1050).
* The changelog for the current version is printed after CocoaPods is
installed/updated.
[#853](https://github.com/CocoaPods/CocoaPods/issues/853).
###### Bug fixes ###### Bug fixes
* Inheriting `inhibit_warnings` per pod is now working * Inheriting `inhibit_warnings` per pod is now working
...@@ -55,6 +111,9 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -55,6 +111,9 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
* Fix copy resources script for iOS < 6 and OS X < 10.8 by removing the * Fix copy resources script for iOS < 6 and OS X < 10.8 by removing the
`--reference-external-strings-file` `--reference-external-strings-file`
flag. [#1030](https://github.com/CocoaPods/CocoaPods/pull/1030) flag. [#1030](https://github.com/CocoaPods/CocoaPods/pull/1030)
* Fixed issues with the `:head` option of the Podfile.
[#1046](https://github.com/CocoaPods/CocoaPods/issues/1046)
[#1039](https://github.com/CocoaPods/CocoaPods/issues/1039)
## 0.19.1 ## 0.19.1
[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.19.1) [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.19.0...0.19.1)
......
Gemfile
View file @ 0304d9d6
...@@ -22,7 +22,7 @@ end ...@@ -22,7 +22,7 @@ end
group :debugging do group :debugging do
gem "rb-fsevent" gem "rb-fsevent"
gem "kicker", :git => "https://github.com/alloy/kicker.git", :branch => "3.0.0" gem "kicker", :git => "https://github.com/alloy/kicker.git", :branch => "master"
gem "awesome_print" gem "awesome_print"
gem "pry" gem "pry"
gem "diffy" gem "diffy"
......
Gemfile.lock 0 → 100644
View file @ 0304d9d6
GIT
remote: https://github.com/CocoaPods/CLAide.git
revision: e97c290ccc133ed03b856ca5527cfc47610ac901
branch: master
specs:
claide (0.3.2)
GIT
remote: https://github.com/CocoaPods/Core.git
revision: 1dfeece9a5970654588719f2c8228918ab9af0c2
branch: master
specs:
cocoapods-core (0.20.2)
activesupport (~> 3.2.13)
json (~> 1.8.0)
nap (~> 0.5.1)
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 1184891949269cbde3ab557503d5df7567783aba
branch: xcconfig-prefix
specs:
xcodeproj (0.6.0)
activesupport (~> 3.2.13)
colored (~> 1.2)
GIT
remote: https://github.com/CocoaPods/cocoapods-downloader.git
revision: 2cc10348d9eb35862d900d79c72cd967388962b9
branch: master
specs:
cocoapods-downloader (0.1.1)
GIT
remote: https://github.com/alloy/kicker.git
revision: 56d7bc857278cc00900d37ef0cf2167cf606b57c
branch: master
specs:
kicker (2.6.1)
listen (~> 1.1.0)
GIT
remote: https://github.com/irrationalfab/PrettyBacon.git
revision: c42de649708149bbfb5fb5beefa65440855cf876
branch: master
specs:
prettybacon (0.0.1)
bacon (~> 1.2)
GIT
remote: https://github.com/lemurheavy/coveralls-ruby.git
revision: 2576b7d37545c6f28f0ad43f56cddc09ca2740f4
specs:
coveralls (0.6.7)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
PATH
remote: .
specs:
cocoapods (0.20.2)
activesupport (~> 3.2.13)
claide (~> 0.3.2)
cocoapods-core (= 0.20.2)
cocoapods-downloader (~> 0.1.1)
colored (~> 1.2)
escape (~> 0.0.4)
json (~> 1.8.0)
open4 (~> 1.3.0)
xcodeproj (~> 0.6.0)
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
awesome_print (1.1.0)
bacon (1.2.0)
coderay (1.0.9)
colored (1.2)
diffy (2.1.4)
escape (0.0.4)
ffi (1.8.1)
github-markup (0.7.5)
i18n (0.6.1)
json (1.8.0)
listen (1.1.4)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.23)
mocha (0.14.0)
metaclass (~> 0.0.1)
mocha-on-bacon (0.2.2)
mocha (>= 0.13.0)
multi_json (1.7.4)
nap (0.5.1)
open4 (1.3.0)
posix-spawn (0.3.6)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
pygments.rb (0.5.0)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rake (10.0.4)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
redcarpet (2.3.0)
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-prof (0.13.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.5)
term-ansicolor (1.2.2)
tins (~> 0.8)
thor (0.18.1)
tins (0.8.0)
yajl-ruby (1.1.0)
yard (0.8.6.1)
PLATFORMS
ruby
DEPENDENCIES
awesome_print
bacon
claide!
cocoapods!
cocoapods-core!
cocoapods-downloader!
coveralls!
diffy
github-markup
kicker!
mocha
mocha-on-bacon
prettybacon!
pry
pygments.rb
rake
rb-fsevent
redcarpet
ruby-prof
xcodeproj!
yard
Rakefile
View file @ 0304d9d6
...@@ -100,6 +100,9 @@ namespace :gem do ...@@ -100,6 +100,9 @@ namespace :gem do
# Ensure that the branches are up to date with the remote # Ensure that the branches are up to date with the remote
sh "git pull" sh "git pull"
puts "* Updating Bundle"
silent_sh('bundle update')
puts "* Running specs" puts "* Running specs"
silent_sh('rake spec:all') silent_sh('rake spec:all')
...@@ -178,7 +181,6 @@ namespace :spec do ...@@ -178,7 +181,6 @@ namespace :spec do
desc "Run the integration spec" desc "Run the integration spec"
task :integration => :unpack_fixture_tarballs do task :integration => :unpack_fixture_tarballs do
sh "bundle exec bacon spec/integration_spec.rb"
sh "bundle exec bacon spec/integration_2.rb" sh "bundle exec bacon spec/integration_2.rb"
end end
......
bin/pod
View file @ 0304d9d6
#!/usr/bin/env ruby #!/usr/bin/env ruby
if $0 == __FILE__ if $0 == __FILE__ && !ENV['COCOAPODS_NO_BUNDLER']
ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
require "rubygems" require "rubygems"
require "bundler/setup" require "bundler/setup"
$:.unshift File.expand_path('../../lib', __FILE__) $:.unshift File.expand_path('../../lib', __FILE__)
elsif ENV['COCOAPODS_NO_BUNDLER']
require "rubygems"
gem "cocoapods"
end end
if (ENV['CP_STDOUT_SYNC'] == 'TRUE') if (ENV['CP_STDOUT_SYNC'] == 'TRUE')
......
bin/sandbox-pod
View file @ 0304d9d6
#!/usr/bin/env ruby #!/usr/bin/env ruby
# encoding: utf-8
# This bin wrapper runs the `pod` command in a OS X sandbox. The reason for this # 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. # is to ensure that people can’t use malicious code from pod specifications.
...@@ -24,37 +25,13 @@ ...@@ -24,37 +25,13 @@
if $0 == __FILE__ if $0 == __FILE__
$:.unshift File.expand_path('../../lib', __FILE__) $:.unshift File.expand_path('../../lib', __FILE__)
end end
require 'pathname' require 'pathname'
require 'cocoapods/config' require 'cocoapods/config'
pod_bin = File.expand_path('../pod', __FILE__)
pod_prefix = File.expand_path('../..', pod_bin)
require 'rbconfig' 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' 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
PROFILE_ERB_TEMPLATE = <<-EOS
__END__
(version 1) (version 1)
(debug allow) (debug allow)
...@@ -71,11 +48,11 @@ __END__ ...@@ -71,11 +48,11 @@ __END__
(allow network-outbound) (allow network-outbound)
(allow process-exec (allow process-exec
(literal
"<%= pod_bin %>"
"<%= ruby_bin %>"
)
(regex (regex
#"^<%= pod_bin %>"
#"^<%= ruby_bin %>"
#"^<%= File.join(developer_prefix, 'usr/bin/xcrun') %>"
#"^<%= File.join(developer_prefix, 'usr/bin/xcodebuild') %>"
<% prefixes.each do |prefix| %> <% prefixes.each do |prefix| %>
#"^<%= prefix %>/*" #"^<%= prefix %>/*"
<% end %> <% end %>
...@@ -84,6 +61,10 @@ __END__ ...@@ -84,6 +61,10 @@ __END__
(allow file-read-metadata) (allow file-read-metadata)
(allow file-read* (allow file-read*
; This is currenly only added because using `xcodebuild` to build a resource
; bundle target starts a FSEvents stream on `/`. No idea why that would be
; needed, but for now it doesn’t seem like a real problem.
(literal "/")
(regex (regex
; TODO see if we can restrict this more, but it's going to be hard ; TODO see if we can restrict this more, but it's going to be hard
#"^/Users/[^.]+/*" #"^/Users/[^.]+/*"
...@@ -108,15 +89,84 @@ __END__ ...@@ -108,15 +89,84 @@ __END__
) )
(allow file-write* (allow file-write*
(literal
"/dev/dtracehelper"
"/dev/null"
)
(regex (regex
#"^<%= Pod::Config.instance.project_root %>" #"^<%= Pod::Config.instance.project_root %>"
#"^<%= Pod::Config.instance.repos_dir %>" #"^<%= Pod::Config.instance.repos_dir %>"
#"^/Users/[^.]+/Library/Caches/CocoaPods/*" #"^/Users/[^.]+/Library/Caches/CocoaPods/*"
#"^/dev/dtracehelper"
#"^/dev/tty" #"^/dev/tty"
#"^/dev/null"
#"^/private/var" #"^/private/var"
) )
) )
(deny default) (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
View file @ 0304d9d6
# -*- encoding: utf-8 -*- # encoding: UTF-8
require File.expand_path('../lib/cocoapods/gem_version', __FILE__) require File.expand_path('../lib/cocoapods/gem_version', __FILE__)
require 'date' require 'date'
...@@ -21,24 +21,21 @@ Gem::Specification.new do |s| ...@@ -21,24 +21,21 @@ Gem::Specification.new do |s|
"in, third party open-source libraries, by creating a more centralized " \ "in, third party open-source libraries, by creating a more centralized " \
"ecosystem." "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 } s.require_paths = %w{ lib }
# Link with the version of CocoaPods-Core # Link with the version of CocoaPods-Core
s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}" s.add_runtime_dependency 'cocoapods-core', "= #{Pod::VERSION}"
s.add_runtime_dependency 'claide', '~> 0.2.0' s.add_runtime_dependency 'claide', '~> 0.3.2'
s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.0' s.add_runtime_dependency 'cocoapods-downloader', '~> 0.1.1'
s.add_runtime_dependency 'xcodeproj', '~> 0.5.5' s.add_runtime_dependency 'xcodeproj', '~> 0.6.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 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4' s.add_runtime_dependency 'escape', '~> 0.0.4'
s.add_runtime_dependency 'json', '~> 1.8.0' s.add_runtime_dependency 'json', '~> 1.8.0'
s.add_runtime_dependency 'open4', '~> 1.3.0' s.add_runtime_dependency 'open4', '~> 1.3.0'
s.add_runtime_dependency 'rake', '~> 10.0.0'
s.add_runtime_dependency 'activesupport', '~> 3.2.13' s.add_runtime_dependency 'activesupport', '~> 3.2.13'
s.add_development_dependency 'bacon', '~> 1.1' s.add_development_dependency 'bacon', '~> 1.1'
...@@ -48,4 +45,15 @@ Gem::Specification.new do |s| ...@@ -48,4 +45,15 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.required_ruby_version = '>= 1.8.7' s.required_ruby_version = '>= 1.8.7'
s.specification_version = 3 if s.respond_to? :specification_version s.specification_version = 3 if s.respond_to? :specification_version
changelog_path = File.expand_path('../CHANGELOG.md', __FILE__)
if File.exists?(changelog_path)
title_token = '## '
current_verison_title = title_token + Pod::VERSION.to_s
full_changelog = File.open(changelog_path, "r:UTF-8") { |f| f.read }
current_version_index = full_changelog.index(/^#{current_verison_title}/)
previous_version_index = full_changelog.index(/^#{title_token}/, current_version_index + title_token.length)
relevant = full_changelog[current_version_index..previous_version_index-1]
s.post_install_message = "\nCHANGELOG:\n\n" + relevant + "\n"
end
end end
lib/cocoapods.rb
View file @ 0304d9d6
...@@ -7,10 +7,8 @@ module Pod ...@@ -7,10 +7,8 @@ module Pod
require 'cocoapods/gem_version' require 'cocoapods/gem_version'
require 'cocoapods-core' require 'cocoapods-core'
require 'cocoapods/file_list'
require 'cocoapods/config' require 'cocoapods/config'
require 'cocoapods/downloader'
autoload :Downloader, 'cocoapods/downloader'
# Indicates an user error. This is defined in cocoapods-core. # Indicates an user error. This is defined in cocoapods-core.
# #
......
lib/cocoapods/command/spec.rb
View file @ 0304d9d6
...@@ -32,15 +32,6 @@ module Pod ...@@ -32,15 +32,6 @@ module Pod
def run def run
if repo_id_match = (@url || @name_or_url).match(/github.com\/([^\/\.]*\/[^\/\.]*)\.*/) if repo_id_match = (@url || @name_or_url).match(/github.com\/([^\/\.]*\/[^\/\.]*)\.*/)
# This is to make sure Faraday doesn't warn the user about the `system_timer` gem missing.
old_warn, $-w = $-w, nil
begin
require 'faraday'
ensure
$-w = old_warn
end
require 'octokit'
repo_id = repo_id_match[1] repo_id = repo_id_match[1]
data = github_data_for_template(repo_id) data = github_data_for_template(repo_id)
data[:name] = @name_or_url if @url data[:name] = @name_or_url if @url
...@@ -410,8 +401,8 @@ module Pod ...@@ -410,8 +401,8 @@ module Pod
end end
def github_data_for_template(repo_id) def github_data_for_template(repo_id)
repo = Octokit.repo(repo_id) repo = GitHub.repo(repo_id)
user = Octokit.user(repo['owner']['login']) user = GitHub.user(repo['owner']['login'])
data = {} data = {}
data[:name] = repo['name'] data[:name] = repo['name']
...@@ -425,7 +416,7 @@ module Pod ...@@ -425,7 +416,7 @@ module Pod
end end
def suggested_ref_and_version(repo) def suggested_ref_and_version(repo)
tags = Octokit.tags(:username => repo['owner']['login'], :repo => repo['name']).map {|tag| tag["name"]} tags = GitHub.tags(repo['html_url']).map {|tag| tag["name"]}
versions_tags = {} versions_tags = {}
tags.each do |tag| tags.each do |tag|
clean_tag = tag.gsub(/^v(er)? ?/,'') clean_tag = tag.gsub(/^v(er)? ?/,'')
...@@ -434,9 +425,9 @@ module Pod ...@@ -434,9 +425,9 @@ module Pod
version = versions_tags.keys.sort.last || '0.0.1' version = versions_tags.keys.sort.last || '0.0.1'
data = {:version => version} data = {:version => version}
if version == '0.0.1' if version == '0.0.1'
branches = Octokit.branches(:username => repo['owner']['login'], :repo => repo['name']) branches = GitHub.branches(repo['html_url'])
master_name = repo['master_branch'] || 'master' master_name = repo['master_branch'] || 'master'
master = branches.select {|branch| branch['name'] == master_name }.first master = branches.find {|branch| branch['name'] == master_name }
data[:ref_type] = ':commit' data[:ref_type] = ':commit'
data[:ref] = master['commit']['sha'] data[:ref] = master['commit']['sha']
else else
......
lib/cocoapods/config.rb
View file @ 0304d9d6
...@@ -24,7 +24,9 @@ module Pod ...@@ -24,7 +24,9 @@ module Pod
:new_version_message => true, :new_version_message => true,
} }
#--------------------------------------# public
#-------------------------------------------------------------------------#
# @!group UI # @!group UI
...@@ -39,13 +41,13 @@ module Pod ...@@ -39,13 +41,13 @@ module Pod
attr_accessor :silent attr_accessor :silent
alias_method :silent?, :silent alias_method :silent?, :silent
# @return [Bool] Whether a message should be printed when a new version of # @return [Bool] Whether a message should be printed when a new version of
# CocoaPods is available. # CocoaPods is available.
# #
attr_accessor :new_version_message attr_accessor :new_version_message
alias_method :new_version_message?, :new_version_message alias_method :new_version_message?, :new_version_message
#--------------------------------------# #-------------------------------------------------------------------------#
# @!group Installation # @!group Installation
...@@ -81,7 +83,9 @@ module Pod ...@@ -81,7 +83,9 @@ module Pod
@aggressive_cache || (ENV['CP_AGGRESSIVE_CACHE'] != 'FALSE') @aggressive_cache || (ENV['CP_AGGRESSIVE_CACHE'] != 'FALSE')
end end
#--------------------------------------# public
#-------------------------------------------------------------------------#
# @!group Initialization # @!group Initialization
...@@ -99,7 +103,9 @@ module Pod ...@@ -99,7 +103,9 @@ module Pod
@verbose && !silent @verbose && !silent
end end
#--------------------------------------# public
#-------------------------------------------------------------------------#
# @!group Paths # @!group Paths
...@@ -115,7 +121,22 @@ module Pod ...@@ -115,7 +121,22 @@ module Pod
# Podfile is located. # Podfile is located.
# #
def installation_root def installation_root
@installation_root ||= Pathname.pwd current_path = Pathname.pwd
unless @installation_root
while(!current_path.root?)
if podfile_path_in_dir(current_path)
@installation_root = current_path
unless current_path == Pathname.pwd
UI.puts("[in #{current_path}]")
end
break
else
current_path = current_path.parent
end
end
@installation_root ||= Pathname.pwd
end
@installation_root
end end
attr_writer :installation_root attr_writer :installation_root
...@@ -137,23 +158,46 @@ module Pod ...@@ -137,23 +158,46 @@ module Pod
end end
# @return [Podfile] The Podfile to use for the current execution. # @return [Podfile] The Podfile to use for the current execution.
# @return [Nil] If no Podfile is available.
# #
def podfile def podfile
@podfile ||= Podfile.from_file(podfile_path) if podfile_path.exist? @podfile ||= Podfile.from_file(podfile_path) if podfile_path
end end
attr_writer :podfile attr_writer :podfile
# @return [Lockfile] The Lockfile to use for the current execution. # @return [Lockfile] The Lockfile to use for the current execution.
# @return [Nil] If no Lockfile is available.
# #
def lockfile def lockfile
@lockfile ||= Lockfile.from_file(lockfile_path) if lockfile_path.exist? @lockfile ||= Lockfile.from_file(lockfile_path) if lockfile_path
end
# Returns the path of the Podfile.
#
# @note The Podfile can be named either `CocoaPods.podfile.yaml`,
# `CocoaPods.podfile` or `Podfile`. The first two are preferred as
# they allow to specify an OS X UTI.
#
# @return [Pathname]
# @return [Nil]
#
def podfile_path
@podfile_path ||= podfile_path_in_dir(installation_root)
end
# Returns the path of the Lockfile.
#
# @note The Lockfile is named `Podfile.lock`.
#
def lockfile_path
@lockfile_path ||= installation_root + 'Podfile.lock'
end end
#--------------------------------------# private
# @!group Helpers #-------------------------------------------------------------------------#
# private # @!group Private helpers
# @return [Pathname] The path of the file which contains the user settings. # @return [Pathname] The path of the file which contains the user settings.
# #
...@@ -175,30 +219,38 @@ module Pod ...@@ -175,30 +219,38 @@ module Pod
end end
end end
# Returns the path of the Podfile. # @return [Array<String>] The filenames that the Podfile can have ordered
# by priority.
# #
# @note The Podfile can be named either `CocoaPods.podfile` or `Podfile`. PODFILE_NAMES = [
# The first is preferred as it allows to specify an OS X UTI. 'CocoaPods.podfile.yaml',
# 'CocoaPods.podfile',
def podfile_path 'Podfile',
unless @podfile_path ]
path = installation_root + 'CocoaPods.podfile.yaml'
path = installation_root + 'CocoaPods.podfile' unless path.exist?
path = installation_root + 'Podfile' unless path.exist?
@podfile_path = path
end
@podfile_path
end
# Returns the path of the Lockfile. # Returns the path of the Podfile in the given dir if any exists.
# #
# @note The Lockfile is named `Podfile.lock`. # @param [Pathname] dir
# The directory where to look for the Podfile.
# #
def lockfile_path # @return [Pathname] The path of the Podfile.
@lockfile_path ||= installation_root + 'Podfile.lock' # @return [Nil] If not Podfile was found in the given dir
#
def podfile_path_in_dir(dir)
PODFILE_NAMES.each do |filename|
candidate = dir + filename
if candidate.exist?
return candidate
end
end
nil
end end
#--------------------------------------# public
#-------------------------------------------------------------------------#
# @!group Singleton
# @return [Config] the current config instance creating one if needed. # @return [Config] the current config instance creating one if needed.
# #
...@@ -217,8 +269,6 @@ module Pod ...@@ -217,8 +269,6 @@ module Pod
@instance = instance @instance = instance
end end
#-------------------------------------------------------------------------#
# Provides support for accessing the configuration instance in other # Provides support for accessing the configuration instance in other
# scopes. # scopes.
# #
......
lib/cocoapods/file_list.rb deleted 100644 → 0
View file @ a7607455
if RUBY_VERSION >= "1.9"
require 'rake/file_list'
else
require 'rake'
end
# This makes Rake::FileList usable with the Specification attributes
# source_files, public_header_files, preserve_paths, and resources.
#
# @todo This needs to be deprecated as we no have the PathList List
#
module Rake
class FileList
def prepend_patterns(pathname)
@pending_add.map! { |pattern| (pathname + pattern).to_s }
end
def directory?
false
end
def glob
to_a.map { |path| Pathname.new(path) }
end
def inspect
"<##{self.class} pending_add=#{@pending_add}>"
end
alias :to_s :inspect
end
end
# TODO Defined in CocoaPods Core
# module Pod
# FileList = Rake::FileList
# end
lib/cocoapods/gem_version.rb
View file @ 0304d9d6
module Pod module Pod
# The version of the cocoapods command line tool. # 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 end
lib/cocoapods/generator/copy_resources_script.rb
View file @ 0304d9d6
...@@ -59,9 +59,9 @@ module Pod ...@@ -59,9 +59,9 @@ module Pod
# #
def install_resources_function def install_resources_function
if use_external_strings_file? if use_external_strings_file?
CONTENT INSTALL_RESOURCES_FUCTION
else else
CONTENT.gsub(' --reference-external-strings-file', '') INSTALL_RESOURCES_FUCTION.gsub(' --reference-external-strings-file', '')
end end
end end
...@@ -72,12 +72,17 @@ module Pod ...@@ -72,12 +72,17 @@ module Pod
resources.each do |resource| resources.each do |resource|
script += "install_resource '#{resource}'\n" script += "install_resource '#{resource}'\n"
end end
script += RSYNC_CALL
script script
end end
CONTENT = <<EOS
INSTALL_RESOURCES_FUCTION = <<EOS
#!/bin/sh #!/bin/sh
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
> "$RESOURCES_TO_COPY"
install_resource() install_resource()
{ {
case $1 in case $1 in
...@@ -98,13 +103,20 @@ install_resource() ...@@ -98,13 +103,20 @@ install_resource()
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd" xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;; ;;
*) *)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;; ;;
esac esac
} }
EOS EOS
RSYNC_CALL = <<EOS
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
EOS
end end
end end
end end
lib/cocoapods/installer.rb
View file @ 0304d9d6
...@@ -161,7 +161,7 @@ module Pod ...@@ -161,7 +161,7 @@ module Pod
def analyze def analyze
if lockfile && lockfile.cocoapods_version > Version.new(VERSION) if lockfile && lockfile.cocoapods_version > Version.new(VERSION)
STDERR.puts '[!] The version of CocoaPods used to generate the lockfile is '\ STDERR.puts '[!] The version of CocoaPods used to generate the lockfile is '\
'higher that the one of the current executable. Incompatibility' \ 'higher that the one of the current executable. Incompatibility ' \
'issues might arise.'.yellow 'issues might arise.'.yellow
end end
...@@ -285,7 +285,7 @@ module Pod ...@@ -285,7 +285,7 @@ module Pod
def prepare_pods_project def prepare_pods_project
UI.message "- Creating Pods project" do UI.message "- Creating Pods project" do
@pods_project = Pod::Project.new(sandbox.project_path) @pods_project = Pod::Project.new(sandbox.project_path)
if config.podfile_path.exist? if config.podfile_path
@pods_project.add_podfile(config.podfile_path) @pods_project.add_podfile(config.podfile_path)
end end
sandbox.project = @pods_project sandbox.project = @pods_project
......
lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
View file @ 0304d9d6
...@@ -151,7 +151,7 @@ module Pod ...@@ -151,7 +151,7 @@ module Pod
return true if sandbox.predownloaded?(pod) return true if sandbox.predownloaded?(pod)
return true if folder_empty?(pod) return true if folder_empty?(pod)
if update_mode if update_mode
return true if spec.version.head? return true if sandbox.head_pod?(pod)
end end
return false return false
end end
......
lib/cocoapods/installer/pod_source_installer.rb
View file @ 0304d9d6
...@@ -91,7 +91,7 @@ module Pod ...@@ -91,7 +91,7 @@ module Pod
# #
def download_source def download_source
root.rmtree if root.exist? root.rmtree if root.exist?
if root_spec.version.head? if head_pod?
downloader.download_head downloader.download_head
@specific_source = downloader.checkout_options @specific_source = downloader.checkout_options
else else
...@@ -172,6 +172,10 @@ module Pod ...@@ -172,6 +172,10 @@ module Pod
sandbox.local?(root_spec.name) sandbox.local?(root_spec.name)
end end
def head_pod?
sandbox.head_pod?(root_spec.name)
end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
private private
......
lib/cocoapods/installer/user_project_integrator.rb
View file @ 0304d9d6
...@@ -128,7 +128,7 @@ module Pod ...@@ -128,7 +128,7 @@ module Pod
# #
def warn_about_empty_podfile def warn_about_empty_podfile
if podfile.target_definitions.values.all?{ |td| td.empty? } if podfile.target_definitions.values.all?{ |td| td.empty? }
UI.warn "[!] The Podfile does not contain any dependency." UI.warn "[!] The Podfile does not contain any dependencies."
end end
end end
......
lib/cocoapods/resolver.rb
View file @ 0304d9d6
...@@ -158,7 +158,10 @@ module Pod ...@@ -158,7 +158,10 @@ module Pod
@loaded_specs << spec.name @loaded_specs << spec.name
cached_specs[spec.name] = spec cached_specs[spec.name] = spec
validate_platform(spec, target_definition) validate_platform(spec, target_definition)
spec.version.head = dependency.head? if dependency.head? || sandbox.head_pod?(spec.name)
spec.version.head = true
sandbox.store_head_pod(spec.name)
end
spec_dependencies = spec.all_dependencies(target_definition.platform) spec_dependencies = spec.all_dependencies(target_definition.platform)
find_dependency_specs(spec, spec_dependencies, target_definition) find_dependency_specs(spec, spec_dependencies, target_definition)
......
lib/cocoapods/sandbox.rb
View file @ 0304d9d6
...@@ -65,6 +65,7 @@ module Pod ...@@ -65,6 +65,7 @@ module Pod
@root = Pathname.new(root) @root = Pathname.new(root)
@public_headers = HeadersStore.new(self, "Headers") @public_headers = HeadersStore.new(self, "Headers")
@predownloaded_pods = [] @predownloaded_pods = []
@head_pods = []
@checkout_sources = {} @checkout_sources = {}
@local_pods = {} @local_pods = {}
FileUtils.mkdir_p(@root) FileUtils.mkdir_p(@root)
...@@ -89,8 +90,9 @@ module Pod ...@@ -89,8 +90,9 @@ module Pod
root.rmtree root.rmtree
end end
# Removes the files of the Pod with the given name from the sandbox.
# #
# # @return [void]
# #
def clean_pod(name) def clean_pod(name)
root_name = Specification.root_name(name) root_name = Specification.root_name(name)
...@@ -274,6 +276,37 @@ module Pod ...@@ -274,6 +276,37 @@ module Pod
#--------------------------------------# #--------------------------------------#
# Marks a Pod as head.
#
# @param [String] name
# The name of the Pod.
#
# @return [void]
#
def store_head_pod(name)
root_name = Specification.root_name(name)
head_pods << root_name
end
# @return [Array<String>] The names of the pods that have been
# marked as head.
#
attr_reader :head_pods
# Checks if a Pod should attempt to use the head source of the git repo.
#
# @param [String] name
# The name of the Pod.
#
# @return [Bool] Whether the Pod has been marked as head.
#
def head_pod?(name)
root_name = Specification.root_name(name)
head_pods.include?(root_name)
end
#--------------------------------------#
# Stores the local path of a Pod. # Stores the local path of a Pod.
# #
# @param [String] name # @param [String] name
......
lib/cocoapods/sandbox/file_accessor.rb
View file @ 0304d9d6
...@@ -172,7 +172,7 @@ module Pod ...@@ -172,7 +172,7 @@ module Pod
# Matches the given patterns to the file present in the root of the path # Matches the given patterns to the file present in the root of the path
# list. # list.
# #
# @param [Array<String, FileList>] patterns # @param [Array<String>] patterns
# The patterns to expand. # The patterns to expand.
# #
# @param [String] dir_pattern # @param [String] dir_pattern
...@@ -189,22 +189,8 @@ module Pod ...@@ -189,22 +189,8 @@ module Pod
# #
def expanded_paths(patterns, options = {}) def expanded_paths(patterns, options = {})
return [] if patterns.empty? return [] if patterns.empty?
file_lists = patterns.select { |p| p.is_a?(FileList) }
glob_patterns = patterns - file_lists
result = [] result = []
result << path_list.glob(glob_patterns, options) result << path_list.glob(patterns, options)
result << file_lists.map do |file_list|
file_list.prepend_patterns(path_list.root)
file_list.glob
end
unless file_lists.empty?
# TODO Restore warning in 0.17 proper
# UI.warn "[#{spec_consumer.spec.name}] The usage of Rake FileList is deprecated. Use `exclude_files`."
end
result.flatten.compact.uniq result.flatten.compact.uniq
end end
......
lib/cocoapods/user_interface.rb
View file @ 0304d9d6
...@@ -148,7 +148,7 @@ module Pod ...@@ -148,7 +148,7 @@ module Pod
# #
def path(pathname) def path(pathname)
if pathname if pathname
path = pathname.relative_path_from(config.podfile_path.dirname || Pathname.pwd) path = pathname.relative_path_from((config.podfile_path.dirname if config.podfile_path) || Pathname.pwd)
"`#{path}`" "`#{path}`"
else else
'' ''
......
spec/functional/command/spec_spec.rb
View file @ 0304d9d6
...@@ -21,7 +21,6 @@ module Pod ...@@ -21,7 +21,6 @@ module Pod
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
describe "create subcommand" do describe "create subcommand" do
extend SpecHelper::Github
extend SpecHelper::TemporaryRepos extend SpecHelper::TemporaryRepos
it "creates a new podspec stub file" do it "creates a new podspec stub file" do
...@@ -41,42 +40,58 @@ module Pod ...@@ -41,42 +40,58 @@ module Pod
end end
it "correctly creates a podspec from github" do it "correctly creates a podspec from github" do
expect_github_repo_request repo = {
expect_github_user_request 'name' => 'libPusher',
expect_github_tags_request 'owner' => { 'login' => 'lukeredpath' },
'html_url' => 'https://github.com/lukeredpath/libPusher',
'description' => 'An Objective-C interface to Pusher (pusherapp.com)',
'clone_url' => 'https://github.com/lukeredpath/libPusher.git'
}
GitHub.expects(:repo).with('lukeredpath/libPusher').returns(repo)
GitHub.expects(:tags).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"v1.4"}])
GitHub.expects(:user).with('lukeredpath').returns({ "name" => "Luke Redpath", "email" => "luke@lukeredpath.co.uk" })
run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git') run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git')
path = temporary_directory + 'libPusher.podspec' path = temporary_directory + 'libPusher.podspec'
spec = Specification.from_file(path) spec = Specification.from_file(path)
spec.name.should == 'libPusher' spec.name.should == 'libPusher'
spec.license.should == { :type => "MIT (example)" } spec.license.should == { :type => "MIT (example)" }
spec.version.should == Version.new('1.3') spec.version.should == Version.new('1.4')
spec.summary.should == 'An Objective-C interface to Pusher (pusherapp.com)' spec.summary.should == 'An Objective-C interface to Pusher (pusherapp.com)'
spec.homepage.should == 'https://github.com/lukeredpath/libPusher' spec.homepage.should == 'https://github.com/lukeredpath/libPusher'
spec.authors.should == {"Luke Redpath"=>"luke@lukeredpath.co.uk"} spec.authors.should == {"Luke Redpath"=>"luke@lukeredpath.co.uk"}
spec.source.should == { :git => 'https://github.com/lukeredpath/libPusher.git', :tag => 'v1.3' } spec.source.should == { :git => 'https://github.com/lukeredpath/libPusher.git', :tag => 'v1.4' }
end end
it "accepts a name when creating a podspec form github" do it "accepts a name when creating a podspec form github" do
expect_github_repo_request repo = {
expect_github_user_request 'name' => 'libPusher',
expect_github_tags_request 'owner' => { 'login' => 'lukeredpath' },
'html_url' => 'https://github.com/lukeredpath/libPusher',
'description' => 'An Objective-C interface to Pusher (pusherapp.com)',
'clone_url' => 'https://github.com/lukeredpath/libPusher.git'
}
GitHub.expects(:repo).with('lukeredpath/libPusher').returns(repo)
GitHub.expects(:tags).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"v1.4"}])
GitHub.expects(:user).with('lukeredpath').returns({ "name" => "Luke Redpath", "email" => "luke@lukeredpath.co.uk" })
run_command('spec', 'create', 'other_name', 'https://github.com/lukeredpath/libPusher.git') run_command('spec', 'create', 'other_name', 'https://github.com/lukeredpath/libPusher.git')
path = temporary_directory + 'other_name.podspec' path = temporary_directory + 'other_name.podspec'
spec = Specification.from_file(path) spec = Specification.from_file(path)
spec.name.should == 'other_name' spec.name.should == 'other_name'
spec.license.should == { :type => "MIT (example)" }
spec.version.should == Version.new('1.3')
spec.summary.should == 'An Objective-C interface to Pusher (pusherapp.com)'
spec.homepage.should == 'https://github.com/lukeredpath/libPusher' spec.homepage.should == 'https://github.com/lukeredpath/libPusher'
spec.authors.should == {"Luke Redpath"=>"luke@lukeredpath.co.uk"}
spec.source.should == { :git => 'https://github.com/lukeredpath/libPusher.git', :tag => 'v1.3' }
end end
it "correctly suggests the head commit if a suitable tag is not available on github" do it "correctly suggests the head commit if a suitable tag is not available on github" do
expect_github_repo_request repo = {
expect_github_user_request 'name' => 'libPusher',
expect_github_tags_request([{"name" => "experiment"}]) 'owner' => { 'login' => 'lukeredpath' },
expect_github_branches_request 'html_url' => 'https://github.com/lukeredpath/libPusher',
'description' => 'An Objective-C interface to Pusher (pusherapp.com)',
'clone_url' => 'https://github.com/lukeredpath/libPusher.git'
}
GitHub.expects(:repo).with('lukeredpath/libPusher').returns(repo)
GitHub.expects(:tags).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"experiment"}])
GitHub.expects(:branches).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"master", "commit" => {'sha' => '5f482b0693ac2ac1ad85d1aabc27ec7547cc0bc7'}}])
GitHub.expects(:user).with('lukeredpath').returns({ "name" => "Luke Redpath", "email" => "luke@lukeredpath.co.uk" })
run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git') run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git')
path = temporary_directory + 'libPusher.podspec' path = temporary_directory + 'libPusher.podspec'
spec = Specification.from_file(path) spec = Specification.from_file(path)
...@@ -85,10 +100,17 @@ module Pod ...@@ -85,10 +100,17 @@ module Pod
end end
it "provides a markdown template if a github repo doesn't have semantic version tags" do it "provides a markdown template if a github repo doesn't have semantic version tags" do
expect_github_repo_request repo = {
expect_github_user_request 'name' => 'libPusher',
expect_github_tags_request([{"name" => "experiment"}]) 'owner' => { 'login' => 'lukeredpath' },
expect_github_branches_request 'html_url' => 'https://github.com/lukeredpath/libPusher',
'description' => 'An Objective-C interface to Pusher (pusherapp.com)',
'clone_url' => 'https://github.com/lukeredpath/libPusher.git'
}
GitHub.expects(:repo).with('lukeredpath/libPusher').returns(repo)
GitHub.expects(:tags).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"experiment"}])
GitHub.expects(:branches).with('https://github.com/lukeredpath/libPusher').returns([{"name"=>"master", "commit" => {'sha' => '5f482b0693ac2ac1ad85d1aabc27ec7547cc0bc7'}}])
GitHub.expects(:user).with('lukeredpath').returns({ "name" => "Luke Redpath", "email" => "luke@lukeredpath.co.uk" })
output = run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git') output = run_command('spec', 'create', 'https://github.com/lukeredpath/libPusher.git')
output.should.include 'MARKDOWN TEMPLATE' output.should.include 'MARKDOWN TEMPLATE'
output.should.include 'Please add semantic version tags' output.should.include 'Please add semantic version tags'
...@@ -121,14 +143,13 @@ module Pod ...@@ -121,14 +143,13 @@ module Pod
end end
# @todo VCR is required in CocoaPods only for this test. # @todo VCR is required in CocoaPods only for this test.
# xit "lints a remote podspec" do
# it "lints a remote podspec" do Dir.chdir(fixture('spec-repos') + 'master/JSONKit/1.4/') do
# Dir.chdir(fixture('spec-repos') + 'master/JSONKit/1.4/') do cmd = command('spec', 'lint', '--quick', '--only-errors', '--silent', 'https://github.com/CocoaPods/Specs/raw/master/A2DynamicDelegate/2.0.1/A2DynamicDelegate.podspec')
# cmd = command('spec', 'lint', '--quick', '--only-errors', '--silent', 'https://github.com/CocoaPods/Specs/raw/master/A2DynamicDelegate/2.0.1/A2DynamicDelegate.podspec') # VCR.use_cassette('linter', :record => :new_episodes) { }
# # VCR.use_cassette('linter', :record => :new_episodes) { } lambda { cmd.run }.should.not.raise
# lambda { cmd.run }.should.not.raise end
# end end
# end
before do before do
text = (fixture('spec-repos') + 'master/JSONKit/1.4/JSONKit.podspec').read text = (fixture('spec-repos') + 'master/JSONKit/1.4/JSONKit.podspec').read
...@@ -152,13 +173,13 @@ module Pod ...@@ -152,13 +173,13 @@ module Pod
end end
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
describe "which subcommand" do describe "which subcommand" do
it "errors if a given podspec doesn't exist" do it "errors if a given podspec doesn't exist" do
e = lambda { command('spec', 'which', 'some_pod_that_doesnt_exist').run }.should.raise Informative e = lambda { command('spec', 'which', 'some_pod_that_doesnt_exist').run }.should.raise Informative
e.message.should.match /Unable to find a pod with/ e.message.should.match /Unable to find a pod with/
end end
it "prints the path of a given podspec" do it "prints the path of a given podspec" do
lambda { command('spec', 'which', 'AFNetworking').run }.should.not.raise lambda { command('spec', 'which', 'AFNetworking').run }.should.not.raise
text = "AFNetworking.podspec" text = "AFNetworking.podspec"
......
spec/functional/user_interface_spec.rb
View file @ 0304d9d6
...@@ -22,8 +22,9 @@ module Pod ...@@ -22,8 +22,9 @@ module Pod
end end
it "presents the stats of a specification set" do it "presents the stats of a specification set" do
repo = { "forks"=>42, "watchers"=>318, "pushed_at"=>"2011-01-26T19:06:43Z" } Specification::Set::Presenter.any_instance.expects(:github_last_activity).returns('more than a year ago')
Octokit.expects(:repo).with("robbiehanson/CocoaLumberjack").returns(repo) Specification::Set::Presenter.any_instance.expects(:github_watchers).returns('318')
Specification::Set::Presenter.any_instance.expects(:github_forks).returns('42')
UI.pod(@set, :stats) UI.pod(@set, :stats)
output = UI.output output = UI.output
output.should.include? 'Author: Robbie Hanson' output.should.include? 'Author: Robbie Hanson'
......
spec/integration/install_add_pod/after/Podfile.lock
View file @ 0304d9d6
...@@ -10,4 +10,4 @@ SPEC CHECKSUMS: ...@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601 JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_add_pod/after/Pods/Manifest.lock
View file @ 0304d9d6
...@@ -10,4 +10,4 @@ SPEC CHECKSUMS: ...@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601 JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_add_pod/after/Pods/Pods-Acknowledgements.markdown
View file @ 0304d9d6
# Acknowledgements # Acknowledgements
This application makes use of the following third party libraries: This application makes use of the following third party libraries:
## Reachability
Copyright (c) 2011, Tony Million.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Generated by CocoaPods - http://cocoapods.org Generated by CocoaPods - http://cocoapods.org
spec/integration/install_add_pod/after/Pods/Pods-Acknowledgements.plist
View file @ 0304d9d6
...@@ -12,6 +12,24 @@ ...@@ -12,6 +12,24 @@
<key>Type</key> <key>Type</key>
<string>PSGroupSpecifier</string> <string>PSGroupSpecifier</string>
</dict> </dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2011, Tony Million.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</string>
<key>Title</key>
<string>Reachability</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>Generated by CocoaPods - http://cocoapods.org</string> <string>Generated by CocoaPods - http://cocoapods.org</string>
......
spec/integration/install_add_pod/after/Pods/Pods-JSONKit-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-JSONKit"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods-JSONKit-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-JSONKit-environment.h" #import "Pods-environment.h"
spec/integration/install_add_pod/after/Pods/Pods-JSONKit.xcconfig
View file @ 0304d9d6
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/JSONKit"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods-Reachability-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods-Reachability-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-Reachability-environment.h" #import "Pods-environment.h"
spec/integration/install_add_pod/after/Pods/Pods-Reachability-resources.sh deleted 100755 → 0
View file @ a7607455
#!/bin/sh
install_resource()
{
case $1 in
*.storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
;;
*.xib)
echo "ibtool --reference-external-strings-file --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 --reference-external-strings-file --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}"
;;
*.xcdatamodeld)
echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;;
*)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
;;
esac
}
spec/integration/install_add_pod/after/Pods/Pods-Reachability.xcconfig
View file @ 0304d9d6
ALWAYS_SEARCH_USER_PATHS = YES PODS_REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1 \ No newline at end of file
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
PODS_REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods-prefix.pch
View file @ 0304d9d6
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-environment.h"
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods-resources.sh
View file @ 0304d9d6
${SRCROOT}/Pods/Pods-JSONKit-resources.sh #!/bin/sh
${SRCROOT}/Pods/Pods-Reachability-resources.sh
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
> "$RESOURCES_TO_COPY"
install_resource()
{
case $1 in
*.storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
;;
*.xib)
echo "ibtool --reference-external-strings-file --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 --reference-external-strings-file --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}"
;;
*.xcdatamodeld)
echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;;
*)
echo "${PODS_ROOT}/$1"
echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;;
esac
}
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
spec/integration/install_add_pod/after/Pods/Pods.xcconfig
View file @ 0304d9d6
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
#include "Pods-Reachability" #include "Pods-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS} HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS} OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
PODS_BUILD_HEADERS_SEARCH_PATHS = PODS_ROOT = ${SRCROOT}/Pods
PODS_HEADERS_SEARCH_PATHS = ${PODS_PUBLIC_HEADERS_SEARCH_PATHS} \ No newline at end of file
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/JSONKit" "${PODS_ROOT}/Headers/Reachability"
PODS_ROOT = ${SRCROOT}/Pods
USE_HEADERMAP = $(inherited)
\ No newline at end of file
spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml
View file @ 0304d9d6
...@@ -11,44 +11,41 @@ File References: ...@@ -11,44 +11,41 @@ File References:
- Reachability.h - Reachability.h
- Reachability.m - Reachability.m
- Products: - Products:
- libPods.a
- libPods-JSONKit.a - libPods-JSONKit.a
- libPods-Reachability.a - libPods-Reachability.a
- libPods.a
- Targets Support Files: - Targets Support Files:
- Pods:
- Pods.xcconfig
- Pods-environment.h
- Pods-prefix.pch
- Pods-acknowledgements.plist
- Pods-acknowledgements.markdown
- Pods-dummy.m
- Pods-JSONKit: - Pods-JSONKit:
- Pods-JSONKit.xcconfig - Pods-JSONKit.xcconfig
- Pods-JSONKit-environment.h - Pods-JSONKit-Private.xcconfig
- Pods-JSONKit-prefix.pch - Pods-JSONKit-prefix.pch
- Pods-JSONKit-resources.sh
- Pods-JSONKit-acknowledgements.plist
- Pods-JSONKit-acknowledgements.markdown
- Pods-JSONKit-dummy.m - Pods-JSONKit-dummy.m
- Pods-Reachability: - Pods-Reachability:
- Pods-Reachability.xcconfig - Pods-Reachability.xcconfig
- Pods-Reachability-environment.h - Pods-Reachability-Private.xcconfig
- Pods-Reachability-prefix.pch - Pods-Reachability-prefix.pch
- Pods-Reachability-resources.sh
- Pods-Reachability-acknowledgements.plist
- Pods-Reachability-acknowledgements.markdown
- Pods-Reachability-dummy.m - Pods-Reachability-dummy.m
- Pods:
- Pods.xcconfig
- Pods-environment.h
- Pods-resources.sh
- Pods-acknowledgements.plist
- Pods-acknowledgements.markdown
- Pods-dummy.m
- Podfile - Podfile
Targets: Targets:
- Pods: - Pods-JSONKit:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- Pods-dummy.m - JSONKit.m
- Pods-JSONKit-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase:
- JSONKit.h
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
...@@ -73,8 +70,8 @@ Targets: ...@@ -73,8 +70,8 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-prefix.pch GCC_PREFIX_HEADER: Pods-JSONKit-prefix.pch
Base Configuration: Pods.xcconfig Base Configuration: Pods-JSONKit-Private.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
...@@ -97,17 +94,17 @@ Targets: ...@@ -97,17 +94,17 @@ Targets:
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-prefix.pch GCC_PREFIX_HEADER: Pods-JSONKit-prefix.pch
Base Configuration: Pods.xcconfig Base Configuration: Pods-JSONKit-Private.xcconfig
- Pods-JSONKit: - Pods-Reachability:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- JSONKit.m - Reachability.m
- Pods-JSONKit-dummy.m - Pods-Reachability-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase: - HeadersBuildPhase:
- JSONKit.h - Reachability.h
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
...@@ -132,8 +129,8 @@ Targets: ...@@ -132,8 +129,8 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-JSONKit-prefix.pch GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch
Base Configuration: Pods-JSONKit.xcconfig Base Configuration: Pods-Reachability-Private.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
...@@ -156,21 +153,19 @@ Targets: ...@@ -156,21 +153,19 @@ Targets:
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-JSONKit-prefix.pch GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch
Base Configuration: Pods-JSONKit.xcconfig Base Configuration: Pods-Reachability-Private.xcconfig
- Pods-Reachability: - Pods:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- Reachability.m - Pods-dummy.m
- Pods-Reachability-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase: - libPods-JSONKit.a
- Reachability.h - libPods-Reachability.a
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES' VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS: OTHER_CFLAGS:
...@@ -191,11 +186,10 @@ Targets: ...@@ -191,11 +186,10 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
Base Configuration: Pods-Reachability.xcconfig Base Configuration: Pods.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: ''
PRODUCT_NAME: $(TARGET_NAME) PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos SDKROOT: iphoneos
...@@ -204,19 +198,19 @@ Targets: ...@@ -204,19 +198,19 @@ Targets:
INSTALL_PATH: $(BUILT_PRODUCTS_DIR) INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO' GCC_DYNAMIC_NO_PIC: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO' GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
ARCHS: $(ARCHS_STANDARD_32_BIT) ARCHS: $(ARCHS_STANDARD_32_BIT)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0 GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_PREPROCESSOR_DEFINITIONS: GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1 - DEBUG=1
- $(inherited) - $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch OTHER_LDFLAGS: ''
Base Configuration: Pods-Reachability.xcconfig Base Configuration: Pods.xcconfig
......
spec/integration/install_add_pod/after/execution_output.txt
View file @ 0304d9d6
...@@ -40,33 +40,25 @@ Generating Pods project ...@@ -40,33 +40,25 @@ Generating Pods project
- Adding resources to Pods project - Adding resources to Pods project
- Linking headers - Linking headers
- Installing libraries - Installing libraries
- Installing target `Pods` iOS 6.0
- Adding Build files
- Generating xcconfig file at `Pods/Pods.xcconfig`
- Generating target environment header at `Pods/Pods-environment.h`
- Generating prefix header at `Pods/Pods-prefix.pch`
- Generating copy resources script at `Pods/Pods-resources.sh`
- Generating acknowledgements at `Pods/Pods-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-dummy.m`
- Installing target `Pods-JSONKit` iOS 6.0 - Installing target `Pods-JSONKit` iOS 6.0
- Adding Build files - Adding Build files
- Generating xcconfig file at `Pods/Pods-JSONKit.xcconfig` - Generating public xcconfig file at `Pods/Pods-JSONKit.xcconfig`
- Generating target environment header at `Pods/Pods-JSONKit-environment.h` - Generating private xcconfig file at `Pods/Pods-JSONKit-Private.xcconfig`
- Generating prefix header at `Pods/Pods-JSONKit-prefix.pch` - Generating prefix header at `Pods/Pods-JSONKit-prefix.pch`
- Generating copy resources script at `Pods/Pods-JSONKit-resources.sh`
- Generating acknowledgements at `Pods/Pods-JSONKit-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-JSONKit-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-JSONKit-dummy.m` - Generating dummy source file at `Pods/Pods-JSONKit-dummy.m`
- Installing target `Pods-Reachability` iOS 6.0 - Installing target `Pods-Reachability` iOS 6.0
- Adding Build files - Adding Build files
- Generating xcconfig file at `Pods/Pods-Reachability.xcconfig` - Generating public xcconfig file at `Pods/Pods-Reachability.xcconfig`
- Generating target environment header at `Pods/Pods-Reachability-environment.h` - Generating private xcconfig file at `Pods/Pods-Reachability-Private.xcconfig`
- Generating prefix header at `Pods/Pods-Reachability-prefix.pch` - Generating prefix header at `Pods/Pods-Reachability-prefix.pch`
- Generating copy resources script at `Pods/Pods-Reachability-resources.sh`
- Generating acknowledgements at `Pods/Pods-Reachability-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-Reachability-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-Reachability-dummy.m` - Generating dummy source file at `Pods/Pods-Reachability-dummy.m`
- Installing target `Pods` iOS 6.0
- Generating xcconfig file at `Pods/Pods.xcconfig`
- Generating target environment header at `Pods/Pods-environment.h`
- Generating copy resources script at `Pods/Pods-resources.sh`
- Generating acknowledgements at `Pods/Pods-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-dummy.m`
- Running post install hooks - Running post install hooks
- Writing Xcode project file to `Pods/Pods.xcodeproj` - Writing Xcode project file to `Pods/Pods.xcodeproj`
- Writing Lockfile in `Podfile.lock` - Writing Lockfile in `Podfile.lock`
......
spec/integration/install_podfile_callbacks/after/Podfile.lock → spec/integration/install_custom_workspace/after/Podfile.lock
View file @ 0304d9d6
...@@ -2,9 +2,10 @@ PODS: ...@@ -2,9 +2,10 @@ PODS:
- Reachability (3.1.0) - Reachability (3.1.0)
DEPENDENCIES: DEPENDENCIES:
- Reachability
- Reachability (= 3.1.0) - Reachability (= 3.1.0)
SPEC CHECKSUMS: SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock → spec/integration/install_custom_workspace/after/Pods/Manifest.lock
View file @ 0304d9d6
...@@ -2,9 +2,10 @@ PODS: ...@@ -2,9 +2,10 @@ PODS:
- Reachability (3.1.0) - Reachability (3.1.0)
DEPENDENCIES: DEPENDENCIES:
- Reachability
- Reachability (= 3.1.0) - Reachability (= 3.1.0)
SPEC CHECKSUMS: SPEC CHECKSUMS:
Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b Reachability: ba94ecd4eaa037be3d0588b38956672588530c5b
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-SampleApp_1-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-dummy.m 0 → 100644
View file @ 0304d9d6
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_SampleApp_1_Reachability : NSObject
@end
@implementation PodsDummy_Pods_SampleApp_1_Reachability
@end
spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-prefix.pch → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-SampleApp_2-environment.h" #import "Pods-SampleApp_1-environment.h"
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability.xcconfig 0 → 100644
View file @ 0304d9d6
PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
\ No newline at end of file
spec/integration/install_podfile_callbacks/after/Pods/Pods-Reachability-dummy.m → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-dummy.m
View file @ 0304d9d6
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface PodsDummy_Pods_Reachability : NSObject @interface PodsDummy_Pods_SampleApp_1 : NSObject
@end @end
@implementation PodsDummy_Pods_Reachability @implementation PodsDummy_Pods_SampleApp_1
@end @end
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-resources.sh → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
View file @ 0304d9d6
#!/bin/sh #!/bin/sh
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
> "$RESOURCES_TO_COPY"
install_resource() install_resource()
{ {
case $1 in case $1 in
...@@ -20,8 +23,11 @@ install_resource() ...@@ -20,8 +23,11 @@ install_resource()
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd" xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;; ;;
*) *)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;; ;;
esac esac
} }
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-SampleApp_1-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-SampleApp_2-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-dummy.m 0 → 100644
View file @ 0304d9d6
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_SampleApp_2_Reachability : NSObject
@end
@implementation PodsDummy_Pods_SampleApp_2_Reachability
@end
spec/integration/install_multiple_targets/after/Pods/Pods-prefix.pch → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-environment.h" #import "Pods-SampleApp_2-environment.h"
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability.xcconfig 0 → 100644
View file @ 0304d9d6
PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
\ No newline at end of file
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-dummy.m 0 → 100644
View file @ 0304d9d6
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_SampleApp_2 : NSObject
@end
@implementation PodsDummy_Pods_SampleApp_2
@end
spec/integration/install_add_pod/after/Pods/Pods-Reachability-environment.h → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-environment.h
View file @ 0304d9d6
...@@ -6,3 +6,9 @@ ...@@ -6,3 +6,9 @@
// project. // project.
// Reachability
#define COCOAPODS_POD_AVAILABLE_Reachability
#define COCOAPODS_VERSION_MAJOR_Reachability 3
#define COCOAPODS_VERSION_MINOR_Reachability 1
#define COCOAPODS_VERSION_PATCH_Reachability 0
spec/integration/install_add_pod/after/Pods/Pods-JSONKit-resources.sh → spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
View file @ 0304d9d6
#!/bin/sh #!/bin/sh
RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
> "$RESOURCES_TO_COPY"
install_resource() install_resource()
{ {
case $1 in case $1 in
...@@ -20,8 +23,11 @@ install_resource() ...@@ -20,8 +23,11 @@ install_resource()
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd" xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;; ;;
*) *)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;; ;;
esac esac
} }
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-SampleApp_2-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_SAMPLEAPP___REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml → spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
View file @ 0304d9d6
...@@ -8,40 +8,52 @@ File References: ...@@ -8,40 +8,52 @@ File References:
- Reachability.h - Reachability.h
- Reachability.m - Reachability.m
- Products: - Products:
- libPods.a - libPods-SampleApp_1-Reachability.a
- libPods-Reachability.a - libPods-SampleApp_2-Reachability.a
- libPods-SampleApp_1.a
- libPods-SampleApp_2.a
- Targets Support Files: - Targets Support Files:
- Pods: - Pods-SampleApp_1-Reachability:
- Pods.xcconfig - Pods-SampleApp_1-Reachability.xcconfig
- Pods-environment.h - Pods-SampleApp_1-Reachability-Private.xcconfig
- Pods-prefix.pch - Pods-SampleApp_1-Reachability-prefix.pch
- Pods-acknowledgements.plist - Pods-SampleApp_1-Reachability-dummy.m
- Pods-acknowledgements.markdown - Pods-SampleApp_2-Reachability:
- Pods-dummy.m - Pods-SampleApp_2-Reachability.xcconfig
- Pods-Reachability: - Pods-SampleApp_2-Reachability-Private.xcconfig
- Pods-Reachability.xcconfig - Pods-SampleApp_2-Reachability-prefix.pch
- Pods-Reachability-environment.h - Pods-SampleApp_2-Reachability-dummy.m
- Pods-Reachability-prefix.pch - Pods-SampleApp_1:
- Pods-Reachability-resources.sh - Pods-SampleApp_1.xcconfig
- Pods-Reachability-acknowledgements.plist - Pods-SampleApp_1-environment.h
- Pods-Reachability-acknowledgements.markdown - Pods-SampleApp_1-resources.sh
- Pods-Reachability-dummy.m - Pods-SampleApp_1-acknowledgements.plist
- Pods-SampleApp_1-acknowledgements.markdown
- Pods-SampleApp_1-dummy.m
- Pods-SampleApp_2:
- Pods-SampleApp_2.xcconfig
- Pods-SampleApp_2-environment.h
- Pods-SampleApp_2-resources.sh
- Pods-SampleApp_2-acknowledgements.plist
- Pods-SampleApp_2-acknowledgements.markdown
- Pods-SampleApp_2-dummy.m
- Podfile - Podfile
Targets: Targets:
- Pods: - Pods-SampleApp_1-Reachability:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- Pods-dummy.m - Reachability.m
- Pods-SampleApp_1-Reachability-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- libPods-Reachability.a - HeadersBuildPhase:
- Reachability.h
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
GCC_ENABLE_OBJC_GC: supported
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES' VALIDATE_PRODUCT: 'YES'
...@@ -63,38 +75,37 @@ Targets: ...@@ -63,38 +75,37 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-prefix.pch GCC_PREFIX_HEADER: Pods-SampleApp_1-Reachability-prefix.pch
Base Configuration: Pods.xcconfig Base Configuration: Pods-SampleApp_1-Reachability-Private.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: ''
PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst DSTROOT: /tmp/xcodeproj.dst
GCC_ENABLE_OBJC_GC: supported GCC_DYNAMIC_NO_PIC: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
ARCHS: $(ARCHS_STANDARD_32_BIT)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
GCC_PREPROCESSOR_DEFINITIONS: GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1 - DEBUG=1
- $(inherited) - $(inherited)
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
GCC_PREFIX_HEADER: Pods-prefix.pch
GCC_OPTIMIZATION_LEVEL: '0'
GCC_C_LANGUAGE_STANDARD: gnu99
OTHER_LDFLAGS: ''
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ALWAYS_SEARCH_USER_PATHS: 'NO'
SDKROOT: iphoneos
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
COPY_PHASE_STRIP: 'NO'
PRODUCT_NAME: $(TARGET_NAME)
GCC_DYNAMIC_NO_PIC: 'NO'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
ARCHS: $(ARCHS_STANDARD_32_BIT) COPY_PHASE_STRIP: 'NO'
SKIP_INSTALL: 'YES' GCC_PREFIX_HEADER: Pods-SampleApp_1-Reachability-prefix.pch
Base Configuration: Pods.xcconfig Base Configuration: Pods-SampleApp_1-Reachability-Private.xcconfig
- Pods-Reachability: - Pods-SampleApp_2-Reachability:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- Reachability.m - Reachability.m
- Pods-Reachability-dummy.m - Pods-SampleApp_2-Reachability-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase: - HeadersBuildPhase:
...@@ -123,8 +134,8 @@ Targets: ...@@ -123,8 +134,8 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch GCC_PREFIX_HEADER: Pods-SampleApp_2-Reachability-prefix.pch
Base Configuration: Pods-Reachability.xcconfig Base Configuration: Pods-SampleApp_2-Reachability-Private.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
...@@ -147,8 +158,118 @@ Targets: ...@@ -147,8 +158,118 @@ Targets:
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0' IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-Reachability-prefix.pch GCC_PREFIX_HEADER: Pods-SampleApp_2-Reachability-prefix.pch
Base Configuration: Pods-Reachability.xcconfig Base Configuration: Pods-SampleApp_2-Reachability-Private.xcconfig
- Pods-SampleApp_1:
Build Phases:
- SourcesBuildPhase:
- Pods-SampleApp_1-dummy.m
- FrameworksBuildPhase:
- Foundation.framework
- libPods-SampleApp_1-Reachability.a
Build Configurations:
- Release:
Build Settings:
SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
OTHER_CPLUSPLUSFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ARCHS: $(ARCHS_STANDARD_32_BIT)
PRODUCT_NAME: $(TARGET_NAME)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES'
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
Base Configuration: Pods-SampleApp_1.xcconfig
- Debug:
Build Settings:
PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
ARCHS: $(ARCHS_STANDARD_32_BIT)
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1
- $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO'
OTHER_LDFLAGS: ''
Base Configuration: Pods-SampleApp_1.xcconfig
- Pods-SampleApp_2:
Build Phases:
- SourcesBuildPhase:
- Pods-SampleApp_2-dummy.m
- FrameworksBuildPhase:
- Foundation.framework
- libPods-SampleApp_2-Reachability.a
Build Configurations:
- Release:
Build Settings:
SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
OTHER_CPLUSPLUSFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ARCHS: $(ARCHS_STANDARD_32_BIT)
PRODUCT_NAME: $(TARGET_NAME)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'YES'
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
Base Configuration: Pods-SampleApp_2.xcconfig
- Debug:
Build Settings:
PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
ARCHS: $(ARCHS_STANDARD_32_BIT)
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1
- $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '6.0'
COPY_PHASE_STRIP: 'NO'
OTHER_LDFLAGS: ''
Base Configuration: Pods-SampleApp_2.xcconfig
......
spec/integration/install_custom_workspace/after/Workspace.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ 0304d9d6
<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:SampleApp_1.xcodeproj'/><FileRef location='group:SampleApp_2.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace>
\ No newline at end of file
spec/integration/install_custom_workspace/after/execution_output.txt
View file @ 0304d9d6
...@@ -35,80 +35,41 @@ Downloading dependencies ...@@ -35,80 +35,41 @@ Downloading dependencies
Generating Pods project Generating Pods project
- Creating Pods project - Creating Pods project
- Adding source files to Pods project
――― MARKDOWN TEMPLATE ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― - Adding resources to Pods project
- Linking headers
### Report - Installing libraries
- Installing target `Pods-SampleApp_1-Reachability` iOS 6.0
* What did you do? - Adding Build files
- Generating public xcconfig file at `Pods/Pods-SampleApp_1-Reachability.xcconfig`
* What did you expect to happen? - Generating private xcconfig file at `Pods/Pods-SampleApp_1-Reachability-Private.xcconfig`
- Generating prefix header at `Pods/Pods-SampleApp_1-Reachability-prefix.pch`
* What happened instead? - Generating dummy source file at `Pods/Pods-SampleApp_1-Reachability-dummy.m`
- Installing target `Pods-SampleApp_2-Reachability` iOS 6.0
- Adding Build files
### Stack - Generating public xcconfig file at `Pods/Pods-SampleApp_2-Reachability.xcconfig`
- Generating private xcconfig file at `Pods/Pods-SampleApp_2-Reachability-Private.xcconfig`
``` - Generating prefix header at `Pods/Pods-SampleApp_2-Reachability-prefix.pch`
CocoaPods : 0.19.1 - Generating dummy source file at `Pods/Pods-SampleApp_2-Reachability-dummy.m`
Ruby : ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-darwin12.2.0] - Installing target `Pods-SampleApp_1` iOS 6.0
RubyGems : 2.0.3 - Generating xcconfig file at `Pods/Pods-SampleApp_1.xcconfig`
Host : Mac OS X 10.8.3 (12D78) - Generating target environment header at `Pods/Pods-SampleApp_1-environment.h`
Xcode : 4.6.2 (4H1003) - Generating copy resources script at `Pods/Pods-SampleApp_1-resources.sh`
Ruby lib dir : /Users/fabio/.rbenv/versions/2.0.0-p0/lib - Generating acknowledgements at `Pods/Pods-SampleApp_1-acknowledgements.plist`
Repositories : master - git@github.com:CocoaPods/Specs.git @ d42c2e09cf5754edcba639da4d6c3f320535d501 - Generating acknowledgements at `Pods/Pods-SampleApp_1-acknowledgements.markdown`
test - @ fatal: Not a git repository (or any of the parent directories): .git - Generating dummy source file at `Pods/Pods-SampleApp_1-dummy.m`
``` - Installing target `Pods-SampleApp_2` iOS 6.0
- Generating xcconfig file at `Pods/Pods-SampleApp_2.xcconfig`
### Podfile - Generating target environment header at `Pods/Pods-SampleApp_2-environment.h`
- Generating copy resources script at `Pods/Pods-SampleApp_2-resources.sh`
```ruby - Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.plist`
platform :ios, '6.0' - Generating acknowledgements at `Pods/Pods-SampleApp_2-acknowledgements.markdown`
workspace 'Workspace.xcworkspace' - Generating dummy source file at `Pods/Pods-SampleApp_2-dummy.m`
- Running post install hooks
# TODO: remove - Writing Xcode project file to `Pods/Pods.xcodeproj`
xcodeproj 'SampleApp_1.xcodeproj' - Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
target 'SampleApp_1' do
xcodeproj 'SampleApp_1.xcodeproj' Integrating client projects
pod "Reachability", "3.1.0"
end [!] From now on use `Workspace.xcworkspace`.
target :'SampleApp_2' do
xcodeproj 'SampleApp_2.xcodeproj'
pod "Reachability"
end
```
### Error
```
NoMethodError - undefined method `name' for nil:NilClass
ROOT/lib/cocoapods/installer.rb:290:in `block (2 levels) in prepare_pods_project'
ROOT/lib/cocoapods/installer.rb:290:in `select'
ROOT/lib/cocoapods/installer.rb:290:in `block in prepare_pods_project'
ROOT/lib/cocoapods/user_interface.rb:113:in `message'
ROOT/lib/cocoapods/installer.rb:283:in `prepare_pods_project'
ROOT/lib/cocoapods/installer.rb:109:in `block in generate_pods_project'
ROOT/lib/cocoapods/user_interface.rb:52:in `section'
ROOT/lib/cocoapods/installer.rb:108:in `generate_pods_project'
ROOT/lib/cocoapods/installer.rb:86:in `install!'
ROOT/lib/cocoapods/command/project.rb:40:in `run_install_with_update'
ROOT/lib/cocoapods/command/project.rb:70:in `run'
/Users/fabio/.rbenv/versions/2.0.0-p0/lib/ruby/gems/2.0.0/gems/claide-0.2.0/lib/claide.rb:535:in `run'
ROOT/lib/cocoapods/command.rb:48:in `run'
ROOT/bin/pod:16:in `<main>'
```
――― TEMPLATE END ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
[!] Oh no, an error occurred.
Search for existing github issues similar to yours:
https://github.com/CocoaPods/CocoaPods/issues/search?q=undefined+method+%60name%27+for+nil%3ANilClass
If none exists, create a ticket, with the template displayed above, on:
https://github.com/CocoaPods/CocoaPods/issues/new
Don't forget to anonymize any private data!
spec/integration/install_external_source/after/Podfile.lock
View file @ 0304d9d6
...@@ -15,4 +15,4 @@ EXTERNAL SOURCES: ...@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_external_source/after/Pods/Manifest.lock
View file @ 0304d9d6
...@@ -15,4 +15,4 @@ EXTERNAL SOURCES: ...@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_external_source/after/Pods/Pods-PodTest-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-PodTest"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
OTHER_LDFLAGS = -ObjC
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods-PodTest-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,6 @@ ...@@ -2,4 +2,6 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-PodTest-environment.h" #import "Pods-environment.h"
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1-acknowledgements.markdown deleted 100644 → 0
View file @ a7607455
# Acknowledgements
This application makes use of the following third party libraries:
Generated by CocoaPods - http://cocoapods.org
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1-acknowledgements.plist deleted 100644 → 0
View file @ a7607455
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>FooterText</key>
<string>This application makes use of the following third party libraries:</string>
<key>Title</key>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Generated by CocoaPods - http://cocoapods.org</string>
<key>Title</key>
<string></string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
</array>
<key>StringsTable</key>
<string>Acknowledgements</string>
<key>Title</key>
<string>Acknowledgements</string>
</dict>
</plist>
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1-dummy.m deleted 100644 → 0
View file @ a7607455
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_PodTest_subspec_1 : NSObject
@end
@implementation PodsDummy_Pods_PodTest_subspec_1
@end
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1-environment.h deleted 100644 → 0
View file @ a7607455
// To check if a library is compiled with CocoaPods you
// can use the `COCOAPODS` macro definition which is
// defined in the xcconfigs so it is available in
// headers also when they are imported in the client
// project.
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1-prefix.pch deleted 100644 → 0
View file @ a7607455
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "Pods-PodTest-subspec_1-environment.h"
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_1.xcconfig deleted 100644 → 0
View file @ a7607455
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-acknowledgements.markdown deleted 100644 → 0
View file @ a7607455
# Acknowledgements
This application makes use of the following third party libraries:
Generated by CocoaPods - http://cocoapods.org
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-acknowledgements.plist deleted 100644 → 0
View file @ a7607455
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>FooterText</key>
<string>This application makes use of the following third party libraries:</string>
<key>Title</key>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Generated by CocoaPods - http://cocoapods.org</string>
<key>Title</key>
<string></string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
</array>
<key>StringsTable</key>
<string>Acknowledgements</string>
<key>Title</key>
<string>Acknowledgements</string>
</dict>
</plist>
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-dummy.m deleted 100644 → 0
View file @ a7607455
#import <Foundation/Foundation.h>
@interface PodsDummy_Pods_PodTest_subspec_2 : NSObject
@end
@implementation PodsDummy_Pods_PodTest_subspec_2
@end
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-environment.h deleted 100644 → 0
View file @ a7607455
// To check if a library is compiled with CocoaPods you
// can use the `COCOAPODS` macro definition which is
// defined in the xcconfigs so it is available in
// headers also when they are imported in the client
// project.
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2-prefix.pch deleted 100644 → 0
View file @ a7607455
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "Pods-PodTest-subspec_2-environment.h"
spec/integration/install_external_source/after/Pods/Pods-PodTest-subspec_2.xcconfig deleted 100644 → 0
View file @ a7607455
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods-PodTest.xcconfig
View file @ 0304d9d6
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/PodTest"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods-prefix.pch deleted 100644 → 0
View file @ a7607455
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "Pods-environment.h"
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods-resources.sh
View file @ 0304d9d6
${SRCROOT}/Pods/Pods-PodTest-resources.sh #!/bin/sh
${SRCROOT}/Pods/Pods-PodTest-subspec_1-resources.sh
${SRCROOT}/Pods/Pods-PodTest-subspec_2-resources.sh RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy.txt
> "$RESOURCES_TO_COPY"
install_resource()
{
case $1 in
*.storyboard)
echo "ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
ibtool --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
;;
*.xib)
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}"
;;
*.xcdatamodeld)
echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;;
*)
echo "${PODS_ROOT}/$1"
echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY"
;;
esac
}
rsync -avr --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rm "$RESOURCES_TO_COPY"
spec/integration/install_external_source/after/Pods/Pods.xcconfig
View file @ 0304d9d6
#include "Pods-PodTest" #include "Pods-PodTest"
#include "Pods-PodTest-subspec_1"
#include "Pods-PodTest-subspec_2"
ALWAYS_SEARCH_USER_PATHS = YES ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS} HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
OTHER_LDFLAGS = -ObjC OTHER_LDFLAGS = -ObjC
PODS_BUILD_HEADERS_SEARCH_PATHS = PODS_ROOT = ${SRCROOT}/Pods
PODS_HEADERS_SEARCH_PATHS = ${PODS_PUBLIC_HEADERS_SEARCH_PATHS} \ No newline at end of file
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/PodTest"
PODS_ROOT = ${SRCROOT}/Pods
USE_HEADERMAP = $(inherited)
\ No newline at end of file
spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml
View file @ 0304d9d6
...@@ -11,112 +11,37 @@ File References: ...@@ -11,112 +11,37 @@ File References:
- subspec_2.h - subspec_2.h
- subspec_2.m - subspec_2.m
- Products: - Products:
- libPods.a
- libPods-PodTest.a - libPods-PodTest.a
- libPods-PodTest-subspec_1.a - libPods.a
- libPods-PodTest-subspec_2.a
- Targets Support Files: - Targets Support Files:
- Pods-PodTest:
- Pods-PodTest.xcconfig
- Pods-PodTest-Private.xcconfig
- Pods-PodTest-prefix.pch
- Pods-PodTest-dummy.m
- Pods: - Pods:
- Pods.xcconfig - Pods.xcconfig
- Pods-environment.h - Pods-environment.h
- Pods-prefix.pch - Pods-resources.sh
- Pods-acknowledgements.plist - Pods-acknowledgements.plist
- Pods-acknowledgements.markdown - Pods-acknowledgements.markdown
- Pods-dummy.m - Pods-dummy.m
- Pods-PodTest:
- Pods-PodTest.xcconfig
- Pods-PodTest-environment.h
- Pods-PodTest-prefix.pch
- Pods-PodTest-resources.sh
- Pods-PodTest-acknowledgements.plist
- Pods-PodTest-acknowledgements.markdown
- Pods-PodTest-dummy.m
- Pods-PodTest-subspec_1:
- Pods-PodTest-subspec_1.xcconfig
- Pods-PodTest-subspec_1-environment.h
- Pods-PodTest-subspec_1-prefix.pch
- Pods-PodTest-subspec_1-resources.sh
- Pods-PodTest-subspec_1-acknowledgements.plist
- Pods-PodTest-subspec_1-acknowledgements.markdown
- Pods-PodTest-subspec_1-dummy.m
- Pods-PodTest-subspec_2:
- Pods-PodTest-subspec_2.xcconfig
- Pods-PodTest-subspec_2-environment.h
- Pods-PodTest-subspec_2-prefix.pch
- Pods-PodTest-subspec_2-resources.sh
- Pods-PodTest-subspec_2-acknowledgements.plist
- Pods-PodTest-subspec_2-acknowledgements.markdown
- Pods-PodTest-subspec_2-dummy.m
- Podfile - Podfile
Targets: Targets:
- Pods:
Build Phases:
- SourcesBuildPhase:
- Pods-dummy.m
- FrameworksBuildPhase:
- Foundation.framework
- libPods-PodTest.a
- libPods-PodTest-subspec_1.a
- libPods-PodTest-subspec_2.a
Build Configurations:
- Release:
Build Settings:
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
OTHER_CPLUSPLUSFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ARCHS: $(ARCHS_STANDARD_32_BIT)
PRODUCT_NAME: $(TARGET_NAME)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-prefix.pch
Base Configuration: Pods.xcconfig
- Debug:
Build Settings:
OTHER_LDFLAGS: ''
PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
ARCHS: $(ARCHS_STANDARD_32_BIT)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1
- $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-prefix.pch
Base Configuration: Pods.xcconfig
- Pods-PodTest: - Pods-PodTest:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- subspec_1.m
- subspec_2.m
- Pods-PodTest-dummy.m - Pods-PodTest-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase:
- subspec_1.h
- subspec_2.h
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
...@@ -142,7 +67,7 @@ Targets: ...@@ -142,7 +67,7 @@ Targets:
IPHONEOS_DEPLOYMENT_TARGET: '4.3' IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-PodTest-prefix.pch GCC_PREFIX_HEADER: Pods-PodTest-prefix.pch
Base Configuration: Pods-PodTest.xcconfig Base Configuration: Pods-PodTest-Private.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
...@@ -166,20 +91,17 @@ Targets: ...@@ -166,20 +91,17 @@ Targets:
IPHONEOS_DEPLOYMENT_TARGET: '4.3' IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-PodTest-prefix.pch GCC_PREFIX_HEADER: Pods-PodTest-prefix.pch
Base Configuration: Pods-PodTest.xcconfig Base Configuration: Pods-PodTest-Private.xcconfig
- Pods-PodTest-subspec_1: - Pods:
Build Phases: Build Phases:
- SourcesBuildPhase: - SourcesBuildPhase:
- subspec_1.m - Pods-dummy.m
- Pods-PodTest-subspec_1-dummy.m
- FrameworksBuildPhase: - FrameworksBuildPhase:
- Foundation.framework - Foundation.framework
- HeadersBuildPhase: - libPods-PodTest.a
- subspec_1.h
Build Configurations: Build Configurations:
- Release: - Release:
Build Settings: Build Settings:
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos SDKROOT: iphoneos
VALIDATE_PRODUCT: 'YES' VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS: OTHER_CFLAGS:
...@@ -200,70 +122,10 @@ Targets: ...@@ -200,70 +122,10 @@ Targets:
OTHER_LDFLAGS: '' OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '4.3' IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'YES' COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-PodTest-subspec_1-prefix.pch
Base Configuration: Pods-PodTest-subspec_1.xcconfig
- Debug:
Build Settings:
OTHER_LDFLAGS: ''
PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
ARCHS: $(ARCHS_STANDARD_32_BIT)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1
- $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-PodTest-subspec_1-prefix.pch
Base Configuration: Pods-PodTest-subspec_1.xcconfig
- Pods-PodTest-subspec_2:
Build Phases:
- SourcesBuildPhase:
- subspec_2.m
- Pods-PodTest-subspec_2-dummy.m
- FrameworksBuildPhase:
- Foundation.framework
- HeadersBuildPhase:
- subspec_2.h
Build Configurations:
- Release:
Build Settings:
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos Base Configuration: Pods.xcconfig
VALIDATE_PRODUCT: 'YES'
OTHER_CFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
GCC_C_LANGUAGE_STANDARD: gnu99
SKIP_INSTALL: 'YES'
INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst
OTHER_CPLUSPLUSFLAGS:
- -DNS_BLOCK_ASSERTIONS=1
- $(inherited)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ARCHS: $(ARCHS_STANDARD_32_BIT)
PRODUCT_NAME: $(TARGET_NAME)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
OTHER_LDFLAGS: ''
IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'YES'
GCC_PREFIX_HEADER: Pods-PodTest-subspec_2-prefix.pch
Base Configuration: Pods-PodTest-subspec_2.xcconfig
- Debug: - Debug:
Build Settings: Build Settings:
OTHER_LDFLAGS: ''
PRODUCT_NAME: $(TARGET_NAME) PRODUCT_NAME: $(TARGET_NAME)
PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME) PUBLIC_HEADERS_FOLDER_PATH: $(TARGET_NAME)
SDKROOT: iphoneos SDKROOT: iphoneos
...@@ -272,19 +134,19 @@ Targets: ...@@ -272,19 +134,19 @@ Targets:
INSTALL_PATH: $(BUILT_PRODUCTS_DIR) INSTALL_PATH: $(BUILT_PRODUCTS_DIR)
DSTROOT: /tmp/xcodeproj.dst DSTROOT: /tmp/xcodeproj.dst
GCC_DYNAMIC_NO_PIC: 'NO' GCC_DYNAMIC_NO_PIC: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
GCC_SYMBOLS_PRIVATE_EXTERN: 'NO' GCC_SYMBOLS_PRIVATE_EXTERN: 'NO'
GCC_OPTIMIZATION_LEVEL: '0'
ARCHS: $(ARCHS_STANDARD_32_BIT) ARCHS: $(ARCHS_STANDARD_32_BIT)
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_VERSION: com.apple.compilers.llvm.clang.1_0 GCC_VERSION: com.apple.compilers.llvm.clang.1_0
ALWAYS_SEARCH_USER_PATHS: 'NO'
GCC_PREPROCESSOR_DEFINITIONS: GCC_PREPROCESSOR_DEFINITIONS:
- DEBUG=1 - DEBUG=1
- $(inherited) - $(inherited)
GCC_PRECOMPILE_PREFIX_HEADER: 'YES' GCC_PRECOMPILE_PREFIX_HEADER: 'YES'
IPHONEOS_DEPLOYMENT_TARGET: '4.3' IPHONEOS_DEPLOYMENT_TARGET: '4.3'
COPY_PHASE_STRIP: 'NO' COPY_PHASE_STRIP: 'NO'
GCC_PREFIX_HEADER: Pods-PodTest-subspec_2-prefix.pch OTHER_LDFLAGS: ''
Base Configuration: Pods-PodTest-subspec_2.xcconfig Base Configuration: Pods.xcconfig
......
spec/integration/install_external_source/after/execution_output.txt
View file @ 0304d9d6
...@@ -28,42 +28,19 @@ Generating Pods project ...@@ -28,42 +28,19 @@ Generating Pods project
- Adding resources to Pods project - Adding resources to Pods project
- Linking headers - Linking headers
- Installing libraries - Installing libraries
- Installing target `Pods` iOS 4.3 - Installing target `Pods-PodTest` iOS 4.3
- Adding Build files - Adding Build files
- Generating public xcconfig file at `Pods/Pods-PodTest.xcconfig`
- Generating private xcconfig file at `Pods/Pods-PodTest-Private.xcconfig`
- Generating prefix header at `Pods/Pods-PodTest-prefix.pch`
- Generating dummy source file at `Pods/Pods-PodTest-dummy.m`
- Installing target `Pods` iOS 4.3
- Generating xcconfig file at `Pods/Pods.xcconfig` - Generating xcconfig file at `Pods/Pods.xcconfig`
- Generating target environment header at `Pods/Pods-environment.h` - Generating target environment header at `Pods/Pods-environment.h`
- Generating prefix header at `Pods/Pods-prefix.pch`
- Generating copy resources script at `Pods/Pods-resources.sh` - Generating copy resources script at `Pods/Pods-resources.sh`
- Generating acknowledgements at `Pods/Pods-acknowledgements.plist` - Generating acknowledgements at `Pods/Pods-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-acknowledgements.markdown` - Generating acknowledgements at `Pods/Pods-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-dummy.m` - Generating dummy source file at `Pods/Pods-dummy.m`
- Installing target `Pods-PodTest` iOS 4.3
- Adding Build files
- Generating xcconfig file at `Pods/Pods-PodTest.xcconfig`
- Generating target environment header at `Pods/Pods-PodTest-environment.h`
- Generating prefix header at `Pods/Pods-PodTest-prefix.pch`
- Generating copy resources script at `Pods/Pods-PodTest-resources.sh`
- Generating acknowledgements at `Pods/Pods-PodTest-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-PodTest-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-PodTest-dummy.m`
- Installing target `Pods-PodTest-subspec_1` iOS 4.3
- Adding Build files
- Generating xcconfig file at `Pods/Pods-PodTest-subspec_1.xcconfig`
- Generating target environment header at `Pods/Pods-PodTest-subspec_1-environment.h`
- Generating prefix header at `Pods/Pods-PodTest-subspec_1-prefix.pch`
- Generating copy resources script at `Pods/Pods-PodTest-subspec_1-resources.sh`
- Generating acknowledgements at `Pods/Pods-PodTest-subspec_1-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-PodTest-subspec_1-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-PodTest-subspec_1-dummy.m`
- Installing target `Pods-PodTest-subspec_2` iOS 4.3
- Adding Build files
- Generating xcconfig file at `Pods/Pods-PodTest-subspec_2.xcconfig`
- Generating target environment header at `Pods/Pods-PodTest-subspec_2-environment.h`
- Generating prefix header at `Pods/Pods-PodTest-subspec_2-prefix.pch`
- Generating copy resources script at `Pods/Pods-PodTest-subspec_2-resources.sh`
- Generating acknowledgements at `Pods/Pods-PodTest-subspec_2-acknowledgements.plist`
- Generating acknowledgements at `Pods/Pods-PodTest-subspec_2-acknowledgements.markdown`
- Generating dummy source file at `Pods/Pods-PodTest-subspec_2-dummy.m`
- Running post install hooks - Running post install hooks
- Writing Xcode project file to `Pods/Pods.xcodeproj` - Writing Xcode project file to `Pods/Pods.xcodeproj`
- Writing Lockfile in `Podfile.lock` - Writing Lockfile in `Podfile.lock`
...@@ -73,4 +50,4 @@ Integrating client project ...@@ -73,4 +50,4 @@ Integrating client project
[!] From now on use `SampleApp.xcworkspace`. [!] From now on use `SampleApp.xcworkspace`.
Integrating libraries `Pods-PodTest, Pods-PodTest-subspec_1, and Pods-PodTest-subspec_2` into target Pods of project `SampleApp.xcodeproj`. Integrating Pod target `Pods-PodTest` into aggregate target Pods of project `SampleApp.xcodeproj`.
spec/integration/install_local_source/after/Podfile.lock
View file @ 0304d9d6
...@@ -11,4 +11,4 @@ EXTERNAL SOURCES: ...@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_local_source/after/Pods/Manifest.lock
View file @ 0304d9d6
...@@ -11,4 +11,4 @@ EXTERNAL SOURCES: ...@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
COCOAPODS: 0.19.1 COCOAPODS: 0.20.2
spec/integration/install_local_source/after/Pods/Pods-Reachability-Private.xcconfig 0 → 100644
View file @ 0304d9d6
#include "Pods-Reachability"
ALWAYS_SEARCH_USER_PATHS = YES
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1
HEADER_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability" "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
PODS_ROOT = ${SRCROOT}
\ No newline at end of file
spec/integration/install_local_source/after/Pods/Pods-Reachability-acknowledgements.markdown deleted 100644 → 0
View file @ a7607455
# Acknowledgements
This application makes use of the following third party libraries:
Generated by CocoaPods - http://cocoapods.org
spec/integration/install_local_source/after/Pods/Pods-Reachability-acknowledgements.plist deleted 100644 → 0
View file @ a7607455
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>FooterText</key>
<string>This application makes use of the following third party libraries:</string>
<key>Title</key>
<string>Acknowledgements</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Generated by CocoaPods - http://cocoapods.org</string>
<key>Title</key>
<string></string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
</array>
<key>StringsTable</key>
<string>Acknowledgements</string>
<key>Title</key>
<string>Acknowledgements</string>
</dict>
</plist>
spec/integration/install_local_source/after/Pods/Pods-Reachability-environment.h deleted 100644 → 0
View file @ a7607455
// To check if a library is compiled with CocoaPods you
// can use the `COCOAPODS` macro definition which is
// defined in the xcconfigs so it is available in
// headers also when they are imported in the client
// project.
spec/integration/install_local_source/after/Pods/Pods-Reachability-prefix.pch
View file @ 0304d9d6
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
#import "Pods-Reachability-environment.h" #import "Pods-environment.h"
spec/integration/install_local_source/after/Pods/Pods-Reachability-resources.sh deleted 100755 → 0
View file @ a7607455
#!/bin/sh
install_resource()
{
case $1 in
*.storyboard)
echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
;;
*.xib)
echo "ibtool --reference-external-strings-file --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 --reference-external-strings-file --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}"
;;
*.xcdatamodeld)
echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
;;
*)
echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
;;
esac
}
spec/integration/install_local_source/after/Pods/Pods-Reachability.xcconfig
View file @ 0304d9d6
ALWAYS_SEARCH_USER_PATHS = YES PODS_REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
GCC_PREPROCESSOR_DEFINITIONS = COCOAPODS=1 \ No newline at end of file
HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
OTHER_LDFLAGS = -ObjC ${PODS_REACHABILITY_OTHER_LDFLAGS}
PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/Reachability"
PODS_HEADERS_SEARCH_PATHS = ${PODS_BUILD_HEADERS_SEARCH_PATHS} ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/Reachability"
PODS_REACHABILITY_OTHER_LDFLAGS = -framework SystemConfiguration
PODS_ROOT = ${SRCROOT}
USE_HEADERMAP = NO
\ No newline at end of file
spec/integration/install_local_source/after/Pods/Pods-prefix.pch deleted 100644 → 0
View file @ a7607455
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#endif
#import "Pods-environment.h"
\ No newline at end of file
spec/integration/install_subspecs/after/Podfile.lock 0 → 100644
View file @ 0304d9d6
This diff is collapsed.
spec/integration/install_subspecs/after/Pods/Manifest.lock 0 → 100644
View file @ 0304d9d6
This diff is collapsed.
spec/integration/update/after/Podfile.lock
View file @ 0304d9d6
This diff is collapsed.
spec/integration_spec.rb deleted 100644 → 0
View file @ a7607455
This diff is collapsed.
spec/spec_helper.rb
View file @ 0304d9d6
This diff is collapsed.
spec/spec_helper/github.rb
View file @ 0304d9d6
This diff is collapsed.
spec/unit/config_spec.rb
View file @ 0304d9d6
This diff is collapsed.
spec/unit/installer_spec.rb
View file @ 0304d9d6
This diff is collapsed.
spec/unit/resolver_spec.rb
View file @ 0304d9d6
This diff is collapsed.
spec/unit/sandbox/file_accessor_spec.rb
View file @ 0304d9d6
This diff is collapsed.
spec/unit/sandbox_spec.rb
View file @ 0304d9d6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment