cocoapods 1.10.1 → 1.11.0.rc.1

data/lib/cocoapods/config.rb

@@ -163,7 +163,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,12 @@ 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
+          FileUtils.rm_rf(destination)
+          FileUtils.cp_r(source, destination)
+          Pod::Installer::PodSourcePreparer.new(spec, destination).prepare!
+          Sandbox::PodDirCleaner.new(destination, specs_by_platform).clean!
+        end
       end
 
       def group_subspecs_by_platform(spec)
@@ -226,7 +313,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/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.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.11.0.rc.1'.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

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.

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_xcframework_script.rb

@@ -70,8 +70,8 @@ copy_dir()
   local destination="$2"
 
   # Use filter instead of exclude so missing patterns don't throw errors.
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}\\" \\"${destination}\\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}*\\" \\"${destination}\\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}"/* "${destination}"
 }
 
 SELECT_SLICE_RETVAL=""
@@ -130,54 +130,11 @@ select_slice() {
   done
 }
 
-install_library() {
-  local source="$1"
-  local name="$2"
-  local destination="#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
-
-  local source="$binary"
-  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}/*\\" \\"${destination}\\""
-  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
-}
-
-# Copies a framework to derived data for use in later build phases
-install_framework()
-{
-  local source="$1"
-  local name="$2"
-  local destination="#{Pod::Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/${name}"
-
-  if [ ! -d "$destination" ]; then
-    mkdir -p "$destination"
-  fi
-
-  copy_dir "$source" "$destination"
-  echo "Copied $source to $destination"
-}
-
-install_xcframework_library() {
-  local basepath="$1"
-  local name="$2"
-  local paths=("$@")
-
-  # Locate the correct slice of the .xcframework for the current architectures
-  select_slice "${paths[@]}"
-  local target_path="$SELECT_SLICE_RETVAL"
-  if [[ -z "$target_path" ]]; then
-    echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
-    return
-  fi
-
-  install_framework "$basepath/$target_path" "$name"
-}
-
 install_xcframework() {
   local basepath="$1"
   local name="$2"
   local package_type="$3"
-  local paths=("$@")
+  local paths=("${@:4}")
 
   # Locate the correct slice of the .xcframework for the current architectures
   select_slice "${paths[@]}"
@@ -195,7 +152,6 @@ install_xcframework() {
   fi
 
   copy_dir "$source/" "$destination"
-
   echo "Copied $source to $destination"
 }
 
@@ -218,7 +174,7 @@ install_xcframework() {
       def install_xcframework_args(xcframework, slices)
         root = xcframework.path
         args = [shell_escape("${PODS_ROOT}/#{root.relative_path_from(sandbox_root)}")]
-        args << shell_escape(xcframework.name)
+        args << shell_escape(xcframework.target_name)
         is_framework = xcframework.build_type.framework?
         args << shell_escape(is_framework ? 'framework' : 'library')
         slices.each do |slice|

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -159,8 +159,9 @@ code_sign_if_enabled() {
         end
         xcframeworks_by_config.each do |config, xcframeworks|
           xcframeworks.select { |xcf| xcf.build_type.dynamic_framework? }.each do |xcframework|
+            target_name = xcframework.target_name
             name = xcframework.name
-            contents_by_config[config] << %(  install_framework "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{name}/#{name}.framework"\n)
+            contents_by_config[config] << %(  install_framework "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{target_name}/#{name}.framework"\n)
           end
         end
         script << "\n" unless contents_by_config.empty?

data/lib/cocoapods/generator/script_phase_constants.rb

@@ -79,6 +79,7 @@ install_dsym() {
       rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
     else
       # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+      mkdir -p "${DWARF_DSYM_FOLDER_PATH}"
       touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.dSYM"
     fi
   fi

data/lib/cocoapods/installer/analyzer/sandbox_analyzer.rb

@@ -31,6 +31,10 @@ module Pod
         #
         attr_reader :sandbox
 
+        # @return [Podfile] The Podfile to analyze dependencies.
+        #
+        attr_reader :podfile
+
         # @return [Array<Specifications>] The specifications returned by the
         #         resolver.
         #
@@ -45,11 +49,13 @@ module Pod
         # Init a new SandboxAnalyzer
         #
         # @param [Sandbox] sandbox @see sandbox
+        # @param [Podfile] podfile @see podfile
         # @param [Array<Specifications>] specs @see specs
         # @param [Bool] update_mode @see update_mode
         #
-        def initialize(sandbox, specs, update_mode)
+        def initialize(sandbox, podfile, specs, update_mode)
           @sandbox = sandbox
+          @podfile = podfile
           @specs = specs
           @update_mode = update_mode
         end
@@ -103,7 +109,7 @@ module Pod
         #
         def pod_added?(pod)
           return true if resolved_pods.include?(pod) && !sandbox_pods.include?(pod)
-          return true if !folder_exist?(pod) && !sandbox.local?(pod)
+          return true if !sandbox.local?(pod) && !folder_exist?(pod)
           false
         end
 
@@ -139,6 +145,7 @@ module Pod
           return true if spec.version != sandbox_version(pod)
           return true if spec.checksum != sandbox_checksum(pod)
           return true if resolved_spec_names(pod) != sandbox_spec_names(pod)
+          return true if podfile_dependency(pod) != sandbox_dependency(pod)
           return true if sandbox.predownloaded?(pod)
           return true if folder_empty?(pod)
           false
@@ -161,14 +168,14 @@ module Pod
         # @return [Array<String>] The name of the resolved Pods.
         #
         def resolved_pods
-          specs.map { |spec| spec.root.name }.uniq
+          @resolved_pods ||= specs.map { |spec| spec.root.name }.uniq
         end
 
         # @return [Array<String>] The name of the Pods stored in the sandbox
         #         manifest.
         #
         def sandbox_pods
-          sandbox_manifest.pod_names.map { |name| Specification.root_name(name) }.uniq
+          @sandbox_pods ||= sandbox_manifest.pod_names.map { |name| Specification.root_name(name) }.uniq
         end
 
         # @return [Array<String>] The name of the resolved specifications
@@ -223,6 +230,26 @@ module Pod
           sandbox_manifest.checksum(pod)
         end
 
+        # @return [Dependency, nil] The dependency with the given name stored in the sandbox.
+        #
+        # @param  [String] pod
+        #         the name of the Pod.
+        #
+        def sandbox_dependency(pod)
+          sandbox_manifest.dependencies.find { |d| d.name == pod }
+        end
+
+        #--------------------------------------#
+
+        # @return [Dependency, nil] The dependency with the given name from the podfile.
+        #
+        # @param  [String] pod
+        #         the name of the Pod.
+        #
+        def podfile_dependency(pod)
+          podfile.dependencies.find { |d| d.name == pod }
+        end
+
         #--------------------------------------#
 
         def folder_exist?(pod)

data/lib/cocoapods/installer/analyzer.rb

@@ -35,7 +35,7 @@ module Pod
       #
       attr_reader :podfile
 
-      # @return [Lockfile] The Lockfile, if available, that stores the information about the Pods previously installed.
+      # @return [Lockfile, nil] The Lockfile, if available, that stores the information about the Pods previously installed.
       #
       attr_reader :lockfile
 
@@ -67,7 +67,7 @@ module Pod
       #
       # @param  [Sandbox] sandbox @see #sandbox
       # @param  [Podfile] podfile @see #podfile
-      # @param  [Lockfile] lockfile @see #lockfile
+      # @param  [Lockfile, nil] lockfile @see #lockfile
       # @param  [Array<Source>] plugin_sources @see #plugin_sources
       # @param  [Boolean] has_dependencies @see #has_dependencies
       # @param  [Hash, Boolean, nil] pods_to_update @see #pods_to_update
@@ -565,12 +565,11 @@ module Pod
         pod_targets_by_build_config = Hash.new([].freeze)
         build_configurations.each { |config| pod_targets_by_build_config[config] = [] }
 
+        dependencies_by_root_name = @podfile_dependency_cache.target_definition_dependencies(target_definition).group_by(&:root_name)
+
         pod_targets_by_target_definition[target_definition].each do |pod_target|
           pod_name = pod_target.pod_name
-
-          dependencies = @podfile_dependency_cache.target_definition_dependencies(target_definition).select do |dependency|
-            Specification.root_name(dependency.name) == pod_name
-          end
+          dependencies = dependencies_by_root_name[pod_name] || []
 
           build_configurations.each do |configuration_name|
             whitelists = dependencies.map do |dependency|
@@ -714,7 +713,12 @@ module Pod
         dependencies.map do |root_spec, deps|
           pod_targets_by_name[root_spec.name].find do |t|
             next false if t.platform.symbolic_name != target.platform.symbolic_name ||
-                t.build_as_framework? != target.build_as_framework? # rather than target type or requires_frameworks? since we want to group by what was specified in that _target definition_
+              # In the case of variants we must ensure that the platform this target is meant for is the same
+              # as the one we are interested in.
+              t.target_definitions.first.platform != target.target_definitions.first.platform ||
+              # rather than target type or requires_frameworks? since we want to group by what was specified in that
+              # _target definition_.
+              t.build_as_framework? != target.build_as_framework?
             spec_names = t.specs.map(&:name)
             deps.all? { |dep| spec_names.include?(dep.name) }
           end
@@ -1115,7 +1119,7 @@ module Pod
       def generate_sandbox_state(specifications)
         sandbox_state = nil
         UI.section 'Comparing resolved specification to the sandbox manifest' do
-          sandbox_analyzer = SandboxAnalyzer.new(sandbox, specifications, update_mode?)
+          sandbox_analyzer = SandboxAnalyzer.new(sandbox, podfile, specifications, update_mode?)
           sandbox_state = sandbox_analyzer.analyze
           sandbox_state.print
         end