cocoapods 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7bffb073059f0b97dde0f045b3907b5c272985c51c25c3bee4356b97dd2dd0a
-  data.tar.gz: effce424a85373cef900d6ff8d1887aa5d638a403af002a20bd464ae76b0feb3
+  metadata.gz: 221a0b485c1096a87cc3a7c4e45b7cc02afefa6a90a10619040419563b97c6c5
+  data.tar.gz: aa9eb163a2f491b051543986def45a710f554542aa358d33e364e2a3af6fcf0f
 SHA512:
-  metadata.gz: b86867763acdaadd2183f0e8f9945bef27e78832227ee17ff5876c9f7e089882bfeee10a0b354b3c84e4c755b0836e9247b00e310f8155e045bae9bcd2d9cd95
-  data.tar.gz: b948e71135a739f1b8b5b829ab4c3acf6f8e0079160a4fbea4cb13b0abd9d2f814f111fea264054197acd42ca8b01976ff24e39f65548573f492930ab2754a52
+  metadata.gz: 699ac15dbe7aab4ab3642e31d667330c66d9fbe065b27c01c2f8887fd7bf53f44a9a317bfe6f5de48ba4be3d3d8c94c5c90b826edf361fdc4ad7e8e91d8f44fb
+  data.tar.gz: b21ecd7b90d83e2d9938c316ca7738b13d18a53e06d996c67d3e75311c98447627d9c7a3d19af924ca06d5e485a2f28ca18d2c81357e31b865fa475e30ce0182

data/CHANGELOG.md

@@ -4,6 +4,18 @@ To install or update CocoaPods see this [guide](https://guides.cocoapods.org/usi
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.15.2 (2024-02-06)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Revert #12154, #12165, and #12158 to fix regressions in 1.15.0 and 1.15.1.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#12226](https://github.com/CocoaPods/CocoaPods/issues/12226)
+
 ## 1.15.1 (2024-02-06)
 
 ##### Enhancements

data/lib/cocoapods/downloader/cache.rb

@@ -235,38 +235,13 @@ module Pod
       #         was not found in the download cache.
       #
       def uncached_pod(request)
-        in_tmpdir do |tmp_dir|
-          result, podspecs = download(request, tmp_dir)
+        in_tmpdir do |target|
+          result, podspecs = download(request, target)
           result.location = nil
 
-          # Split by pods that require a prepare command or not to speed up installation.
-          no_prep_cmd_specs, prep_cmd_specs = podspecs.partition { |_, spec| spec.prepare_command.nil? }.map(&:to_h)
-
-          # Pods with a prepare command currently copy the entire repo, run the prepare command against the whole
-          # repo and then clean it up. We configure those first to ensure the repo is pristine.
-          prep_cmd_specs.each do |name, spec|
+          podspecs.each do |name, spec|
             destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-            copy_source_and_clean(tmp_dir, destination, spec)
-            write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
-            if request.name == name
-              result.location = destination
-            end
-          end
-
-          specs_by_platform = group_subspecs_by_platform(no_prep_cmd_specs.values)
-
-          # Remaining pods without a prepare command can be optimized by cleaning the repo first
-          # and then copying only the files needed.
-          pod_dir_cleaner = Sandbox::PodDirCleaner.new(tmp_dir, specs_by_platform)
-          Cache.write_lock(tmp_dir) do
-            pod_dir_cleaner.clean!
-          end
-
-          no_prep_cmd_specs.each do |name, spec|
-            destination = path_for_pod(request, :name => name, :params => result.checkout_options)
-            file_accessors = pod_dir_cleaner.file_accessors.select { |fa| fa.spec.root.name == spec.name }
-            files = Pod::Sandbox::FileAccessor.all_files(file_accessors).map(&:to_s)
-            copy_files(files, tmp_dir, destination)
+            copy_and_clean(target, destination, spec)
             write_spec(spec, path_for_spec(request, :name => name, :params => result.checkout_options))
             if request.name == name
               result.location = destination
@@ -304,57 +279,23 @@ module Pod
       #
       # @return [Void]
       #
-      def copy_source_and_clean(source, destination, spec)
-        specs_by_platform = group_subspecs_by_platform([spec])
+      def copy_and_clean(source, destination, spec)
+        specs_by_platform = group_subspecs_by_platform(spec)
         destination.parent.mkpath
         Cache.write_lock(destination) do
-          Pod::Executable.execute_command('rsync', ['-a', '--exclude=.git/fsmonitor--daemon.ipc', '--delete', "#{source}/", destination])
+          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
 
-      # Copies the `files` from the `source` directory to `destination` _without_ cleaning the
-      # `destination` directory of any files unused by `spec`. This is a faster version used when
-      # installing pods without a prepare command which has already happened prior.
-      #
-      # @param  [Array<Pathname>] files
-      #
-      # @param  [Pathname] source
-      #
-      # @param  [Pathname] destination
-      #
-      # @return [Void]
-      #
-      def copy_files(files, source, destination)
-        files = files.
-                map { |f| Pathname(f) }.
-                select { |p| p.exist? && p.file? }
-        destination.parent.mkpath
-        Cache.write_lock(destination) do
-          FileUtils.rm_rf(destination)
-          destination.mkpath
-          files_by_dir = files.group_by do |file|
-            relative_path = file.relative_path_from(source)
-            destination_path = File.join(destination, relative_path)
-            File.dirname(destination_path)
-          end
-
-          files_by_dir.each do |dir, files_to_copy|
-            FileUtils.mkdir_p(dir)
-            FileUtils.cp_r(files_to_copy, dir)
-          end
-        end
-      end
-
-      def group_subspecs_by_platform(specs)
+      def group_subspecs_by_platform(spec)
         specs_by_platform = {}
-        specs.each do |spec|
-          [spec, *spec.recursive_subspecs].each do |ss|
-            ss.available_platforms.each do |platform|
-              specs_by_platform[platform] ||= []
-              specs_by_platform[platform] << ss
-            end
+        [spec, *spec.recursive_subspecs].each do |ss|
+          ss.available_platforms.each do |platform|
+            specs_by_platform[platform] ||= []
+            specs_by_platform[platform] << ss
           end
         end
         specs_by_platform

data/lib/cocoapods/downloader.rb

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

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/sandbox/pod_dir_cleaner.rb

@@ -15,9 +15,11 @@ module Pod
       # @return [void]
       #
       def clean!
-        FileUtils.rm_rf(clean_paths) if root.exist?
+        clean_paths.each { |path| FileUtils.rm_rf(path) } if root.exist?
       end
 
+      private
+
       # @return [Array<Sandbox::FileAccessor>] the file accessors for all the
       #         specifications on their respective platform.
       #
@@ -27,8 +29,6 @@ module Pod
         end
       end
 
-      private
-
       # @return [Sandbox::PathList] The path list for this Pod.
       #
       def path_list

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.15.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement