Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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

base fork: CocoaPods/CocoaPods
...
head fork: CocoaPods/CocoaPods
  • 19 commits
  • 56 files changed
  • 3 commit comments
  • 2 contributors
Commits on Mar 11, 2013
Fabio Pelosin fabiopelosin [Examples] Update lockfiles d09a7be
Fabio Pelosin fabiopelosin [Installer] Present an informative if a hook raises. e7d736e
Fabio Pelosin fabiopelosin [Hooks] Restore compatiblity with Podfile::TargetDefinition#copy_reso…
…urces_script_name
1d27636
Fabio Pelosin fabiopelosin [Command::Spec] Update a bit the new spec template. c0b9c9f
Fabio Pelosin fabiopelosin [Spec] Fix template ca8bb53
Fabio Pelosin fabiopelosin [Hooks] Minor clean up. d3c33ac
amccarri amccarri update copy resources script so that it will use base internationaliz…
…ation if available
dafa07e
Commits on Mar 12, 2013
Fabio Pelosin fabiopelosin Merge pull request #846 from amccarri/master
adds support for base internationalization
781872d
Fabio Pelosin fabiopelosin [Integration] Update fixtures 5c634e9
Fabio Pelosin fabiopelosin [ExternalSources] Support the specification of a folder for the :pods…
…pec option
e986257
Fabio Pelosin fabiopelosin [Config] Robustness agaisnt empty configuration file. 81df966
Fabio Pelosin fabiopelosin [Validator] Show the version of the linted specification.
Closes #847
399e6be
Fabio Pelosin fabiopelosin [Command::Push] Support files not present in the working dir.
Closes #848
bcb9311
Fabio Pelosin fabiopelosin [ErrorReport] Fix Podfile indentation a310e26
Commits on Mar 14, 2013
Fabio Pelosin fabiopelosin [TargetInstaller] Don't add build configurations to the project
This also solve a crash likely due to the use of the same object (same) UUID
as entry of the configuration list of the target and of the project.

Closes #854
164a6e9
Fabio Pelosin fabiopelosin Changelog bd868d8
Fabio Pelosin fabiopelosin [Integration] Update fixtures b5e7077
Fabio Pelosin fabiopelosin [TargetIntegrator] Fixed a crash related to `PBXVariantGroup`
Closes #859
8d23757
Fabio Pelosin fabiopelosin Release 0.17.0.rc4 5ac6ea4
Showing with 304 additions and 157 deletions.
  1. +26 −1 CHANGELOG.md
  2. +1 −1  examples/AFNetworking Mac Example/Podfile.lock
  3. +1 −1  examples/AFNetworking iOS Example/Podfile.lock
  4. +1 −1  examples/TargetTest/Podfile.lock
  5. +1 −1  lib/cocoapods/command/push.rb
  6. +6 −27 lib/cocoapods/command/spec.rb
  7. +1 −0  lib/cocoapods/config.rb
  8. +31 −5 lib/cocoapods/external_sources.rb
  9. +1 −1  lib/cocoapods/gem_version.rb
  10. +4 −4 lib/cocoapods/generator/copy_resources_script.rb
  11. +9 −0 lib/cocoapods/hooks/installer_representation.rb
  12. +3 −2 lib/cocoapods/hooks/library_representation.rb
  13. +79 −4 lib/cocoapods/installer.rb
  14. +7 −6 lib/cocoapods/installer/target_installer.rb
  15. +1 −1  lib/cocoapods/installer/user_project_integrator/target_integrator.rb
  16. +2 −2 lib/cocoapods/user_interface/error_report.rb
  17. +8 −11 lib/cocoapods/validator.rb
  18. +1 −1  spec/integration/install_add_pod/after/Podfile.lock
  19. +1 −1  spec/integration/install_add_pod/after/Pods/Manifest.lock
  20. +4 −4 spec/integration/install_add_pod/after/Pods/Pods-resources.sh
  21. +1 −1  spec/integration/install_external_source/after/Podfile.lock
  22. +1 −1  spec/integration/install_external_source/after/Pods/Manifest.lock
  23. +4 −4 spec/integration/install_external_source/after/Pods/Pods-resources.sh
  24. +1 −1  spec/integration/install_local_source/after/Podfile.lock
  25. +1 −1  spec/integration/install_local_source/after/Pods/Manifest.lock
  26. +4 −4 spec/integration/install_local_source/after/Pods/Pods-resources.sh
  27. +1 −1  spec/integration/install_multiple_targets/after/Podfile.lock
  28. +1 −1  spec/integration/install_multiple_targets/after/Pods/Manifest.lock
  29. +4 −4 spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
  30. +4 −4 spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
  31. +4 −4 spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
  32. +1 −1  spec/integration/install_new/after/Podfile.lock
  33. +1 −1  spec/integration/install_new/after/Pods/Manifest.lock
  34. +4 −4 spec/integration/install_new/after/Pods/Pods-resources.sh
  35. +1 −1  spec/integration/install_podfile_callbacks/after/Podfile.lock
  36. +1 −1  spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
  37. +4 −4 spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
  38. +1 −1  spec/integration/install_podspec/after/Podfile.lock
  39. +1 −1  spec/integration/install_podspec/after/Pods/Manifest.lock
  40. +4 −4 spec/integration/install_podspec/after/Pods/Pods-resources.sh
  41. +1 −1  spec/integration/install_remove_pod/after/Podfile.lock
  42. +1 −1  spec/integration/install_remove_pod/after/Pods/Manifest.lock
  43. +4 −4 spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
  44. +1 −1  spec/integration/install_spec_callbacks/after/Podfile.lock
  45. +1 −1  spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
  46. +4 −4 spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
  47. +1 −1  spec/integration/install_subspecs/after/Podfile.lock
  48. +1 −1  spec/integration/install_subspecs/after/Pods/Manifest.lock
  49. +4 −4 spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
  50. +4 −4 spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
  51. +1 −1  spec/integration/spec_lint/after/execution_output.txt
  52. +1 −1  spec/integration/update/after/Podfile.lock
  53. +1 −1  spec/integration/update/after/Pods/Manifest.lock
  54. +4 −4 spec/integration/update/after/Pods/Pods-resources.sh
  55. +41 −8 spec/unit/external_sources_spec.rb
  56. +2 −2 spec/unit/hooks/library_representation_spec.rb
