cocoapods-core 1.9.1 → 1.10.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be1ce59946a7c67064cdc709ffdd5628f3edeaadda30ad36dd94e3a92ecf7c45
-  data.tar.gz: fa1eac3bc5cc4500bcfaa78585e0957b4df42a87f4f807d493a2f925f9b17783
+  metadata.gz: 0a07277aaf2c3d222a9eebb1bfb75ff5c0952e17886f30a0632b26f770c91e45
+  data.tar.gz: c24f4c13fb9c94e8edc10ccac147bb21673a1c752cf4130fd44e1f2e2747e38b
 SHA512:
-  metadata.gz: e739c08536d1865dbe48a9bc68ed0f4925e4e6ade65da9b4dd8936e1be2519b7b66979a8d8068d5aa5f596c6bcc27f881f5107a5a489a73983e2708b06fa89a6
-  data.tar.gz: 3e2d3f3b07ca2c1c9c82f05e09b20b65b7b109e3bb3cb096309f7bb7c8f3350b4cd37060931eb37a715a71ad890c4b541939499a9cd87f8361412f77a7ccbe95
+  metadata.gz: f104993e125cfb1c689be005954276a1028aefd0cb71914039fce92e6a61a03b5a2169bf3ed8a36c2bedc0f8b7dfb09d4a701fbef41a30cc666c1444f73b6b48
+  data.tar.gz: e9e285cc61a963e059b4ba311fa16d4c9b6e66ceabd1919101ea110528da5c0d4f4bf77d2e5ff167452a565c1605ec1c91ce5660ea7863ed31148b35d72968aa

data/README.md

@@ -1,8 +1,8 @@
 # CocoaPods Core
 
 [![Build Status](https://img.shields.io/travis/CocoaPods/Core/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Core)
-[![Coverage](https://img.shields.io/codeclimate/coverage/github/CocoaPods/Core.svg?style=flat)](https://codeclimate.com/github/CocoaPods/Core)
-[![Code Climate](https://img.shields.io/codeclimate/github/CocoaPods/Core.svg?style=flat)](https://codeclimate.com/github/CocoaPods/Core)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/91a2d70b9ed977815c66/test_coverage)](https://codeclimate.com/github/CocoaPods/Core/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/91a2d70b9ed977815c66/maintainability)](https://codeclimate.com/github/CocoaPods/Core/maintainability)
 
 The CocoaPods-Core gem provides support to work with the models of CocoaPods.
 It is intended to be used in place of the CocoaPods gem when the installation

data/lib/cocoapods-core/cdn_source.rb

@@ -1,8 +1,8 @@
 require 'cocoapods-core/source'
 require 'rest'
 require 'concurrent'
-require 'typhoeus'
 require 'netrc'
+require 'addressable'
 
 module Pod
   # Subclass of Pod::Source to provide support for CDN-based Specs repositories
@@ -315,6 +315,11 @@ module Pod
       metadata.path_fragment(pod_name)[0..-2]
     end
 
+    def local_file_okay?(partial_url)
+      file_path = repo.join(partial_url)
+      File.exist?(file_path) && File.size(file_path) > 0
+    end
+
     def local_file(partial_url)
       file_path = repo.join(partial_url)
       File.open(file_path) do |file|
@@ -334,10 +339,11 @@ module Pod
     end
 
     def download_file_async(partial_url)
-      file_remote_url = URI.encode(url + partial_url.to_s)
+      file_remote_url = Addressable::URI.encode(url + partial_url.to_s)
       path = repo + partial_url
 
-      if File.exist?(path)
+      file_okay = local_file_okay?(partial_url)
+      if file_okay
         if @startup_time < File.mtime(path)
           debug "CDN: #{name} Relative path: #{partial_url} modified during this run! Returning local"
           return Promises.fulfilled_future(partial_url, HYDRA_EXECUTOR)
@@ -353,7 +359,7 @@ module Pod
 
       etag_path = path.sub_ext(path.extname + '.etag')
 
-      etag = File.read(etag_path) if File.exist?(etag_path)
+      etag = File.read(etag_path) if file_okay && File.exist?(etag_path)
       debug "CDN: #{name} Relative path: #{partial_url}, has ETag? #{etag}" unless etag.nil?
 
       download_and_save_with_retries_async(partial_url, file_remote_url, etag)
@@ -376,7 +382,7 @@ module Pod
           FileUtils.touch path
           partial_url
         when 200
-          File.open(path, 'w') { |f| f.write(response.response_body) }
+          File.open(path, 'w') { |f| f.write(response.response_body.force_encoding('UTF-8')) }
 
           etag_new = response.headers['etag'] unless response.headers.nil?
           debug "CDN: #{name} Relative path downloaded: #{partial_url}, save ETag: #{etag_new}"
@@ -431,6 +437,8 @@ module Pod
     end
 
     def download_typhoeus_impl_async(file_remote_url, etag)
+      require 'typhoeus'
+
       # Create a prefereably HTTP/2 request - the protocol is ultimately responsible for picking
       # the maximum supported protocol
       # When debugging with proxy, use the following extra options:

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.9.1'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.10.0.rc.1'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/podfile.rb

@@ -183,6 +183,23 @@ module Pod
       end
     end
 
+    # Calls the post integrate callback if defined.
+    #
+    # @param  [Pod::Installer] installer
+    #         the installer that is performing the installation.
+    #
+    # @return [Bool] whether a post install callback was specified and it was
+    #         called.
+    #
+    def post_integrate!(installer)
+      if @post_integrate_callback
+        @post_integrate_callback.call(installer)
+        true
+      else
+        false
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     public

data/lib/cocoapods-core/podfile/dsl.rb

@@ -71,6 +71,35 @@ module Pod
         set_hash_value('installation_method', 'name' => installation_method, 'options' => options)
       end
 
+      # Raises a warning when CocoaPods is run using the Global Gemset.
+      # A Semantic version can be supplied to warn if the bundler version
+      # does not match the required version.
+      #
+      # @param   [String] version
+      #          The required bundler version, in semantic version format.
+      #
+      # @example
+      #
+      #   ensure_bundler!
+      #
+      # @example
+      #
+      #   ensure_bundler! '~> 2.0.0'
+      #
+      # @return  [void]
+      #
+      def ensure_bundler!(version = nil)
+        unless current_target_definition.root?
+          raise Informative, 'The Ensure Bundler check can only be set at the root level of the Podfile.'
+        end
+        unless %w(BUNDLE_BIN_PATH BUNDLE_GEMFILE).all? { |key| ENV.key?(key) }
+          raise Informative, "CocoaPods was invoked from Global Gemset.\nPlease re-run using: `bundle exec pod #{ARGV.join(' ')}`"
+        end
+        unless ENV['BUNDLER_VERSION'].nil? || Requirement.create(version).satisfied_by?(Version.new(ENV['BUNDLER_VERSION']))
+          raise Informative, "The installed Bundler version: #{ENV['BUNDLER_VERSION']} does not match the required version: #{version}"
+        end
+      end
+
       #-----------------------------------------------------------------------#
 
       # @!group Dependencies
@@ -112,6 +141,7 @@ module Pod
       #              specify in your version requirement. The example is equal to
       #              `>= 0.1.2` combined with `< 0.2.0` and will always match the
       #              latest known version matching your requirements.
+      # * `~> 0`     Version 0 and the versions up to 1, not including 1.
       # * `~> 0.1.3-beta.0` Beta and release versions for 0.1.3, release versions
       #              up to 0.2 excluding 0.2. Components separated by a dash (-)
       #              will not be considered for the version requirement.
@@ -930,6 +960,26 @@ module Pod
         raise Informative, 'Specifying multiple `post_install` hooks is unsupported.' if @post_install_callback
         @post_install_callback = block
       end
+
+      # This hook allows you to make changes after the project is written
+      # to disk.
+      #
+      # It receives the
+      # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
+      # as its only argument.
+      #
+      # @example  Customising the build settings of all targets
+      #
+      #   post_integrate do |installer|
+      #     # some change after project write to disk
+      #   end
+      #
+      # @return   [void]
+      #
+      def post_integrate(&block)
+        raise Informative, 'Specifying multiple `post_integrate` hooks is unsupported.' if @post_integrate_callback
+        @post_integrate_callback = block
+      end
     end
   end
 end

data/lib/cocoapods-core/specification/dsl.rb

@@ -1261,7 +1261,8 @@ module Pod
 
       # @!method vendored_frameworks=(*frameworks)
       #
-      #   The paths of the framework bundles that come shipped with the Pod.
+      #   The paths of the framework bundles that come shipped with the Pod. Supports both `.framework` and `.xcframework` bundles.
+      #   The frameworks will be made available to the Pod and to the consumers of the pod.
       #
       #   @example
       #
@@ -1269,7 +1270,7 @@ module Pod
       #
       #   @example
       #
-      #     spec.vendored_frameworks = 'MyFramework.framework', 'TheirFramework.framework'
+      #     spec.vendored_frameworks = 'MyFramework.framework', 'TheirFramework.xcframework'
       #
       #   @param  [String, Array<String>] vendored_frameworks
       #           A list of framework bundles paths.
@@ -1283,7 +1284,8 @@ module Pod
 
       # @!method vendored_libraries=(*frameworks)
       #
-      #   The paths of the libraries that come shipped with the Pod.
+      #   The paths of the libraries that come shipped with the Pod. The libraries will be available to the Pod and the
+      #   consumers of the Pod.
       #
       #   @example
       #

data/lib/cocoapods-core/specification/linter.rb

@@ -288,6 +288,7 @@ module Pod
       # Performs validations related to the `homepage` attribute.
       #
       def _validate_homepage(h)
+        return unless h.is_a?(String)
         if h =~ %r{http://EXAMPLE}
           results.add_warning('homepage', 'The homepage has not been updated' \
            ' from default')
@@ -336,6 +337,19 @@ module Pod
         end
       end
 
+      # Performs validations related to the `vendored_libraries` attribute.
+      #
+      # @param [Array<String>] vendored_libraries the values specified in the `vendored_libraries` attribute
+      #
+      def _validate_vendored_libraries(vendored_libraries)
+        vendored_libraries.each do |lib|
+          lib_name = lib.downcase
+          unless lib_name.end_with?('.a') && lib_name.start_with?('lib')
+            results.add_warning('vendored_libraries', "`#{File.basename(lib)}` does not match the expected static library name format `lib[name].a`")
+          end
+        end
+      end
+
       # Performs validations related to the `license` attribute.
       #
       def _validate_license(l)

data/lib/cocoapods-core/version.rb

@@ -69,7 +69,8 @@ module Pod
     #
     def prerelease?
       return @prerelease if defined?(@prerelease)
-      @prerelease = @version =~ /[a-zA-Z\-]/
+      comparable_version = @version.sub(/#{METADATA_PATTERN}$/, '')
+      @prerelease = comparable_version =~ /[a-zA-Z\-]/
     end
 
     # @return [Bool] Whether a string representation is correct.

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
 - Fabio Pelosin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -25,9 +25,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -115,6 +115,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: public_suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +216,7 @@ homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,15 +224,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 3
 summary: The models of CocoaPods
 test_files: []