cocoapods-binary-cache 0.1.7 → 0.1.12

data/lib/cocoapods-binary-cache/pod-binary/helper/detected_prebuilt_pods/installer.rb

@@ -3,7 +3,7 @@ module Pod
     # Returns the names of pod targets detected as prebuilt, including
     # those declared in Podfile and their dependencies
     def prebuilt_pod_names
-      prebuilt_pod_targets.map(&:name)
+      prebuilt_pod_targets.map(&:name).to_set
     end
 
     # Returns the pod targets detected as prebuilt, including

data/lib/cocoapods-binary-cache/pod-binary/helper/prebuild_sandbox.rb

@@ -5,42 +5,43 @@ module Pod
     # [String] standard_sandbox_path
     def self.from_standard_sanbox_path(path)
       prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild.config.prebuild_sandbox_path
-      self.new(prebuild_sandbox_path)
+      new(prebuild_sandbox_path)
     end
 
     def self.from_standard_sandbox(sandbox)
-      self.from_standard_sanbox_path(sandbox.root)
+      from_standard_sanbox_path(sandbox.root)
     end
 
     def standard_sanbox_path
-      self.root.parent
+      root.parent
     end
 
     def generate_framework_path
-      self.root + "GeneratedFrameworks"
+      root + "GeneratedFrameworks"
     end
 
     # @param name [String] pass the target.name (may containing platform suffix)
     # @return [Pathname] the folder containing the framework file.
     def framework_folder_path_for_target_name(name)
-      self.generate_framework_path + name
+      generate_framework_path + name
     end
 
     def exsited_framework_target_names
-      exsited_framework_name_pairs.map { |pair| pair[0] }.uniq
+      existed_framework_name_pairs.map { |pair| pair[0] }.uniq
     end
 
     def exsited_framework_pod_names
-      exsited_framework_name_pairs.map { |pair| pair[1] }.uniq
+      existed_framework_name_pairs.map { |pair| pair[1] }.uniq
     end
 
     def existed_target_names_for_pod_name(pod_name)
-      exsited_framework_name_pairs.select { |pair| pair[1] == pod_name }.map { |pair| pair[0] }
+      existed_framework_name_pairs.select { |pair| pair[1] == pod_name }.map { |pair| pair[0] }
     end
 
     def save_pod_name_for_target(target)
       folder = framework_folder_path_for_target_name(target.name)
       return unless folder.exist?
+
       flag_file_path = folder + "#{target.pod_name}.pod_name"
       File.write(flag_file_path.to_s, "")
     end
@@ -53,16 +54,16 @@ module Pod
       end
       name = name.basename(".pod_name").to_s unless name.nil?
       name ||= Pathname.new(target_folder_path).basename.to_s # for compatibility with older version
+      name
     end
 
     # Array<[target_name, pod_name]>
-    def exsited_framework_name_pairs
+    def existed_framework_name_pairs
       return [] unless generate_framework_path.exist?
-      generate_framework_path.children().map do |framework_path|
-        if framework_path.directory? && (not framework_path.children.empty?)
+
+      generate_framework_path.children.map do |framework_path|
+        if framework_path.directory? && !framework_path.children.empty?
           [framework_path.basename.to_s, pod_name_for_target_folder(framework_path)]
-        else
-          nil
         end
       end.reject(&:nil?).uniq
     end

data/lib/cocoapods-binary-cache/pod-binary/helper/target_checker.rb

@@ -1,16 +1,15 @@
 module Pod
   class Prebuild
-
     # Check the targets, for the current limitation of the plugin
     #
     # @param [Array<PodTarget>] prebuilt_targets
     def self.check_one_pod_should_have_only_one_target(prebuilt_targets)
-      targets_have_different_platforms = prebuilt_targets.select { |t| t.pod_name != t.name }
+      targets_have_different_platforms = prebuilt_targets.reject { |t| t.pod_name == t.name }
+      return unless targets_have_different_platforms.empty?
 
