cocoapods 0.17.0.rc3 → 0.17.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74228860bfe13ef84dd8e60454d29c94236d5bb0
-  data.tar.gz: fddc172441d9b378abe7ac8b1ab81df832b467d3
+  metadata.gz: 968e618e17077f1e02347a81b681117a6b4410b3
+  data.tar.gz: cf0e4cd10cc63cbae184f22762edd7b3878e5622
 SHA512:
-  metadata.gz: a5b7857acea13393645d5721c05a715c12e001a79d3abc3731425ea5c0b24f0485f4164eebdabbc76c76512841bba5941bfb804da7d52fa7d1ce47f2bb16a2da
-  data.tar.gz: fb80a8e7dd50bd800e95959292b328304bdf4337b959814d0da03f421fa8fff932affa8c376aae14fdd606a61a5aa3734082e2cf73751a69725ce1e147ca6396
+  metadata.gz: 8849e6833fcbce9561184db443eb3e1dab6d9cbc6ac453f6c2e8f7fba53c9ecc73415308052814fb1bae3f660159c35cc88f495e8eed5ff53c6512301bacd9ab
+  data.tar.gz: 41c7fb584d7f9bc34b23c61141f4d633f543001ae21a78bc6cfd0e915db13a14b84e6219a4d9b5815d117f3c38adc9324001c552b4b9c18850d7ee163beb11d5

data/CHANGELOG.md

@@ -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

data/lib/cocoapods/command/push.rb

@@ -120,7 +120,7 @@ module Pod
           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}'")

data/lib/cocoapods/command/spec.rb

@@ -197,7 +197,7 @@ module Pod
         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 @@ module Pod
         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 @@ Pod::Spec.new do |s|
   #                   * 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 @@ Pod::Spec.new do |s|
   # 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 @@ Pod::Spec.new do |s|
   # 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 @@ Pod::Spec.new do |s|
 
   # 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.

data/lib/cocoapods/config.rb

@@ -176,6 +176,7 @@ module Pod
     # @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

data/lib/cocoapods/external_sources.rb

@@ -268,10 +268,9 @@ module Pod
       #
       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 @@ module Pod
       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 @@ module Pod
       #
       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 @@ module Pod
 
       # @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 @@ module Pod
         pathname
       end
     end
+
+    #-------------------------------------------------------------------------#
+
   end
 end

data/lib/cocoapods/gem_version.rb

@@ -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
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -8,12 +8,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}"

data/lib/cocoapods/hooks/installer_representation.rb

@@ -8,6 +8,15 @@ module Pod
     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.

data/lib/cocoapods/hooks/library_representation.rb

@@ -26,13 +26,14 @@ module Pod
 
       # @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
 

data/lib/cocoapods/installer.rb

@@ -367,16 +367,53 @@ module Pod
         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 @@ module Pod
         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

data/lib/cocoapods/installer/target_installer.rb

@@ -55,8 +55,10 @@ module Pod
       #
       # @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 @@ module Pod
         @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
 

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -52,7 +52,7 @@ module Pod
             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

data/lib/cocoapods/user_interface/error_report.rb

@@ -64,9 +64,9 @@ EOS
 ### Podfile
 
 ```ruby
-          #{Config.instance.podfile_path.read.strip}
+#{Config.instance.podfile_path.read.strip}
 ```
-          EOS
+EOS
         end
 
         def error_from_podfile(error)

data/lib/cocoapods/validator.rb

@@ -62,23 +62,20 @@ module Pod
       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 @@ module Pod
           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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc3
+  version: 0.17.0.rc4
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc3
+        version: 0.17.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc3
+        version: 0.17.0.rc4
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement