cocoapods 1.10.0 → 1.16.0

data/bin/sandbox-pod

@@ -61,7 +61,7 @@ PROFILE_ERB_TEMPLATE = <<-EOS
 
 (allow file-read-metadata)
 (allow file-read*
-  ; This is currenly only added because using `xcodebuild` to build a resource
+  ; This is currently only added because using `xcodebuild` to build a resource
   ; bundle target starts a FSEvents stream on `/`. No idea why that would be
   ; needed, but for now it doesn’t seem like a real problem.
   (literal "/")

data/lib/cocoapods/command/lib/lint.rb

@@ -25,7 +25,7 @@ module Pod
             ['--use-static-frameworks', 'Lint uses static frameworks during installation'],
             ["--sources=#{Pod::TrunkSource::TRUNK_REPO_URL}", 'The sources from which to pull dependent pods ' \
               "(defaults to #{Pod::TrunkSource::TRUNK_REPO_URL}). Multiple sources must be comma-delimited"],
-            ['--platforms=ios,macos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
+            ['--platforms=ios,macos,visionos', 'Lint against specific platforms (defaults to all platforms supported by the ' \
               'podspec). Multiple platforms must be comma-delimited'],
             ['--private', 'Lint skips checks that apply only to public specs'],
             ['--swift-version=VERSION', 'The `SWIFT_VERSION` that should be used to lint the spec. ' \
@@ -38,6 +38,7 @@ module Pod
             ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
             ['--analyze', 'Validate with the Xcode Static Analysis tool'],
             ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -63,6 +64,7 @@ module Pod
           @analyze             = argv.flag?('analyze', false)
           @podspecs_paths      = argv.arguments!
           @configuration       = argv.option('configuration', nil)
+          @validation_dir      = argv.option('validation-dir', nil)
           super
         end
 
@@ -93,6 +95,7 @@ module Pod
             validator.include_podspecs = @include_podspecs
             validator.external_podspecs = @external_podspecs
             validator.configuration = @configuration
+            validator.validation_dir = @validation_dir
             validator.validate
 
             unless @clean

data/lib/cocoapods/command/outdated.rb

@@ -11,6 +11,17 @@ module Pod
         spec repos, not those from local/external sources.
       DESC
 
+      def self.options
+        [
+          ['--ignore-prerelease', "Don't consider prerelease versions to be updates"],
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @ignore_prerelease = argv.flag?('ignore-prerelease')
+        super
+      end
+
       # Run the command
       #
       def run
@@ -67,7 +78,7 @@ module Pod
           ensure_external_podspecs_present!
           spec_sets.map do |set|
             spec = set.specification
-            source_version = set.versions.first
+            source_version = set.versions.find { |version| !@ignore_prerelease || !version.prerelease? }
             pod_name = spec.root.name
             lockfile_version = lockfile.version(pod_name)
             if source_version > lockfile_version

data/lib/cocoapods/command/repo/push.rb

@@ -37,6 +37,8 @@ module Pod
             ['--swift-version=VERSION', 'The `SWIFT_VERSION` that should be used when linting the spec. ' \
              'This takes precedence over the Swift versions specified by the spec or a `.swift-version` file'],
             ['--no-overwrite', 'Disallow pushing that would overwrite an existing spec'],
+            ['--update-sources', 'Make sure sources are up-to-date before a push'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -46,6 +48,7 @@ module Pod
           @repo = argv.shift_argument
           @source = source_for_repo
           @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).append(Pod::TrunkSource::TRUNK_REPO_URL).uniq.join(',')).split(',')
+          @update_sources = argv.flag?('update-sources')
           @podspec = argv.shift_argument
           @use_frameworks = !argv.flag?('use-libraries')
           @use_modular_headers = argv.flag?('use-modular-headers', false)
@@ -57,6 +60,7 @@ module Pod
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
           @allow_overwrite = argv.flag?('overwrite', true)
+          @validation_dir = argv.option('validation-dir', nil)
           super
         end
 
@@ -73,6 +77,7 @@ module Pod
         def run
           open_editor if @commit_message && @message.nil?
           check_if_push_allowed
+          update_sources if @update_sources
           validate_podspec_files
           check_repo_status
           update_repo
@@ -141,6 +146,7 @@ module Pod
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation
             validator.skip_tests = @skip_tests
+            validator.validation_dir = @validation_dir
             begin
               validator.validate
             rescue => e
@@ -177,6 +183,20 @@ module Pod
           git!(%W(-C #{repo_dir} pull))
         end
 
+        # Update sources if present
+        #
+        # @return [void]
+        #
+        def update_sources
+          return if @source_urls.nil?
+          @source_urls.each do |source_url|
+            source = config.sources_manager.source_with_name_or_url(source_url)
+            dir = source.specs_dir
+            UI.puts "Updating a source at #{dir} for #{source}"
+            git!(%W(-C #{dir} pull))
+          end
+        end
+
         # Commits the podspecs to the source, which should be a git repo.
         #
         # @note   The pre commit hook of the repo is skipped as the podspecs have

data/lib/cocoapods/command/setup.rb

@@ -3,10 +3,10 @@ require 'fileutils'
 module Pod
   class Command
     class Setup < Command
-      self.summary = 'Setup the CocoaPods environment'
+      self.summary = 'Set up the CocoaPods environment'
 
       self.description = <<-DESC
-        Setup the CocoaPods environment
+        Set up the CocoaPods environment
       DESC
 
       def run

data/lib/cocoapods/command/spec/cat.rb

@@ -16,6 +16,7 @@ module Pod
           [
             ['--regex', 'Interpret the `QUERY` as a regular expression'],
             ['--show-all', 'Pick from all versions of the given podspec'],
+            ['--version', 'Print a specific version of the given podspec'],
           ].concat(super)
         end
 
@@ -24,6 +25,7 @@ module Pod
           @show_all = argv.flag?('show-all')
           @query = argv.shift_argument
           @query = @query.gsub('.podspec', '') unless @query.nil?
+          @version = argv.option('version')
           super
         end
 
@@ -40,7 +42,7 @@ module Pod
                        index = UI.choose_from_array(specs, "Which spec would you like to print [1-#{specs.count}]? ")
                        specs[index]
                      else
-                       get_path_of_spec(query)
+                       get_path_of_spec(query, @version)
                      end
 
           UI.puts File.read(filepath)

data/lib/cocoapods/command/spec/create.rb

@@ -181,6 +181,7 @@ Pod::Spec.new do |spec|
   # spec.osx.deployment_target = "10.7"
   # spec.watchos.deployment_target = "2.0"
   # spec.tvos.deployment_target = "9.0"
+  # spec.visionos.deployment_target = "1.0"
 
 
   # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

data/lib/cocoapods/command/spec/lint.rb

@@ -37,6 +37,7 @@ module Pod
             ['--test-specs=test-spec1,test-spec2,etc', 'List of test specs to run'],
             ['--analyze', 'Validate with the Xcode Static Analysis tool'],
             ['--configuration=CONFIGURATION', 'Build using the given configuration (defaults to Release)'],
+            ['--validation-dir', 'The directory to use for validation. If none is specified a temporary directory will be used.'],
           ].concat(super)
         end
 
@@ -60,6 +61,7 @@ module Pod
           @analyze         = argv.flag?('analyze', false)
           @podspecs_paths  = argv.arguments!
           @configuration   = argv.option('configuration', nil)
+          @validation_dir = argv.option('validation-dir', nil)
           super
         end
 
@@ -84,6 +86,7 @@ module Pod
             validator.test_specs = @test_specs
             validator.analyze = @analyze
             validator.configuration = @configuration
+            validator.validation_dir = @validation_dir
             validator.validate
             failure_reasons << validator.failure_reason
 
@@ -122,7 +125,7 @@ module Pod
                 output_path = podspecs_tmp_dir + File.basename(path)
                 output_path.dirname.mkpath
                 begin
-                  open(path) do |io|
+                  OpenURI.open_uri(path) do |io|
                     output_path.open('w') { |f| f << io.read }
                   end
                 rescue => e

data/lib/cocoapods/command/spec/which.rb

@@ -16,12 +16,14 @@ module Pod
           [
             ['--regex', 'Interpret the `QUERY` as a regular expression'],
             ['--show-all', 'Print all versions of the given podspec'],
+            ['--version', 'Print a specific version of the given podspec'],
           ].concat(super)
         end
 
         def initialize(argv)
           @use_regex = argv.flag?('regex')
           @show_all = argv.flag?('show-all')
+          @version = argv.option('version')
           @query = argv.shift_argument
           @query = @query.gsub('.podspec', '') unless @query.nil?
           super
@@ -35,7 +37,7 @@ module Pod
 
         def run
           query = @use_regex ? @query : Regexp.escape(@query)
-          UI.puts get_path_of_spec(query, @show_all)
+          UI.puts get_path_of_spec(query, @show_all || @version)
         end
       end
     end

data/lib/cocoapods/command/spec.rb

@@ -33,13 +33,14 @@ module Pod
       # @param  [String] spec
       #         The name of the specification.
       #
-      # @param  [Bool] show_all
-      #         Whether the paths for all the versions should be returned or
-      #         only the one for the last version.
+      # @param  [Bool,String] version_filter
+      #         - If set to false, will return only the spec path for the latest version (the default).
+      #         - If set to true, will return a list of all paths of all the versions of that spec.
+      #         - If set to a String, will return only the spec path for the version specified by that string.
       #
       # @return [Pathname] the absolute path or paths of the given podspec
       #
-      def get_path_of_spec(spec, show_all = false)
+      def get_path_of_spec(spec, version_filter = false)
         sets = config.sources_manager.search_by_name(spec)
 
         if sets.count == 1
@@ -51,12 +52,14 @@ module Pod
           raise Informative, "More than one spec found for '#{spec}':\n#{names}"
         end
 
-        unless show_all
+        if version_filter.is_a? String
+          all_paths_from_set(set, version_filter).split(/\n/).first
+        elsif version_filter == true
+          all_paths_from_set(set)
+        else
           best_spec, spec_source = spec_and_source_from_set(set)
-          return pathname_from_spec(best_spec, spec_source)
+          pathname_from_spec(best_spec, spec_source)
         end
-
-        all_paths_from_set(set)
       end
 
       # @return [Pathname] the absolute path of the given spec and source
@@ -67,7 +70,7 @@ module Pod
 
       # @return [String] of spec paths one on each line
       #
-      def all_paths_from_set(set)
+      def all_paths_from_set(set, specific_version = nil)
         paths = ''
 
         sources = set.sources
@@ -75,12 +78,18 @@ module Pod
         sources.each do |source|
           versions = source.versions(set.name)
 
+          if specific_version
+            versions = versions.select { |v| v.version == specific_version }
+          end
+
           versions.each do |version|
             spec = source.specification(set.name, version)
             paths += "#{pathname_from_spec(spec, source)}\n"
           end
         end
 
+        raise Informative, "Can't find spec for #{set.name}." if paths.empty?
+
         paths
       end
 

data/lib/cocoapods/config.rb

@@ -49,23 +49,23 @@ module Pod
 
     # @!group UI
 
-    # @return [Bool] Whether CocoaPods should provide detailed output about the
+    # @return [Boolean] Whether CocoaPods should provide detailed output about the
     #         performed actions.
     #
     attr_accessor :verbose
     alias_method :verbose?, :verbose
 
-    # @return [Bool] Whether CocoaPods should produce not output.
+    # @return [Boolean] Whether CocoaPods should produce not output.
     #
     attr_accessor :silent
     alias_method :silent?, :silent
 
-    # @return [Bool] Whether CocoaPods is allowed to run as root.
+    # @return [Boolean] Whether CocoaPods is allowed to run as root.
     #
     attr_accessor :allow_root
     alias_method :allow_root?, :allow_root
 
-    # @return [Bool] Whether a message should be printed when a new version of
+    # @return [Boolean] Whether a message should be printed when a new version of
     #         CocoaPods is available.
     #
     attr_accessor :new_version_message
@@ -75,7 +75,7 @@ module Pod
 
     # @!group Installation
 
-    # @return [Bool] Whether the installer should skip the download cache.
+    # @return [Boolean] Whether the installer should skip the download cache.
     #
     attr_accessor :skip_download_cache
     alias_method :skip_download_cache?, :skip_download_cache
@@ -111,7 +111,8 @@ module Pod
 
       if use_user_settings && user_settings_file.exist?
         require 'yaml'
-        user_settings = YAML.load_file(user_settings_file)
+        user_settings_contents = File.read(user_settings_file)
+        user_settings = YAML.safe_load(user_settings_contents)
         configure_with(user_settings)
       end
 
@@ -163,7 +164,7 @@ module Pod
     #
     def installation_root
       @installation_root ||= begin
-        current_dir = Pathname.new(ActiveSupport::Multibyte::Unicode.normalize(Dir.pwd))
+        current_dir = Pathname.new(Dir.pwd.unicode_normalize(:nfkc))
         current_path = current_dir
         until current_path.root?
           if podfile_path_in_dir(current_path)

data/lib/cocoapods/downloader/cache.rb

@@ -69,6 +69,91 @@ module Pod
         end
       end
 
+      # Convenience method for acquiring a shared lock to safely read from the
+      # cache. See `Cache.lock` for more details.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [block] &block
+      #         the block to execute inside the lock.
+      #
+      # @return [void]
+      #
+      def self.read_lock(location, &block)
+        Cache.lock(location, File::LOCK_SH, &block)
+      end
+
+      # Convenience method for acquiring an exclusive lock to safely write to
+      # the cache. See `Cache.lock` for more details.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [block] &block
+      #         the block to execute inside the lock.
+      #
+      # @return [void]
+      #
+      def self.write_lock(location, &block)
+        Cache.lock(location, File::LOCK_EX, &block)
+      end
+
+      # Creates a .lock file at `location`, aquires a lock of type
+      # `lock_type`, checks that it is valid, and executes passed block while
+      # holding on to that lock. Afterwards, the .lock file is deleted, which is
+      # why validation of the lock is necessary, as you might have a lock on a
+      # file that doesn't exist on the filesystem anymore.
+      #
+      # @param  [Pathname] location
+      #         the path to require a lock for.
+      #
+      # @param  [locking_constant] lock_type
+      #         the type of lock, either exclusive (File::LOCK_EX) or shared
+      #         (File::LOCK_SH).
+      #
+      # @return [void]
+      #
+      def self.lock(location, lock_type)
+        raise ArgumentError, 'no block given' unless block_given?
+        lockfile = "#{location}.lock"
+        f = nil
+        loop do
+          f.close if f
+          f = File.open(lockfile, File::CREAT, 0o644)
+          f.flock(lock_type)
+          break if Cache.valid_lock?(f, lockfile)
+        end
+        begin
+          yield location
+        ensure
+          if lock_type == File::LOCK_SH
+            f.flock(File::LOCK_EX)
+            File.delete(lockfile) if Cache.valid_lock?(f, lockfile)
+          else
+            File.delete(lockfile)
+          end
+          f.close
+        end
+      end
+
+      # Checks that the lock is on a file that still exists on the filesystem.
+      #
+      # @param  [File] file
+      #         the actual file that we have a lock for.
+      #
+      # @param  [String] filename
+      #         the filename of the file that we have a lock for.
+      #
+      # @return [Boolean]
+      #         true if `filename` still exists and is the same file as `file`
+      #
+      def self.valid_lock?(file, filename)
+        file.stat.ino == File.stat(filename).ino
+      rescue Errno::ENOENT
+        false
+      end
+
       private
 
       # Ensures the cache on disk was created with the same CocoaPods version as
@@ -112,7 +197,7 @@ module Pod
       #
       def path_for_spec(request, slug_opts = {})
         path = root + 'Specs' + request.slug(**slug_opts)
-        path.sub_ext('.podspec.json')
+        Pathname.new(path.to_path + '.podspec.json')
       end
 
       # @param  [Request] request
@@ -197,10 +282,15 @@ module Pod
       def copy_and_clean(source, destination, spec)
         specs_by_platform = group_subspecs_by_platform(spec)
         destination.parent.mkpath
-        FileUtils.rm_rf(destination)
-        FileUtils.cp_r(source, destination)
-        Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
-        Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+        Cache.write_lock(destination) do
+          rsync_contents(source, destination)
+          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
+          Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+        end
+      end
+
+      def rsync_contents(source, destination)
+        Pod::Executable.execute_command('rsync', ['-a', '--exclude=.git', '--delete', "#{source}/", destination])
       end
 
       def group_subspecs_by_platform(spec)
@@ -226,7 +316,9 @@ module Pod
       #
       def write_spec(spec, path)
         path.dirname.mkpath
-        path.open('w') { |f| f.write spec.to_pretty_json }
+        Cache.write_lock(path) do
+          path.open('w') { |f| f.write spec.to_pretty_json }
+        end
       end
     end
   end

data/lib/cocoapods/downloader.rb

@@ -50,8 +50,10 @@ module Pod
 
       if target && result.location && target != result.location
         UI.message "Copying #{request.name} from `#{result.location}` to #{UI.path target}", '> ' do
-          FileUtils.rm_rf target
-          FileUtils.cp_r(result.location, target)
+          Cache.read_lock(result.location) do
+            FileUtils.rm_rf target
+            FileUtils.cp_r(result.location, target)
+          end
         end
       end
       result

data/lib/cocoapods/executable.rb

@@ -36,7 +36,7 @@ module Pod
     # @param  [Array<#to_s>] command
     #         The command to send to the binary.
     #
-    # @param  [Bool] raise_on_failure
+    # @param  [Boolean] raise_on_failure
     #         Whether it should raise if the command fails.
     #
     # @raise  If the executable could not be located.

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -36,7 +36,7 @@ module Pod
         @can_cache = can_cache
       end
 
-      # @return [Bool] whether an external source source is equal to another
+      # @return [Boolean] whether an external source source is equal to another
       #         according to the {#name} and to the {#params}.
       #
       def ==(other)

data/lib/cocoapods/external_sources/path_source.rb

@@ -45,7 +45,7 @@ module Pod
         path.exist? ? path : Pathname("#{path}.json")
       end
 
-      # @return [Bool]
+      # @return [Boolean]
       #
       def absolute?(path)
         Pathname(path).absolute? || path.to_s.start_with?('~')

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -16,7 +16,7 @@ module Pod
           else
             require 'cocoapods/open-uri'
             begin
-              open(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
+              OpenURI.open_uri(podspec_uri) { |io| store_podspec(sandbox, io.read, is_json) }
             rescue OpenURI::HTTPError => e
               status = e.io.status.join(' ')
               raise Informative, "Failed to fetch podspec for `#{name}` at `#{podspec_uri}`.\n Error: #{status}"

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.10.0'.freeze unless defined? Pod::VERSION
+  VERSION = '1.16.0'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/acknowledgements.rb

@@ -67,7 +67,7 @@ module Pod
       #         the specification for which license is needed.
       #
       # @return [String] The text of the license.
-      # @return [Nil] If not license text could be found.
+      # @return [Nil] If no license text could be found.
       #
       def license_text(spec)
         return nil unless spec.license
@@ -84,10 +84,22 @@ module Pod
           elsif license_file = file_accessor(spec).license
             text = IO.read(license_file)
           end
+          text = format_license(text)
         end
         text
       end
 
+      # Convenience method for users to format licenses
+      #
+      # @param  [String] text
+      #         Unformatted license text
+      #
+      # @return [String] Formatted license text
+      #
+      def format_license(text)
+        text
+      end
+
       protected
 
       # Returns the file accessor for the given spec.

data/lib/cocoapods/generator/app_target_helper.rb

@@ -9,7 +9,7 @@ module Pod
       # @param  [Project] project
       #         the Xcodeproj to generate the target into.
       #
-      # @param  [Symbol] platform
+      # @param  [Symbol] platform_name
       #         the platform of the target. Can be `:ios` or `:osx`, etc.
       #
       # @param  [String] deployment_target
@@ -18,10 +18,14 @@ module Pod
       # @param  [String] name
       #         The name to use for the target, defaults to 'App'.
       #
+      # @param  [String] product_basename
+      #         The product basename to use for the target, defaults to `name`.
+      #
       # @return [PBXNativeTarget] the new target that was created.
       #
-      def self.add_app_target(project, platform, deployment_target, name = 'App')
-        project.new_target(:application, name, platform, deployment_target)
+      def self.add_app_target(project, platform_name, deployment_target, name = 'App', product_basename = nil)
+        project.new_target(:application, name, platform_name, deployment_target, nil,
+                           nil, product_basename)
       end
 
       # Creates and links an import file for the given pod target and into the given native target.
@@ -199,7 +203,7 @@ module Pod
             f << "@import Foundation;\n"
             f << "@import UIKit;\n" if platform == :ios || platform == :tvos
             f << "@import Cocoa;\n" if platform == :osx
-            f << "#{import_statement}int main() {}\n"
+            f << "#{import_statement}int main(void) {}\n"
           end
         end
         source_file

data/lib/cocoapods/generator/copy_dsyms_script.rb

@@ -1,18 +1,18 @@
 module Pod
   module Generator
     class CopydSYMsScript
-      # @return [Array<Pathname>] dsym_paths the dSYM paths to include in the script contents.
+      # @return [Array<Pathname, String>] dsym_paths the dSYM paths to include in the script contents.
       #
       attr_reader :dsym_paths
 
-      # @return [Array<Pathname>] bcsymbolmap_paths the bcsymbolmap paths to include in the script contents.
+      # @return [Array<Pathname, String>] bcsymbolmap_paths the bcsymbolmap paths to include in the script contents.
       #
       attr_reader :bcsymbolmap_paths
 
       # Initialize a new instance
       #
-      # @param  [Array<Pathname>] dsym_paths @see dsym_paths
-      # @param  [Array<Pathname>] bcsymbolmap_paths @see bcsymbolmap_paths
+      # @param  [Array<Pathname, String>] dsym_paths @see dsym_paths
+      # @param  [Array<Pathname, String>] bcsymbolmap_paths @see bcsymbolmap_paths
       #
       def initialize(dsym_paths, bcsymbolmap_paths)
         @dsym_paths = Array(dsym_paths)

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -57,9 +57,10 @@ module Pod
         :osx => Version.new('10.8'),
         :watchos => Version.new('2.0'),
         :tvos => Version.new('9.0'),
+        :visionos => Version.new('1.0'),
       }
 
-      # @return [Bool] Whether the external strings file is supported by the
+      # @return [Boolean] Whether the external strings file is supported by the
       #         `ibtool` according to the deployment target of the platform.
       #
       def use_external_strings_file?