-      if targets_have_different_platforms.count > 0
-        names = targets_have_different_platforms.map(&:pod_name)
-        raw_names = targets_have_different_platforms.map(&:name)
-        message = "Oops, you came across a limitation of cocoapods-binary.
+      names = targets_have_different_platforms.map(&:pod_name)
+      raw_names = targets_have_different_platforms.map(&:name)
+      message = "Oops, you came across a limitation of cocoapods-binary.
 
 The plugin requires that one pod should have ONLY ONE target in the 'Pod.xcodeproj'. There are mainly 2 situations \
 causing this problem:
@@ -36,10 +35,8 @@ causing this problem:
     end
     ```
 
-Related pods: #{names}, target names: #{raw_names}
-        "
-        raise Informative, message
-      end
+Related pods: #{names}, target names: #{raw_names}"
+      raise Informative, message
     end
   end
 end

data/lib/cocoapods-binary-cache/pod-binary/integration.rb

@@ -1,11 +1,10 @@
 require_relative "helper/podfile_options"
 require_relative "helper/prebuild_sandbox"
-require_relative "helper/passer"
 require_relative "helper/names"
 require_relative "helper/target_checker"
 require_relative "integration/alter_specs"
-require_relative "integration/remove_target_files"
 require_relative "integration/validation"
 require_relative "integration/patch/embed_framework_script"
+require_relative "integration/patch/sandbox_analyzer_state"
 require_relative "integration/patch/resolve_dependencies"
 require_relative "integration/patch/source_installation"

data/lib/cocoapods-binary-cache/pod-binary/integration/alter_specs.rb

@@ -4,26 +4,43 @@ module Pod
       cache = []
       analysis_result.specifications
         .select { |spec| should_integrate_prebuilt_pod?(spec.root.name) }
-        .each { |spec| alter_spec(spec, cache) }
+        .group_by(&:root)
+        .each do |_, specs|
+          first_subspec_or_self = specs.find(&:subspec?) || specs[0]
+          specs.each do |spec|
+            alterations = {
+              :source_files => true,
+              :resources => true,
+              :license => true,
+              :vendored_framework => spec == first_subspec_or_self
+            }
+            alter_spec(spec, alterations, cache)
+          end
+        end
     end
 
-    def alter_spec(spec, cache)
+    private
+
+    def alter_spec(spec, alterations, cache)
       targets = Pod.fast_get_targets_for_pod_name(spec.root.name, pod_targets, cache)
-      targets.each do |target|
-        # Use the prebuild framworks as vendered frameworks.
-        # The framework_file_path rule is decided in `install_for_prebuild`,
-        # as to compitable with older version and be less wordy.
-        framework_file_path = target.framework_name
-        framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
-        framework_file_path = PodPrebuild.config.prebuilt_path(path: framework_file_path)
-        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+      platforms = targets.map { |target| target.platform.name.to_s }.uniq
+
+      if alterations[:vendored_framework]
+        targets.each do |target|
+          # Use the prebuilt frameworks as vendered frameworks.
+          # The framework_file_path rule is decided in `install_for_prebuild`,
+          # as to compitable with older version and be less wordy.
+          framework_file_path = target.framework_name
+          framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
+          framework_file_path = PodPrebuild.config.prebuilt_path(path: framework_file_path)
+          add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+        end
       end
 
-      platforms = targets.map { |target| target.platform.name.to_s }.uniq
-      empty_source_files(spec, platforms)
-      tweak_resources_for_xib(spec, platforms)
-      tweak_resources_for_resource_bundles(spec, platforms)
-      empty_liscence(spec) # to avoid the warning of missing license
+      empty_source_files(spec, platforms) if alterations[:source_files]
+      tweak_resources_for_xib(spec, platforms) if alterations[:resources]
+      tweak_resources_for_resource_bundles(spec, platforms) if alterations[:resources]
+      empty_liscence(spec) if alterations[:license]
     end
 
     def tweak_resources_for_xib(spec, platforms)

data/lib/cocoapods-binary-cache/pod-binary/integration/patch/embed_framework_script.rb

@@ -9,7 +9,7 @@ module Pod
     class EmbedFrameworksScript
       old_method = instance_method(:script)
       define_method(:script) do
-        script = old_method.bind(self).()
+        script = old_method.bind(self).call
         patch = <<-SH.strip_heredoc
           #!/bin/sh
           # ---- this is added by cocoapods-binary ---

data/lib/cocoapods-binary-cache/pod-binary/integration/patch/resolve_dependencies.rb

@@ -7,9 +7,6 @@ module Pod
     # Modify specification to use only the prebuild framework after analyzing
     original_resolve_dependencies = instance_method(:resolve_dependencies)
     define_method(:resolve_dependencies) do
-      # Remove the old target files. Otherwise, it will not notice file changes.
-      # This call is to make sure subsequent pod installations function properly
-      remove_target_files_if_needed
       original_resolve_dependencies.bind(self).call
 
       # check the pods

data/lib/cocoapods-binary-cache/pod-binary/integration/patch/sandbox_analyzer_state.rb

@@ -0,0 +1,29 @@
+module Pod
+  class Installer
+    class Analyzer
+      class SandboxAnalyzer
+        original_analyze = instance_method(:analyze)
+        define_method(:analyze) do
+          state = original_analyze.bind(self).call
+          state = alter_state(state)
+          state
+        end
+
+        private
+
+        def alter_state(state)
+          return state if PodPrebuild.config.tracked_prebuilt_pod_names.empty?
+
+          prebuilt = PodPrebuild.config.tracked_prebuilt_pod_names
+          Pod::UI.message "Alter sandbox state: treat prebuilt frameworks as added: #{prebuilt.to_a}"
+          SpecsState.new(
+            :added => (state.added + prebuilt).uniq,
+            :changed => state.changed - prebuilt,
+            :removed => state.deleted - prebuilt,
+            :unchanged => state.unchanged - prebuilt
+          )
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-binary-cache/pod-binary/integration/patch/source_installation.rb

@@ -3,17 +3,31 @@ require_relative "../source_installer"
 module Pod
   class Installer
     # Override the download step to skip download and prepare file in target folder
-    define_method(:install_source_of_pod) do |pod_name|
-      pod_installer = create_pod_installer(pod_name)
-      # Injected code
-      # ------------------------------------------
-      if should_integrate_prebuilt_pod?(pod_name)
-        pod_installer.install_for_prebuild!(sandbox)
+    alias original_create_pod_installer create_pod_installer
+    def create_pod_installer(name)
+      if should_integrate_prebuilt_pod?(name)
+        create_prebuilt_source_installer(name)
       else
-        pod_installer.install!
+        create_normal_source_installer(name)
       end
-      # ------------------------------------------
-      @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
+    end
+
+    private
+
+    def create_normal_source_installer(name)
+      original_create_pod_installer(name)
+    end
+
+    def create_prebuilt_source_installer(name)
+      source_installer = PodSourceInstaller.new(sandbox, podfile, specs_for_pod(name))
+      pod_installer = PrebuiltSourceInstaller.new(
+        sandbox,
+        podfile,
+        specs_for_pod(name),
+        source_installer: source_installer
+      )
+      pod_installers << pod_installer
+      pod_installer
     end
 
     def should_integrate_prebuilt_pod?(name)
@@ -21,9 +35,9 @@ module Pod
         # In a prebuild job, at the integration stage, all prebuilt frameworks should be
         # ready for integration regardless of whether there was any cache miss or not.
         # Those that are missed were prebuilt in the prebuild stage.
-        PodPrebuild::StateStore.cache_validation.include?(name)
+        PodPrebuild.state.cache_validation.include?(name)
       else
-        prebuilt = PodPrebuild::StateStore.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
+        prebuilt = PodPrebuild.state.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
         prebuilt.include?(name)
       end
     end

data/lib/cocoapods-binary-cache/pod-binary/integration/source_installer.rb

@@ -1,21 +1,27 @@
-# NOTE:
-# This file will only be loaded on normal pod install step
-# so there's no need to check is_prebuild_stage
-
-# Provide a special "download" process for prebuilded pods.
-#
-# As the frameworks is already exsited in local folder. We
-# just create a symlink to the original target folder.
-#
 module Pod
   class Installer
-    class PodSourceInstaller
-      def install_for_prebuild!(standard_sanbox)
-        return if !PodPrebuild.config.dev_pods_enabled? && standard_sanbox.local?(name)
+    class PrebuiltSourceInstaller < PodSourceInstaller
+      def initialize(*args, **kwargs)
+        @source_installer = kwargs.delete(:source_installer)
+        super(*args, **kwargs)
+      end
+
+      def prebuild_sandbox
+        @prebuild_sandbox ||= Pod::PrebuildSandbox.from_standard_sandbox(sandbox)
+      end
+
+      def install!
+        @source_installer.install!
+        install_prebuilt_framework!
+      end
+
+      private
+
+      def install_prebuilt_framework!
+        return if !PodPrebuild.config.dev_pods_enabled? && sandbox.local?(name)
 
         # make a symlink to target folder
         # TODO (bang): Unify to 1 sandbox to optimize and avoid inconsistency
-        prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
         # if spec used in multiple platforms, it may return multiple paths
         target_names = prebuild_sandbox.existed_target_names_for_pod_name(name)
         target_names.each do |name|
@@ -24,7 +30,7 @@ module Pod
           # If have only one platform, just place int the root folder of this pod.
           # If have multiple paths, we use a sperated folder to store different
           # platform frameworks. e.g. AFNetworking/AFNetworking-iOS/AFNetworking.framework
-          target_folder = standard_sanbox.pod_dir(self.name)
+          target_folder = sandbox.pod_dir(self.name)
           target_folder += real_file_folder.basename if target_names.count > 1
           target_folder += PodPrebuild.config.prebuilt_path
           target_folder.rmtree if target_folder.exist?
@@ -33,8 +39,10 @@ module Pod
           walk(real_file_folder) do |child|
             source = child
             # only make symlink to file and `.framework` folder
-            if child.directory? && [".framework", ".dSYM"].include?(child.extname)
-              mirror_with_symlink(source, real_file_folder, target_folder) if child.extname == ".framework"
+            if child.directory? && [".framework", ".xcframework", ".dSYM"].include?(child.extname)
+              if [".framework", ".xcframework"].include?(child.extname)
+                mirror_with_symlink(source, real_file_folder, target_folder)
+              end
               # Ignore dsym here to avoid cocoapods from adding install_dsym to buildphase-script
               # That can cause duplicated output files error in Xcode 11 (warning in Xcode 10)
               # We need more setup to support local debuging with prebuilt dSYM
@@ -52,10 +60,15 @@ module Pod
           next unless metadata.static_framework?
 
           metadata.resources.each do |path|
-            target_file_path = path
+            target_file_path = Pathname(path)
               .sub("${PODS_ROOT}", sandbox.root.to_path)
               .sub("${PODS_CONFIGURATION_BUILD_DIR}", sandbox.root.to_path)
+            next if target_file_path.exist?
+
             real_file_path = real_file_folder + metadata.framework_name + File.basename(path)
+
+            # TODO (thuyen): Fix https://github.com/grab/cocoapods-binary-cache/issues/45
+
             case File.extname(path)
             when ".xib"
               # https://github.com/grab/cocoapods-binary-cache/issues/7
@@ -73,8 +86,6 @@ module Pod
         end
       end
 
-      private
-
       def walk(path, &action)
         return unless path.exist?
 

data/lib/cocoapods-binary-cache/pod-binary/prebuild.rb

@@ -1,12 +1,11 @@
 require "fileutils"
 require_relative "../prebuild_output/output"
 require_relative "../helper/lockfile"
-require_relative "helper/passer"
 require_relative "helper/target_checker"
 require_relative "helper/build"
 
 module Pod
-  class PrebuildInstaller < Installer
+  class PrebuildInstaller < Installer # rubocop:disable Metrics/ClassLength
     attr_reader :lockfile_wrapper
 
     def initialize(options)
@@ -15,38 +14,6 @@ module Pod
       @lockfile_wrapper = lockfile && PodPrebuild::Lockfile.new(lockfile)
     end
 
-    private
-
-    def local_manifest
-      @local_manifest ||= sandbox.manifest
-    end
-
-    # @return [Analyzer::SpecsState]
-    def prebuild_pods_changes
-      return nil if local_manifest.nil?
-
-      if @prebuild_pods_changes.nil?
-        changes = local_manifest.detect_changes_with_podfile(podfile)
-        @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
-        # save the chagnes info for later stage
-        Pod::Prebuild::Passer.prebuild_pods_changes = @prebuild_pods_changes
-      end
-      @prebuild_pods_changes
-    end
-
-    def blacklisted?(name)
-      PodPrebuild::StateStore.excluded_pods.include?(name)
-    end
-
-    def cache_missed?(name)
-      @cache_validation.missed?(name)
-    end
-
-    def should_not_prebuild_vendor_pod(name)
-      return true if blacklisted?(name)
-      return false if PodPrebuild.config.prebuild_all_pods?
-    end
-
     def run_code_gen!(targets)
       return if PodPrebuild.config.prebuild_code_gen.nil?
 
@@ -55,84 +22,42 @@ module Pod
       end
     end
 
-    def targets_to_prebuild
-      existed_framework_folder = sandbox.generate_framework_path
-      targets = pod_targets
-
-      targets_from_cli = PodPrebuild.config.targets_to_prebuild_from_cli
-      if !targets_from_cli.empty?
-        targets = targets.select { |target| targets_from_cli.include?(target.name) }
-      elsif !PodPrebuild.config.prebuild_all_pods? && !local_manifest.nil?
-        changes = prebuild_pods_changes
-        added = changes.added
-        changed = changes.changed
-        unchanged = changes.unchanged
-
-        existed_framework_folder.mkdir unless existed_framework_folder.exist?
-        exsited_framework_pod_names = sandbox.exsited_framework_pod_names
-
-        # additions
-        missing = unchanged.reject { |pod_name| exsited_framework_pod_names.include?(pod_name) }
-
-        root_names_to_update = (added + changed + missing)
-        root_names_to_update += PodPrebuild::StateStore.cache_validation.missed
-
-        # transform names to targets
-        cache = []
-        targets = root_names_to_update.map do |pod_name|
-          tars = Pod.fast_get_targets_for_pod_name(pod_name, pod_targets, cache) || []
-          raise "There's no target named (#{pod_name}) in Pod.xcodeproj" if tars.empty?
-
-          tars
-        end.flatten
-
-        # add the dendencies
-        dependency_targets = targets.map(&:recursive_dependent_targets).flatten.uniq || []
-        targets = (targets + dependency_targets).uniq
-      end
-
-      unless PodPrebuild.config.prebuild_all_pods?
-        targets = targets.select { |pod_target| cache_missed?(pod_target.name) }
-      end
-      targets = targets.reject { |pod_target| should_not_prebuild_vendor_pod(pod_target.name) }
-      unless PodPrebuild.config.dev_pods_enabled?
-        targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) }
-      end
-      targets
-    end
-
-    public
-
     def prebuild_output
       @prebuild_output ||= PodPrebuild::Output.new(sandbox)
     end
 
-    # Build the needed framework files
+    def targets_to_prebuild
+      to_build = PodPrebuild.config.targets_to_prebuild_from_cli
+      if to_build.empty?
+        to_build = PodPrebuild.config.prebuild_all_pods? ? @cache_validation.all : @cache_validation.missed
+      end
+      pod_targets.select { |target| to_build.include?(target.name) }
+    end
+
     def prebuild_frameworks!
-      UI.puts "Start prebuild_frameworks"
       existed_framework_folder = sandbox.generate_framework_path
       sandbox_path = sandbox.root
       targets = targets_to_prebuild
+      Pod::UI.puts "Prebuild frameworks (total #{targets.count}): #{targets.map(&:name)}".magenta
 
-      Pod::UI.puts "Prebuild frameworks (total #{targets.count}): #{targets.map(&:name)}"
-      Pod::Prebuild.remove_build_dir(sandbox_path)
       run_code_gen!(targets)
+
+      PodPrebuild.remove_build_dir(sandbox_path)
+      PodPrebuild.build(
+        sandbox: sandbox_path,
+        targets: targets,
+        configuration: PodPrebuild.config.prebuild_config,
+        output_path: sandbox.generate_framework_path,
+        bitcode_enabled: PodPrebuild.config.bitcode_enabled?,
+        device_build_enabled: PodPrebuild.config.device_build_enabled?,
+        disable_dsym: PodPrebuild.config.disable_dsym?,
+        args: PodPrebuild.config.build_args
+      )
+      PodPrebuild.remove_build_dir(sandbox_path)
+
       targets.each do |target|
-        output_path = sandbox.framework_folder_path_for_target_name(target.name)
-        output_path.mkpath unless output_path.exist?
-        Pod::Prebuild.build(
-          sandbox: sandbox_path,
-          target: target,
-          configuration: PodPrebuild.config.prebuild_config,
-          output_path: output_path,
-          bitcode_enabled: PodPrebuild.config.bitcode_enabled?,
-          device_build_enabled: PodPrebuild.config.device_build_enabled?,
-          disable_dsym: PodPrebuild.config.disable_dsym?,
-          args: PodPrebuild.config.build_args
-        )
-        collect_metadata(target, output_path)
+        collect_metadata(target, sandbox.framework_folder_path_for_target_name(target.name))
       end
-      Pod::Prebuild.remove_build_dir(sandbox_path)
 
       # copy vendored libraries and frameworks
       targets.each do |target|
@@ -142,7 +67,6 @@ module Pod
         # If target shouldn't build, we copy all the original files
         # This is for target with only .a and .h files
         unless target.should_build?
-          Prebuild::Passer.target_names_to_skip_integration_framework << target.name
           FileUtils.cp_r(root_path, target_folder, :remove_destination => true)
           next
         end
@@ -173,7 +97,7 @@ module Pod
         all_needed_names.include? name
       end
       useless_target_names.each do |name|
-        UI.puts "Remove: #{name}"
+        Pod::UI.message "Remove: #{name}"
         path = sandbox.framework_folder_path_for_target_name(name)
         path.rmtree if path.exist?
       end
@@ -189,12 +113,10 @@ module Pod
         to_delete_files.each { |file| file.rmtree if file.exist? }
       end
 
-      updated_target_names = targets.map { |target| target.label.to_s }
-      deleted_target_names = useless_target_names
-      Pod::UI.puts "Targets to prebuild: #{updated_target_names}"
-      Pod::UI.puts "Targets to cleanup: #{deleted_target_names}"
-
-      prebuild_output.write_delta_file(updated_target_names, deleted_target_names)
+      prebuild_output.write_delta_file(
+        updated: targets.map { |target| target.label.to_s },
+        deleted: useless_target_names
+      )
     end
 
     def clean_delta_file