cocoapods-binary-cache 0.1.2 → 0.1.8

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,12 +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/source_installer"
 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

@@ -15,6 +15,7 @@ module Pod
         # 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
 
@@ -61,7 +62,9 @@ module Pod
         attributes["resource_bundles"] = nil
         attributes["resources"] ||= []
         attributes["resources"] = [attributes["resources"]] if attributes["resources"].is_a?(String)
-        attributes["resources"] += resource_bundle_names.map { |n| n + ".bundle" }
+        attributes["resources"] += resource_bundle_names.map do |name|
+          PodPrebuild.config.prebuilt_path(path: "#{name}.bundle")
+        end
       end
 
       add_resource_bundles_to_resources.call(spec.attributes_hash)

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

@@ -1,3 +1,5 @@
+require_relative "../source_installer"
+
 module Pod
   class Installer
     # Override the download step to skip download and prepare file in target folder
@@ -15,13 +17,14 @@ module Pod
     end
 
     def should_integrate_prebuilt_pod?(name)
-      if Pod::Podfile::DSL.prebuild_job?
+      if PodPrebuild.config.prebuild_job? && PodPrebuild.config.targets_to_prebuild_from_cli.empty?
         # 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
-        PodPrebuild::StateStore.cache_validation.hit?(name)
+        prebuilt = PodPrebuild.state.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
+        prebuilt.include?(name)
       end
     end
   end

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

@@ -11,69 +11,34 @@ module Pod
   class Installer
     class PodSourceInstaller
       def install_for_prebuild!(standard_sanbox)
-        return if !Podfile::DSL.dev_pods_enabled && standard_sanbox.local?(name)
+        return if !PodPrebuild.config.dev_pods_enabled? && standard_sanbox.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(self.name)
-
-        def walk(path, &action)
-          return unless path.exist?
-          path.children.each do |child|
-            result = action.call(child, &action)
-            if child.directory?
-              walk(child, &action) if result
-            end
-          end
-        end
-
-        def make_link(source, target)
-          source = Pathname.new(source)
-          target = Pathname.new(target)
-          target.parent.mkpath unless target.parent.exist?
-          relative_source = source.relative_path_from(target.parent)
-          FileUtils.ln_sf(relative_source, target)
-        end
-
-        def mirror_with_symlink(source, basefolder, target_folder)
-          target = target_folder + source.relative_path_from(basefolder)
-          make_link(source, target)
-        end
-
+        target_names = prebuild_sandbox.existed_target_names_for_pod_name(name)
         target_names.each do |name|
-
-          # symbol link copy all substructure
           real_file_folder = prebuild_sandbox.framework_folder_path_for_target_name(name)
 
           # 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)
-          if target_names.count > 1
-            target_folder += real_file_folder.basename
-          end
-
-          if !standard_sanbox.local?(name)
-            target_folder.rmtree if target_folder.exist?
-            target_folder.mkpath
-          else
-            system "find #{target_folder} -type l -delete" # Only clean up symlink, keep source code for local pod
-          end
+          target_folder += real_file_folder.basename if target_names.count > 1
+          target_folder += PodPrebuild.config.prebuilt_path
+          target_folder.rmtree if target_folder.exist?
+          target_folder.mkpath
 
           walk(real_file_folder) do |child|
             source = child
             # only make symlink to file and `.framework` folder
-            if child.directory? and [".framework", ".dSYM"].include? child.extname
-              if child.extname == ".framework"
-                mirror_with_symlink(source, real_file_folder, target_folder)
-              else
-                # 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
-              end
-              next false  # return false means don't go deeper
+            if child.directory? && [".framework", ".dSYM"].include?(child.extname)
+              mirror_with_symlink(source, real_file_folder, target_folder) if child.extname == ".framework"
+              # 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
+              next false # Don't go deeper
             elsif child.file?
               mirror_with_symlink(source, real_file_folder, target_folder)
               next true
@@ -87,8 +52,9 @@ module Pod
           next unless metadata.static_framework?
 
           metadata.resources.each do |path|
-            target_file_path = path.sub("${PODS_ROOT}", sandbox.root.to_path)
-                                   .sub("${PODS_CONFIGURATION_BUILD_DIR}", sandbox.root.to_path)
+            target_file_path = path
+              .sub("${PODS_ROOT}", sandbox.root.to_path)
+              .sub("${PODS_CONFIGURATION_BUILD_DIR}", sandbox.root.to_path)
             real_file_path = real_file_folder + metadata.framework_name + File.basename(path)
             case File.extname(path)
             when ".xib"
@@ -106,6 +72,32 @@ module Pod
           end
         end
       end
+
+      private
+
+      def walk(path, &action)
+        return unless path.exist?
+
+        path.children.each do |child|
+          result = action.call(child, &action)
+          if child.directory?
+            walk(child, &action) if result
+          end
+        end
+      end
+
+      def make_link(source, target)
+        source = Pathname.new(source)
+        target = Pathname.new(target)
+        target.rmtree if target.exist?
+        target.parent.mkpath unless target.parent.exist?
+        relative_source = source.relative_path_from(target.parent)
+        FileUtils.ln_sf(relative_source, target)
+      end
+
+      def mirror_with_symlink(source, basefolder, target_folder)
+        make_link(source, target_folder + source.relative_path_from(basefolder))
+      end
     end
   end
 end

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

@@ -1,127 +1,60 @@
 require "fileutils"
-require_relative "../pod-rome/build_framework"
 require_relative "../prebuild_output/output"
-require_relative "helper/passer"
+require_relative "../helper/lockfile"
+require_relative "../helper/prebuild_order"
 require_relative "helper/target_checker"
+require_relative "helper/build"
 
-# patch prebuild ability
 module Pod
-  class PrebuildInstaller < Installer
+  class PrebuildInstaller < Installer # rubocop:disable Metrics/ClassLength
+    attr_reader :lockfile_wrapper
+
     def initialize(options)
       super(options[:sandbox], options[:podfile], options[:lockfile])
       @cache_validation = options[:cache_validation]
+      @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?
+    def run_code_gen!(targets)
+      return if PodPrebuild.config.prebuild_code_gen.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
+      Pod::UI.title("Running code generation...") do
+        PodPrebuild.config.prebuild_code_gen.call(self, targets)
       end
-      @prebuild_pods_changes
-    end
-
-    def blacklisted?(name)
-      PodPrebuild::StateStore.excluded_pods.include?(name)
-    end
-
-    def cache_hit?(name)
-      @cache_validation.hit?(name)
-    end
-
-    def should_not_prebuild_vendor_pod(name)
-      return true if blacklisted?(name)
-      return false if Pod::Podfile::DSL.prebuild_all_vendor_pods
-
-      cache_hit?(name)
     end
 
-    public
-
     def prebuild_output
       @prebuild_output ||= PodPrebuild::Output.new(sandbox)
     end
 
-    # Build the needed framework files
-    def prebuild_frameworks!
-      UI.puts "Start prebuild_frameworks"
-
-      # build options
-      sandbox_path = sandbox.root
-      existed_framework_folder = sandbox.generate_framework_path
-      bitcode_enabled = Pod::Podfile::DSL.bitcode_enabled
-      targets = []
-
-      if Pod::Podfile::DSL.prebuild_all_vendor_pods
-        UI.puts "Rebuild all vendor frameworks"
-        targets = pod_targets
-      elsif !local_manifest.nil?
-        UI.puts "Update some frameworks"
-        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
-      else
-        UI.puts "Rebuild all frameworks"
-        targets = pod_targets
+    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
 
-      targets = targets.reject { |pod_target| should_not_prebuild_vendor_pod(pod_target.name) }
-      targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) } unless Podfile::DSL.dev_pods_enabled
-
-      # build!
-      Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
-      Pod::UI.puts targets.map(&:name)
+    def prebuild_frameworks!
+      existed_framework_folder = sandbox.generate_framework_path
+      sandbox_path = sandbox.root
 
+      targets = PodPrebuild::BuildOrder.order_targets(targets_to_prebuild)
+      Pod::UI.puts "Prebuild frameworks (total #{targets.count}): #{targets.map(&:name)}"
       Pod::Prebuild.remove_build_dir(sandbox_path)
+      run_code_gen!(targets)
       targets.each do |target|
-        unless target.should_build?
-          Pod::UI.puts "Skip prebuilding #{target.label} because of no source files".yellow
-          next
-        end
-
         output_path = sandbox.framework_folder_path_for_target_name(target.name)
         output_path.mkpath unless output_path.exist?
         Pod::Prebuild.build(
-          sandbox_path,
-          target,
-          Pod::Podfile::DSL.prebuild_config,
-          output_path,
-          bitcode_enabled,
-          Pod::Podfile::DSL.custom_device_build_options,
-          Pod::Podfile::DSL.custom_simulator_build_options
+          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)
       end
@@ -135,7 +68,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
@@ -166,12 +98,12 @@ 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
 
-      if Podfile::DSL.dont_remove_source_code
+      if PodPrebuild.config.dont_remove_source_code?
         # just remove the tmp files
         path = sandbox.root + "Manifest.lock.tmp"
         path.rmtree if path.exist?
@@ -182,13 +114,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.process_prebuilt_dev_pods
+      prebuild_output.write_delta_file(
+        updated: targets.map { |target| target.label.to_s },
+        deleted: useless_target_names
+      )
     end
 
     def clean_delta_file
@@ -209,8 +138,14 @@ module Pod
       metadata.build_settings = pods_project.targets
         .detect { |native_target| native_target.name == target.name }
         .build_configurations
-        .detect { |config| config.name == Pod::Podfile::DSL.prebuild_config }
+        .detect { |config| config.name == PodPrebuild.config.prebuild_config }
         .build_settings
+      metadata.source_hash = @lockfile_wrapper && @lockfile_wrapper.dev_pod_hash(target.name)
+
+      # Store root path for code-coverage support later
+      # TODO: update driver code-coverage logic to use path stored here
+      project_root = PathUtils.remove_last_path_component(@sandbox.standard_sanbox_path.to_s)
+      metadata.project_root = project_root
       metadata.save!
     end
 
@@ -218,7 +153,7 @@ module Pod
     old_method2 = instance_method(:run_plugins_post_install_hooks)
     define_method(:run_plugins_post_install_hooks) do
       old_method2.bind(self).call
-      prebuild_frameworks! if Pod.is_prebuild_stage && Pod::Podfile::DSL.prebuild_job?
+      prebuild_frameworks! if PodPrebuild::Env.prebuild_stage?
     end
   end
 end