27 CHANGELOG.md
View
@@ -1,5 +1,30 @@
+## 0.17.0.rc4
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc3...0.17.0.rc4
+
+###### Bug fixes
+
+- Restored compatibility with `Podfile::TargetDefinition#copy_resources_script_name`
+ in the Podfile hooks.
+- Updated copy resources script so that it will use base internationalization
+ [#846](https://github.com/CocoaPods/CocoaPods/issues/846)
+- Robustness against an empty configuration file.
+- Fixed a crash with `pod push`
+ [#848](https://github.com/CocoaPods/CocoaPods/issues/848)
+- Fixed an issue which lead to the creation of a Pods project which would
+ crash Xcode.
+ [#854](https://github.com/CocoaPods/CocoaPods/issues/854)
+- Fixed a crash related to a `PBXVariantGroup` present in the frameworks build
+ phase of client targets.
+ [#859](https://github.com/CocoaPods/CocoaPods/issues/859)
+
+
+###### Ancillary enhancements
+
+- The `podspec` option of the `pod` directive of the Podfile DSL now accepts
+ folders.
+
## 0.17.0.rc3
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc1...0.17.0.rc2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc2...0.17.0.rc3
• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.0...0.5.1))
###### Bug fixes
2  examples/AFNetworking Mac Example/Podfile.lock
View
@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
FormatterKit: 12dea999a2df19e389f7b821962fc4088de8b821
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
-COCOAPODS: 0.17.0.rc2
+COCOAPODS: 0.17.0.rc3
2  examples/AFNetworking iOS Example/Podfile.lock
View
@@ -25,4 +25,4 @@ SPEC CHECKSUMS:
FormatterKit: 12dea999a2df19e389f7b821962fc4088de8b821
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
-COCOAPODS: 0.17.0.rc2
+COCOAPODS: 0.17.0.rc3
2  examples/TargetTest/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
-COCOAPODS: 0.17.0.rc2
+COCOAPODS: 0.17.0.rc3
2  lib/cocoapods/command/push.rb
View
@@ -120,7 +120,7 @@ def add_specs_to_repo
UI.puts " - #{message}"
FileUtils.mkdir_p(output_path)
- FileUtils.cp(Pathname.new(spec.name+'.podspec'), output_path)
+ FileUtils.cp(spec_file, output_path)
Dir.chdir(repo_dir) do
git!("add #{spec.name}")
git!("commit --no-verify -m '#{message}'")
33 lib/cocoapods/command/spec.rb
View
@@ -197,7 +197,7 @@ class Edit < Spec
self.arguments = '[ NAME ]'
def self.options
- [["--show-all", "Pick which spec to edit from all avaliable versions of the given podspec"]].concat(super)
+ [["--show-all", "Pick which spec to edit from all available versions of the given podspec"]].concat(super)
end
def initialize(argv)
@@ -450,11 +450,9 @@ def spec_template(data)
return <<-SPEC
#
# Be sure to run `pod spec lint #{data[:name]}.podspec' to ensure this is a
-# valid spec.
+# valid spec and remove all comments before submitting the spec.
#
-# Remove all comments before submitting the spec. Optional attributes are commented.
-#
-# For details see: https://github.com/CocoaPods/CocoaPods/wiki/The-podspec-format
+# To learn more about the attributes see http://docs.cocoapods.org/specification.html
#
Pod::Spec.new do |s|
s.name = "#{data[:name]}"
@@ -467,25 +465,12 @@ def spec_template(data)
# * Don't worry about the indent, we strip it!
# DESC
s.homepage = "#{data[:homepage]}"
+ # s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
# Specify the license type. CocoaPods detects automatically the license file if it is named
# 'LICENCE*.*' or 'LICENSE*.*', however if the name is different, specify it.
s.license = 'MIT (example)'
# s.license = { :type => 'MIT (example)', :file => 'FILE_LICENSE' }
- #
- # Only if no dedicated file is available include the full text of the license.
- #
- # s.license = {
- # :type => 'MIT (example)',
- # :text => <<-LICENSE
- # Copyright (C) <year> <copyright holders>
-
- # All rights reserved.
-
- # Redistribution and use in source and binary forms, with or without
- # ...
- # LICENSE
- # }
# Specify the authors of the library, with email addresses. You can often find
# the email addresses of the authors by using the SCM log. E.g. $ git log
@@ -500,14 +485,12 @@ def spec_template(data)
# Specify the location from where the source should be retrieved.
#
s.source = { :git => "#{data[:source_url]}", #{data[:ref_type]} => "#{data[:ref]}" }
- # s.source = { :svn => 'http://EXAMPLE/#{data[:name]}/tags/1.0.0' }
- # s.source = { :hg => 'http://EXAMPLE/#{data[:name]}', :revision => '1.0.0' }
+
# If this Pod runs only on iOS or OS X, then specify the platform and
# the deployment target.
#
# s.platform = :ios, '5.0'
- # s.platform = :ios
# ――― MULTI-PLATFORM VALUES ――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -521,10 +504,6 @@ def spec_template(data)
# added to the Pods project. If the pattern is a directory then the
# path will automatically have '*.{h,m,mm,c,cpp}' appended.
#
- # Alternatively, you can use the FileList class for even more control
- # over the selected files.
- # (See http://rake.rubyforge.org/classes/Rake/FileList.html.)
- #
s.source_files = 'Classes', 'Classes/**/*.{h,m}'
# A list of file patterns which select the header files that should be
@@ -567,7 +546,7 @@ def spec_template(data)
# If this Pod uses ARC, specify it like so.
#
- # s.requires_arc = true
+ s.requires_arc = true
# If you need to specify any other build settings, add them to the
# xcconfig hash.
1  lib/cocoapods/config.rb
View
@@ -176,6 +176,7 @@ def user_settings_file
# @return [void]
#
def configure_with(values_by_key)
+ return unless values_by_key
values_by_key.each do |key, value|
self.instance_variable_set("@#{key}", value)
end
36 lib/cocoapods/external_sources.rb
View
@@ -268,10 +268,9 @@ class PodspecSource < AbstractExternalSource
#
def fetch(sandbox)
UI.titled_section("Fetching podspec for `#{name}` #{description}", { :verbose_prefix => "-> " }) do
- path = params[:podspec]
- path = Pathname.new(path).expand_path if path.to_s.start_with?("~")
+
require 'open-uri'
- open(path) { |io| store_podspec(sandbox, io.read) }
+ open(podspec_uri) { |io| store_podspec(sandbox, io.read) }
end
end
@@ -280,6 +279,30 @@ def fetch(sandbox)
def description
"from `#{params[:podspec]}`"
end
+
+ #--------------------------------------#
+
+ private
+
+ # @!group Helpers
+
+ # @return [String] The uri of the podspec appending the name of the file
+ # and expanding it if necessary.
+ #
+ # @note If the declared path is expanded only if the represents a path
+ # relative to the file system.
+ #
+ def podspec_uri
+ declared_path = params[:podspec].to_s
+ if declared_path.match(%r{^.+://})
+ declared_path
+ else
+ path_with_ext = File.extname(declared_path) == '.podspec' ? declared_path : "#{declared_path}/#{name}.podspec"
+ podfile_dir = File.dirname(podfile_path || '')
+ absolute_path = File.expand_path(path_with_ext, podfile_dir)
+ absolute_path
+ end
+ end
end
#-------------------------------------------------------------------------#
@@ -295,7 +318,7 @@ class LocalSource < AbstractExternalSource
#
def fetch(sandbox)
UI.titled_section("Fetching podspec for `#{name}` #{description}", { :verbose_prefix => "-> " }) do
- podspec = pod_spec_path
+ podspec = podspec_path
store_podspec(sandbox, podspec)
sandbox.store_local_path(name, podspec.dirname)
end
@@ -315,7 +338,7 @@ def description
# @return [Pathname] the path of the podspec.
#
- def pod_spec_path
+ def podspec_path
declared_path = params[:local].to_s
path_with_ext = File.extname(declared_path) == '.podspec' ? declared_path : "#{declared_path}/#{name}.podspec"
podfile_dir = File.dirname(podfile_path || '')
@@ -328,5 +351,8 @@ def pod_spec_path
pathname
end
end
+
+ #-------------------------------------------------------------------------#
+
end
end
2  lib/cocoapods/gem_version.rb
View
@@ -2,6 +2,6 @@ module Pod
# The version of the cocoapods command line tool.
#
- VERSION = '0.17.0.rc3' unless defined? Pod::VERSION
+ VERSION = '0.17.0.rc4' unless defined? Pod::VERSION
end
8 lib/cocoapods/generator/copy_resources_script.rb
View
@@ -8,12 +8,12 @@ class CopyResourcesScript
{
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}"
+ 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 --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}"
+ 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}"
9 lib/cocoapods/hooks/installer_representation.rb
View
@@ -8,6 +8,15 @@ def config
end
end
+ class Podfile::TargetDefinition
+ def copy_resources_script_name
+ UI.warn "TargetDefinition#copy_resources_script_name is deprecated. " \
+ "The value is accessible directly from the representation of the " \
+ "library using the #copy_resources_script_path method."
+ Config.instance.sandbox.root + "#{label}-resources.sh"
+ end
+ end
+
module Hooks
# The installer representation to pass to the hooks.
5 lib/cocoapods/hooks/library_representation.rb
View
@@ -26,13 +26,14 @@ def sandbox_dir
# @return [Pathname] The path of the prefix_header
#
- def prefix_header_filename
+ def prefix_header_path
library.prefix_header_path
end
+ alias :prefix_header_filename :prefix_header_path
# @return [Pathname] The path of the script used to copy the resources.
#
- def copy_resources_script_name
+ def copy_resources_script_path
library.copy_resources_script_path
end
83 lib/cocoapods/installer.rb
View
@@ -367,16 +367,53 @@ def run_pre_install_hooks
installed_specs.each do |spec|
executed = false
libraries_using_spec(spec).each do |lib|
- executed ||= spec.pre_install!(pod_rep(spec.root.name), library_rep(lib))
+ lib_representation = library_rep(lib)
+ executed ||= run_spec_pre_install_hook(spec, lib_representation)
end
UI.message "- #{spec.name}" if executed
end
- executed = @podfile.pre_install!(installer_rep)
+ executed = run_podfile_pre_install_hook
UI.message "- Podfile" if executed
end
end
+ # Runs the pre install hook of the given specification with the given
+ # library representation.
+ #
+ # @param [Specification] spec
+ # The spec for which the pre install hook should be run.
+ #
+ # @param [Hooks::LibraryRepresentation] lib_representation
+ # The library representation to be passed as an argument to the
+ # hook.
+ #
+ # @raise Raises an informative if the hooks raises.
+ #
+ # @return [Bool] Whether the hook was run.
+ #
+ def run_spec_pre_install_hook(spec, lib_representation)
+ spec.pre_install!(pod_rep(spec.root.name), lib_representation)
+ rescue => e
+ raise Informative, "The pre install hook of #{spec} is not " \
+ "compatible with this version of CocoaPods." \
+ "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+ end
+
+ # Runs the pre install hook of the Podfile
+ #
+ # @raise Raises an informative if the hooks raises.
+ #
+ # @return [Bool] Whether the hook was run.
+ #
+ def run_podfile_pre_install_hook
+ podfile.pre_install!(installer_rep)
+ rescue => e
+ raise Informative, "The pre install hook of the Podfile is not " \
+ "compatible with this version of CocoaPods." \
+ "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+ end
+
# Runs the post install hooks of the installed specs and of the Podfile.
#
# @note Post install hooks run _before_ saving of project, so that they
@@ -389,15 +426,53 @@ def run_post_install_hooks
installed_specs.each do |spec|
executed = false
libraries_using_spec(spec).each do |lib|
- executed ||= spec.post_install!(library_rep(lib))
+ lib_representation = library_rep(lib)
+ executed ||= run_spec_post_install_hook(spec, lib_representation)
end
UI.message "- #{spec.name}" if executed
end
- executed = @podfile.post_install!(installer_rep)
+ executed = run_podfile_post_install_hook
UI.message "- Podfile" if executed
end
end
+
+ # Runs the post install hook of the given specification with the given
+ # library representation.
+ #
+ # @param [Specification] spec
+ # The spec for which the post install hook should be run.
+ #
+ # @param [Hooks::LibraryRepresentation] lib_representation
+ # The library representation to be passed as an argument to the
+ # hook.
+ #
+ # @raise Raises an informative if the hooks raises.
+ #
+ # @return [Bool] Whether the hook was run.
+ #
+ def run_spec_post_install_hook(spec, lib_representation)
+ spec.post_install!(lib_representation)
+ rescue => e
+ raise Informative, "The post install hook of #{spec} is not " \
+ "compatible with this version of CocoaPods." \
+ "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+ end
+
+ # Runs the post install hook of the Podfile
+ #
+ # @raise Raises an informative if the hooks raises.
+ #
+ # @return [Bool] Whether the hook was run.
+ #
+ def run_podfile_post_install_hook
+ podfile.post_install!(installer_rep)
+ rescue => e
+ raise Informative, "The post install hook of the Podfile is not " \
+ "compatible with this version of CocoaPods." \
+ "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
+ end
+
#-------------------------------------------------------------------------#
public
13 lib/cocoapods/installer/target_installer.rb
View
@@ -55,8 +55,10 @@ def install!
#
# @note The `PODS_HEADERS_SEARCH_PATHS` overrides the xcconfig.
#
- # @todo Add integration test for build configurations and don't add the
- # build configurations to the project if they are not needed.
+ # @todo CocoaPods 0.16 used to add the build configurations to the build
+ # configuration list of the project (`root object`) as well with
+ # an empty build settings. This behaviour was changed in 0.17.
+ # Restore if needed.
#
# @return [void]
#
@@ -77,14 +79,13 @@ def add_target
@target.build_settings('Debug').merge!(settings)
@target.build_settings('Release').merge!(settings)
- library.user_build_configurations.each do |lib_name, type|
- unless @target.build_configurations.map(&:name).include?(lib_name)
+ library.user_build_configurations.each do |bc_name, type|
+ unless @target.build_configurations.map(&:name).include?(bc_name)
build_config = project.new(Xcodeproj::Project::XCBuildConfiguration)
- build_config.name = lib_name
+ build_config.name = bc_name
settings = @target.build_settings(type.to_s.capitalize)
build_config.build_settings = settings
target.build_configurations << build_config
- project.build_configurations << build_config
end
end
2  lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View
@@ -52,7 +52,7 @@ def targets
non_integrated = targets.reject do |target|
target.frameworks_build_phase.files.any? do |build_file|
file_ref = build_file.file_ref
- !file_ref.proxy? && file_ref.display_name == library.product_name
+ file_ref.isa == 'PBXFileReference' && file_ref.display_name == library.product_name
end
end
@targets = non_integrated
4 lib/cocoapods/user_interface/error_report.rb
View
@@ -64,9 +64,9 @@ def markdown_podfile
### Podfile
```ruby
- #{Config.instance.podfile_path.read.strip}
+#{Config.instance.podfile_path.read.strip}
```
- EOS
+EOS
end
def error_from_podfile(error)
19 lib/cocoapods/validator.rb
View
@@ -62,23 +62,20 @@ def validate
end
perform_linting
-
- # begin
- if spec
- check_repo_path if repo_path
- perform_extensive_analysis unless quick
- end
- # rescue Exception => e
- # error "The specification is malformed and crashed the linter."
- # end
+ check_repo_path if spec && repo_path
+ perform_extensive_analysis if spec && !quick
unless disable_ui_output
- UI.puts " -> ".send(result_color) << (spec ? spec.name : file.basename.to_s)
+ UI.puts " -> ".send(result_color) << (spec ? spec.to_s : file.basename.to_s)
print_results
end
validated?
end
+ # Prints the result of the validation to the user.
+ #
+ # @return [void]
+ #
def print_results
results.each do |result|
if result.platforms == [:ios]
@@ -87,7 +84,7 @@ def print_results
platform_message = "[OSX] "
end
- case result.type
+ case result.type
when :error then type = "ERROR"
when :warning then type = "WARN"
when :note then type = "NOTE"
2  spec/integration/install_add_pod/after/Podfile.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_add_pod/after/Pods/Manifest.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_add_pod/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_external_source/after/Podfile.lock
View
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_external_source/after/Pods/Manifest.lock
View
@@ -15,4 +15,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_external_source/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_local_source/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_local_source/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_local_source/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_multiple_targets/after/Podfile.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_multiple_targets/after/Pods/Manifest.lock
View
@@ -10,4 +10,4 @@ SPEC CHECKSUMS:
JSONKit: 3d4708953ea7ae399a49777372d8b060a43ddd27
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
8 spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
8 spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_new/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_new/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_new/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_podfile_callbacks/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_podfile_callbacks/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_podspec/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_podspec/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: b14c20321fa00f7f4600d8c9856fc57e71ef2ffe
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_podspec/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_remove_pod/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_remove_pod/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_spec_callbacks/after/Podfile.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_spec_callbacks/after/Pods/Manifest.lock
View
@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Reachability: c1e48cc25f8e7cba878c83ad1981d334ef325522
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/install_subspecs/after/Podfile.lock
View
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/install_subspecs/after/Pods/Manifest.lock
View
@@ -13,4 +13,4 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
PodTest: 5049980a26c8960af5a42d1c7f086483c5b29d8f
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
8 spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
2  spec/integration/spec_lint/after/execution_output.txt
View
@@ -1,5 +1,5 @@
$ pod spec lint --quick --verbose --no-color 2>&1
- -> Reachability -> Reachability
+ -> Reachability -> Reachability (3.1.0)
Analyzed 1 podspec.
2  spec/integration/update/after/Podfile.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
2  spec/integration/update/after/Pods/Manifest.lock
View
@@ -7,4 +7,4 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Reachability: 1c8584c5f26fa776695efef95caaa50402c94cfb
-COCOAPODS: 0.17.0.rc3
+COCOAPODS: 0.17.0.rc4
8 spec/integration/update/after/Pods/Pods-resources.sh
View
@@ -4,12 +4,12 @@ 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}"
+ 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 --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}"
+ 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}"
49 spec/unit/external_sources_spec.rb
View
@@ -151,7 +151,8 @@ module Pod
before do
podspec_path = fixture('integration/Reachability/Reachability.podspec')
dependency = Dependency.new("Reachability", :podspec => podspec_path.to_s)
- @external_source = ExternalSources.from_dependency(dependency, nil)
+ podfile_path = fixture('integration/Podfile')
+ @external_source = ExternalSources.from_dependency(dependency, podfile_path)
end
it "creates a copy of the podspec" do
@@ -163,6 +164,40 @@ module Pod
it "returns the description" do
@external_source.description.should.match %r|from `.*Reachability/Reachability.podspec`|
end
+
+ describe "Helpers" do
+
+ it "handles absolute paths" do
+ @external_source.stubs(:params).returns(:podspec => fixture('integration/Reachability'))
+ path = @external_source.send(:podspec_uri)
+ path.should == fixture('integration/Reachability/Reachability.podspec').to_s
+ end
+
+ it "handles paths when there is no podfile path" do
+ @external_source.stubs(:podfile_path).returns(nil)
+ @external_source.stubs(:params).returns(:podspec => fixture('integration/Reachability'))
+ path = @external_source.send(:podspec_uri)
+ path.should == fixture('integration/Reachability/Reachability.podspec').to_s
+ end
+
+ it "handles relative paths" do
+ @external_source.stubs(:params).returns(:podspec => 'Reachability')
+ path = @external_source.send(:podspec_uri)
+ path.should == fixture('integration/Reachability/Reachability.podspec').to_s
+ end
+
+ it "expands the tilde" do
+ @external_source.stubs(:params).returns(:podspec => '~/Reachability')
+ path = @external_source.send(:podspec_uri)
+ path.should == ENV['HOME'] + '/Reachability/Reachability.podspec'
+ end
+
+ it "handles urls" do
+ @external_source.stubs(:params).returns(:podspec => "http://www.example.com/Reachability.podspec")
+ path = @external_source.send(:podspec_uri)
+ path.should == "http://www.example.com/Reachability.podspec"
+ end
+ end
end
#---------------------------------------------------------------------------#
@@ -197,38 +232,36 @@ module Pod
it "handles absolute paths" do
@external_source.stubs(:params).returns(:local => fixture('integration/Reachability'))
- path = @external_source.send(:pod_spec_path)
+ path = @external_source.send(:podspec_path)
path.should == fixture('integration/Reachability/Reachability.podspec')
end
it "handles paths when there is no podfile path" do
@external_source.stubs(:podfile_path).returns(nil)
@external_source.stubs(:params).returns(:local => fixture('integration/Reachability'))
- path = @external_source.send(:pod_spec_path)
+ path = @external_source.send(:podspec_path)
path.should == fixture('integration/Reachability/Reachability.podspec')
end
it "handles relative paths" do
@external_source.stubs(:params).returns(:local => 'Reachability')
- path = @external_source.send(:pod_spec_path)
+ path = @external_source.send(:podspec_path)
path.should == fixture('integration/Reachability/Reachability.podspec')
end
it "expands the tilde" do
@external_source.stubs(:params).returns(:local => '~/Reachability')
Pathname.any_instance.stubs(:exist?).returns(true)
- path = @external_source.send(:pod_spec_path)
+ path = @external_source.send(:podspec_path)
path.should == Pathname(ENV['HOME']) + 'Reachability/Reachability.podspec'
end
it "raises if the podspec cannot be found" do
@external_source.stubs(:params).returns(:local => temporary_directory)
- e = lambda { @external_source.send(:pod_spec_path) }.should.raise Informative
+ e = lambda { @external_source.send(:podspec_path) }.should.raise Informative
e.message.should.match /No podspec found/
end
-
end
-
end
#---------------------------------------------------------------------------#
4 spec/unit/hooks/library_representation_spec.rb
View
@@ -28,12 +28,12 @@ module Pod
it "returns the path of the prefix header" do
@lib.support_files_root = temporary_directory
- @rep.prefix_header_filename.should == temporary_directory + 'Pods-MyApp-prefix.pch'
+ @rep.prefix_header_path.should == temporary_directory + 'Pods-MyApp-prefix.pch'
end
it "returns the path of the copy resources script" do
@lib.support_files_root = temporary_directory
- @rep.copy_resources_script_name.should == temporary_directory + 'Pods-MyApp-resources.sh'
+ @rep.copy_resources_script_path.should == temporary_directory + 'Pods-MyApp-resources.sh'
end
it "returns the pods project" do

Showing you all comments on commits in this comparison.

Eloy Durán
Owner

It’s probably a good idea to have a test for this, otherwise we’ll probably break it again somewhere in the future.

Fabio Pelosin

Indeed. I've been a bit lazy :smile_cat: Fixed!

Eloy Durán
Owner

:dancer:

Something went wrong with that request. Please try again.