cocoapods-binary-cache 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da9e54a448a2db99d8e9870096b80872868f2593d365298907a499676383e78
-  data.tar.gz: 6317b96160456163abb6cebf49b92f066b405ae312d9918d864cff8449b0c3f2
+  metadata.gz: 7896d5bccb5c1b995271da31a02a9374ff4abc833e081bff2b38fe2401dfa2da
+  data.tar.gz: ca520b237ddf0377a1e1ca03f90e5f4afa79f576241662ae22c3a9fc86e158c5
 SHA512:
-  metadata.gz: cd63f945a80479d7c25bb52fc57f0659aba555da7e7f27308ad406d12806418cab69ab7ca6f3575dfdd2902bf69cb19127aa39e422dc8af1b1ed291c1d2497a0
-  data.tar.gz: f7b9d360fe8d2f81f784c3c8c0dd1481c904c0462b87af0fa968a981609f85de8213e0074ca3691e871627bfc19530400e1012740250068f1cb3550e3018cf2a
+  metadata.gz: 3a7a9a3decaa6a14b80c80b77e69576a9b77ccbb3b4a5760c23c6e02b7ebc809a1e326ccf19030d6a1e091cdaa21a2a0d14c141d87457e7fdba7742c04adcf37
+  data.tar.gz: 4b6c9a841f4b98d41b1ad1ed36aaab65e7c7b59cd4ee30b1b13b0f695b264a0ef1222007adf305cab0be216d175f41d471a61368f641653592a31b5e23ecff1f

data/lib/cocoapods-binary-cache/cache/validator.rb

@@ -1,7 +1,6 @@
 module PodPrebuild
-  class CacheValidator < BaseCacheValidator
+  class CacheValidator
     def initialize(options)
-      super(options)
       @validators = [
         PodPrebuild::PodfileChangesCacheValidator.new(options),
         PodPrebuild::NonDevPodsCacheValidator.new(options)

data/lib/cocoapods-binary-cache/cache/validator_base.rb

@@ -37,6 +37,7 @@ module PodPrebuild
       hit = Set.new
 
       check_pod = lambda do |name|
+        root_name = name.split("/")[0]
         version = pods[name]
         prebuilt_version = prebuilt_pods[name]
         result = false
@@ -44,13 +45,15 @@ module PodPrebuild
           missed[name] = "Not available (#{version})"
         elsif prebuilt_version != version
           missed[name] = "Outdated: (prebuilt: #{prebuilt_version}) vs (#{version})"
+        elsif load_metadata(root_name).blank?
+          missed[name] = "Metadata not available (probably #{root_name}.zip is not in GeneratedFrameworks)"
         else
-          settings_diff = incompatible_build_settings(name)
-          if settings_diff.empty?
+          diff = incompatible_pod(root_name)
+          if diff.empty?
             hit << name
             result = true
           else
-            missed[name] = "Incompatible build settings: #{settings_diff}"
+            missed[name] = "Incompatible: #{diff}"
           end
         end
         result
@@ -70,11 +73,10 @@ module PodPrebuild
       PodPrebuild::CacheValidationResult.new(missed, hit)
     end
 
-    def read_prebuilt_build_settings(name)
-      return {} if generated_framework_path.nil?
-
-      metadata = PodPrebuild::Metadata.in_dir(generated_framework_path + name)
-      metadata.build_settings
+    def incompatible_pod(name)
+      # Pod incompatibility is a universal concept. Generally, it requires build settings compatibility.
+      # For more checks, do override this function to define what it means by `incompatible`.
+      incompatible_build_settings(name)
     end
 
     def incompatible_build_settings(name)
@@ -88,5 +90,23 @@ module PodPrebuild
       end
       settings_diff
     end
+
+    def load_metadata(name)
+      @metadata_cache ||= {}
+      cache = @metadata_cache[name]
+      return cache unless cache.nil?
+
+      metadata = PodPrebuild::Metadata.in_dir(generated_framework_path + name)
+      @metadata_cache[name] = metadata
+      metadata
+    end
+
+    def read_prebuilt_build_settings(name)
+      load_metadata(name).build_settings
+    end
+
+    def read_source_hash(name)
+      load_metadata(name).source_hash
+    end
   end
 end

data/lib/cocoapods-binary-cache/cache/validator_dev_pods.rb

@@ -1,22 +1,30 @@
 module PodPrebuild
   class DevPodsCacheValidator < BaseCacheValidator
-    def initialize(options)
-      super(options)
-      @sandbox_root = options[:sandbox_root]
-    end
-
     def validate(*)
       return PodPrebuild::CacheValidationResult.new if @pod_lockfile.nil?
 
-      # TODO (thuyen): Logic needs to be revised
-      # TODO (thuyen): Migrate the code PodCacheValidator.verify_devpod_checksum to this place
-      missed_with_checksum, hit_with_checksum = PodCacheValidator.verify_devpod_checksum(
-        @sandbox_root,
-        @generated_framework_path,
-        @pod_lockfile.lockfile
+      validate_pods(
+        pods: @pod_lockfile.dev_pods,
+        subspec_pods: [],
+        prebuilt_pods: @prebuilt_lockfile.nil? ? {} : @prebuilt_lockfile.dev_pods
       )
-      missed = missed_with_checksum.transform_values { |checksum| "Checksum changed: #{checksum}" }
-      PodPrebuild::CacheValidationResult.new(missed, hit_with_checksum.keys.to_set)
+    end
+
+    def incompatible_pod(name)
+      diff = super(name)
+      return diff unless diff.empty?
+
+      incompatible_source(name)
+    end
+
+    def incompatible_source(name)
+      diff = {}
+      prebuilt_hash = read_source_hash(name)
+      expected_hash = pod_lockfile.dev_pod_hash(name)
+      unless prebuilt_hash == expected_hash
+        diff[name] = { :prebuilt_hash => prebuilt_hash, :expected_hash => expected_hash}
+      end
+      diff
     end
   end
 end

data/lib/cocoapods-binary-cache/cache/validator_non_dev_pods.rb

@@ -5,7 +5,7 @@ module PodPrebuild
 
       validate_pods(
         pods: @pod_lockfile.non_dev_pods,
-        subspec_pods: @pod_lockfile.subspec_pods,
+        subspec_pods: @pod_lockfile.subspec_vendor_pods,
         prebuilt_pods: @prebuilt_lockfile.nil? ? {} : @prebuilt_lockfile.non_dev_pods
       )
     end

data/lib/cocoapods-binary-cache/diagnosis/base.rb

@@ -0,0 +1,13 @@
+module PodPrebuild
+  class BaseDiagnosis
+    def initialize(options)
+      @cache_validation = options[:cache_validation]
+      @standard_sandbox = options[:standard_sandbox]
+      @specs = (options[:specs] || []).map { |s| [s.name, s] }.to_h
+    end
+
+    def spec(name)
+      @specs[name]
+    end
+  end
+end

data/lib/cocoapods-binary-cache/diagnosis/diagnosis.rb

@@ -0,0 +1,16 @@
+require_relative "base"
+require_relative "integration"
+
+module PodPrebuild
+  class Diagnosis
+    def initialize(options)
+      @diagnosers = [
+        IntegrationDiagnosis
+      ].map { |klazz| klazz.new(options) }
+    end
+
+    def run
+      @diagnosers.each(&:run)
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative "base"
+
+module PodPrebuild
+  class IntegrationDiagnosis < BaseDiagnosis
+    def run
+      should_be_integrated = if Pod::Podfile::DSL.prebuild_job? \
+                             then @cache_validation.hit + @cache_validation.missed \
+                             else @cache_validation.hit \
+                             end
+      should_be_integrated = should_be_integrated.map { |name| name.split("/")[0] }.to_set
+      unintegrated = should_be_integrated.reject do |name|
+        module_name = spec(name)&.module_name || name
+        framework_path = @standard_sandbox.pod_dir(name) + "#{module_name}.framework"
+        framework_path.exist?
+      end
+      Pod::UI.puts "🚩 Unintegrated frameworks: #{unintegrated}".yellow unless unintegrated.empty?
+    end
+  end
+end

data/lib/cocoapods-binary-cache/env.rb

@@ -0,0 +1,32 @@
+module PodPrebuild
+  class Env
+    @stage_idx = 0
+
+    class << self
+      def reset!
+        @stage_idx = 0
+        @stages = nil
+      end
+
+      def next_stage!
+        @stage_idx += 1 if @stage_idx < stages.count - 1
+      end
+
+      def stages
+        @stages ||= Pod::Podfile::DSL.prebuild_job? ? [:prebuild, :integration] : [:integration]
+      end
+
+      def current_stage
+        stages[@stage_idx]
+      end
+
+      def prebuild_stage?
+        current_stage == :prebuild
+      end
+
+      def integration_stage?
+        current_stage == :integration
+      end
+    end
+  end
+end

data/lib/cocoapods-binary-cache/helper/lockfile.rb

@@ -1,3 +1,5 @@
+require_relative "checksum"
+
 module PodPrebuild
   class Lockfile
     attr_reader :lockfile, :data
@@ -15,6 +17,10 @@ module PodPrebuild
       @data["EXTERNAL SOURCES"] || {}
     end
 
+    def dev_pod_sources
+      @dev_pod_sources ||= external_sources.select { |_, attributes| attributes.key?(:path) } || {}
+    end
+
     def dev_pod_names
       # There are 2 types of external sources:
       # - Development pods: declared with `:path` option in Podfile, corresponding to `:path` in the Lockfile
@@ -27,7 +33,7 @@ module PodPrebuild
       #     :git: git@remote_url
       #     :commit: abc1234
       # --------------------
-      @dev_pod_names ||= external_sources.select { |_, attributes| attributes.key?(:path) }.keys.to_set
+      @dev_pod_names ||= dev_pod_sources.keys.to_set
     end
 
     def dev_pods
@@ -40,13 +46,30 @@ module PodPrebuild
       @non_dev_pods ||= pods.reject { |name, _| dev_pod_names_.include?(name) }
     end
 
+    def subspec_vendor_pods
+      dev_pod_names_ = dev_pod_names
+      @subspec_vendor_pods ||= subspec_pods.reject { |name, _| dev_pod_names_.include?(name) }
+    end
+
+    # Return content hash (Hash the directory at source path) of a dev_pod
+    # Return nil if it's not a dev_pod
+    def dev_pod_hash(pod_name)
+      dev_pod_hashes_map[pod_name]
+    end
+
+    private
+
     def subspec_pods
-      pods.keys
+      @subspec_pods ||= pods.keys
         .select { |k| k.include?("/") }
         .group_by { |k| k.split("/")[0] }
     end
 
-    private
+    # Generate a map between a dev_pod and it source hash
+    def dev_pod_hashes_map
+      @dev_pod_hashes_map ||=
+        dev_pod_sources.map { |name, attribs| [name, FolderChecksum.checksum(attribs[:path])] }.to_h
+    end
 
     # Parse an item under `PODS` section of a Lockfile
     # @param hash_or_string: an item under `PODS` section, could be a Hash (if having dependencies) or a String

data/lib/cocoapods-binary-cache/helper/podspec.rb

@@ -1,5 +1,6 @@
 module Pod
   class Specification
+    # TODO: this detect objc lib as empty source, eg. Realm
     def empty_source_files?
       return subspecs.all?(&:empty_source_files?) unless subspecs.empty?
 

data/lib/cocoapods-binary-cache/hooks/post_install.rb

@@ -5,12 +5,29 @@ module PodPrebuild
     end
 
     def run
+      edit_scheme_for_code_coverage if PodPrebuild::Env.prebuild_stage?
+      diagnose if PodPrebuild::Env.integration_stage?
+    end
+
+    private
+
+    def diagnose
+      Pod::UI.section("Diagnosing cocoapods-binary-cache") do
+        PodPrebuild::Diagnosis.new(
+          cache_validation: PodPrebuild::StateStore.cache_validation,
+          standard_sandbox: @installer_context.sandbox,
+          specs: @installer_context.umbrella_targets.map(&:specs).flatten
+        ).run
+      end
+    end
+
+    def edit_scheme_for_code_coverage
       return unless Pod::Podfile::DSL.dev_pods_enabled && @installer_context.sandbox.instance_of?(Pod::PrebuildSandbox)
 
       # Modify pods scheme to support code coverage
       # If we don't prebuild dev pod -> no need to care about this in Pod project
       # because we setup in the main project (ex. DriverCI scheme)
-      SchemeEditor.edit_to_support_code_coverage(@installer_context.sandbox) if Pod.is_prebuild_stage
+      SchemeEditor.edit_to_support_code_coverage(@installer_context.sandbox)
     end
   end
 end

data/lib/cocoapods-binary-cache/hooks/pre_install.rb

@@ -13,18 +13,21 @@ module PodPrebuild
     end
 
     def run
+      return if @installer_context.sandbox.is_a?(Pod::PrebuildSandbox)
+
       require_relative "../pod-binary/helper/feature_switches"
-      return if Pod.is_prebuild_stage
 
       log_section "🚀  Prebuild frameworks"
       ensure_valid_podfile
       save_installation_states
-      prepare_environment
+      Pod::UI.section("Prepare environment") { prepare_environment }
       create_prebuild_sandbox
       Pod::UI.section("Detect implicit dependencies") { detect_implicit_dependencies }
       Pod::UI.section("Validate prebuilt cache") { validate_cache }
       prebuild! if Pod::Podfile::DSL.prebuild_job?
-      reset_environment
+      Pod::UI.section("Reset environment") { reset_environment }
+
+      PodPrebuild::Env.next_stage!
       log_section "🤖  Resume pod installation"
       require_relative "../pod-binary/integration"
     end
@@ -53,19 +56,13 @@ module PodPrebuild
     end
 
     def prepare_environment
-      Pod::UI.puts "Prepare environment"
-      Pod.is_prebuild_stage = true
-      Pod::Podfile::DSL.enable_prebuild_patch true  # enable sikpping for prebuild targets
       Pod::Installer.force_disable_integration true # don't integrate targets
       Pod::Config.force_disable_write_lockfile true # disbale write lock file for perbuild podfile
       Pod::Installer.disable_install_complete_message true # disable install complete message
     end
 
     def reset_environment
-      Pod::UI.puts "Reset environment"
-      Pod.is_prebuild_stage = false
       Pod::Installer.force_disable_integration false
-      Pod::Podfile::DSL.enable_prebuild_patch false
       Pod::Config.force_disable_write_lockfile false
       Pod::Installer.disable_install_complete_message false
       Pod::UserInterface.warnings = [] # clean the warning in the prebuild step, it's duplicated.
@@ -81,7 +78,7 @@ module PodPrebuild
     def create_prebuild_sandbox
       standard_sandbox = installer_context.sandbox
       @prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
-      Pod::UI.puts "Create prebuild sandbox at #{@prebuild_sandbox.root}"
+      Pod::UI.message "Create prebuild sandbox at #{@prebuild_sandbox.root}"
     end
 
     def detect_implicit_dependencies

data/lib/cocoapods-binary-cache/main.rb

@@ -9,13 +9,14 @@ require_relative "helper/json"
 require_relative "helper/lockfile"
 require_relative "helper/path_utils"
 require_relative "helper/podspec"
+require_relative "env"
 require_relative "state_store"
 require_relative "hooks/post_install"
 require_relative "hooks/pre_install"
 require_relative "pod-binary/prebuild_dsl"
 require_relative "pod-binary/prebuild_hook"
 require_relative "pod-binary/prebuild"
-require_relative "prebuild_cache"
 require_relative "prebuild_output/metadata"
 require_relative "prebuild_output/output"
 require_relative "scheme_editor"
+require_relative "diagnosis/diagnosis"

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

@@ -3,7 +3,7 @@ module Pod
     class TargetDefinition
       def detect_prebuilt_pod(name, requirements)
         @explicit_prebuilt_pod_names ||= []
-        options = requirements.last
+        options = requirements.last || {}
         if Pod::Podfile::DSL.prebuild_all?
           @explicit_prebuilt_pod_names << Specification.root_name(name)
         elsif options.is_a?(Hash) && options[:binary]

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

@@ -2,44 +2,6 @@ require_relative "../tool/tool"
 require_relative "prebuild_sandbox"
 
 module Pod
-
-  # a flag that indicate stages
-  class_attr_accessor :is_prebuild_stage
-
-  # a switch for the `pod` DSL to make it only valid for ':binary => true'
-  class Podfile
-    module DSL
-      @@enable_prebuild_patch = false
-
-      # when enable, `pod` function will skip all pods without 'prebuild => true'
-      def self.enable_prebuild_patch(value)
-        @@enable_prebuild_patch = value
-      end
-
-      # --- patch ---
-      old_method = instance_method(:pod)
-
-      define_method(:pod) do |name, *args|
-        if !@@enable_prebuild_patch
-          old_method.bind(self).(name, *args)
-          return
-        end
-
-        # patched content
-        should_prebuild = Pod::Podfile::DSL.prebuild_all
-        local = false
-
-        options = args.last
-        if options.is_a?(Hash) and options[Pod::Prebuild.keyword] != nil
-          should_prebuild = options[Pod::Prebuild.keyword]
-          local = (options[:path] != nil)
-        end
-
-        old_method.bind(self).call(name, *args) if should_prebuild && (!local || Podfile::DSL.dev_pods_enabled)
-      end
-    end
-  end
-
   # a force disable option for integral
   class Installer
     def self.force_disable_integration(value)

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

@@ -18,19 +18,10 @@
 module Pod
   def self.fast_get_targets_for_pod_name(pod_name, targets, cache)
     pod_name = pod_name.split("/")[0] # Look for parent spec instead of subspecs
-    pod_name_to_targets_hash = nil
     if cache.empty?
-      pod_name_to_targets_hash = targets.reduce({}) do |sum, target|
-        array = sum[target.pod_name] || []
-        array << target
-        sum[target.pod_name] = array
-        sum
-      end
-      cache << pod_name_to_targets_hash
+      targets.select { |target| target.name == pod_name }
     else
-      pod_name_to_targets_hash = cache.first
+      cache.first[pod_name] || []
     end
-
-    pod_name_to_targets_hash[pod_name] || []
   end
 end

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

@@ -2,10 +2,9 @@ require_relative "names"
 
 module Pod
   class PrebuildSandbox < Sandbox
-
     # [String] standard_sandbox_path
     def self.from_standard_sanbox_path(path)
-      prebuild_sandbox_path = Pathname.new(path).realpath + "_Prebuild"
+      prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild::Config.instance.prebuild_path
       self.new(prebuild_sandbox_path)
     end
 

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

@@ -5,7 +5,6 @@ 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/resolve_dependencies"

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

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

@@ -15,9 +15,9 @@ module Pod
 
       updated_names.each do |name|
         root_name = Specification.root_name(name)
-        next if !Pod::Podfile::DSL.dev_pods_enabled && sandbox.local?(root_name)
+        next if sandbox.local?(root_name)
 
-        UI.puts "Delete cached files: #{root_name}"
+        UI.message "Delete cached files: #{root_name}"
         target_path = sandbox.pod_dir(root_name)
         target_path.rmtree if target_path.exist?
 

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

@@ -14,6 +14,7 @@ module Pod
         return if !Podfile::DSL.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)

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

@@ -3,6 +3,7 @@ require_relative "../pod-rome/build_framework"
 require_relative "../prebuild_output/output"
 require_relative "helper/passer"
 require_relative "helper/target_checker"
+require_relative "../helper/lockfile"
 
 # patch prebuild ability
 module Pod
@@ -10,6 +11,7 @@ module Pod
     def initialize(options)
       super(options[:sandbox], options[:podfile], options[:lockfile])
       @cache_validation = options[:cache_validation]
+      @lockfile_wrapper = PodPrebuild::Lockfile.new(lockfile)
     end
 
     private
@@ -35,15 +37,13 @@ module Pod
       PodPrebuild::StateStore.excluded_pods.include?(name)
     end
 
-    def cache_hit?(name)
-      @cache_validation.hit?(name)
+    def cache_missed?(name)
+      @cache_validation.missed?(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
@@ -98,6 +98,9 @@ module Pod
         targets = pod_targets
       end
 
+      unless Pod::Podfile::DSL.prebuild_all_vendor_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) }
       targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) } unless Podfile::DSL.dev_pods_enabled
 
@@ -115,13 +118,14 @@ module Pod
         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_root_path: sandbox_path,
+          target: target,
+          configuration: Pod::Podfile::DSL.prebuild_config,
+          output_path: output_path,
+          bitcode_enabled: bitcode_enabled,
+          device_build_enabled: Pod::Podfile::DSL.device_build_enabled,
+          custom_build_options: Pod::Podfile::DSL.custom_device_build_options,
+          custom_build_options_simulator: Pod::Podfile::DSL.custom_simulator_build_options
         )
         collect_metadata(target, output_path)
       end
@@ -188,7 +192,6 @@ module Pod
       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
     end
 
     def clean_delta_file
@@ -211,6 +214,13 @@ module Pod
         .build_configurations
         .detect { |config| config.name == Pod::Podfile::DSL.prebuild_config }
         .build_settings
+      hash = @lockfile_wrapper.dev_pod_hash(target.name)
+      metadata.source_hash = hash unless hash.nil?
+
+      # 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 +228,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

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

@@ -14,6 +14,7 @@ module Pod
         apply_config.call(:excluded_pods)
         apply_config.call(:dev_pods_enabled)
         apply_config.call(:bitcode_enabled)
+        apply_config.call(:device_build_enabled)
         apply_config.call(:dont_remove_source_code)
         apply_config.call(:custom_device_build_options)
         apply_config.call(:custom_simulator_build_options)
@@ -28,6 +29,7 @@ module Pod
       @excluded_pods = Set.new
       @dev_pods_enabled = false
       @bitcode_enabled = false
+      @device_build_enabled = false
       @dont_remove_source_code = false
       @custom_device_build_options = []
       @custom_simulator_build_options = []
@@ -52,6 +54,7 @@ module Pod
         attr_accessor :excluded_pods
         attr_accessor :dev_pods_enabled
         attr_accessor :bitcode_enabled
+        attr_accessor :device_build_enabled
         attr_accessor :dont_remove_source_code
         attr_accessor :custom_device_build_options
         attr_accessor :custom_simulator_build_options

data/lib/cocoapods-binary-cache/pod-rome/build_framework.rb

@@ -1,6 +1,13 @@
 require 'fourflusher'
 require 'xcpretty' # TODO (thuyen): Revise this dependency
 
+module FileUtils
+  def self.mvpath(src, dst, **options)
+    FileUtils.rm_rf(File.join(dst, File.basename(src)))
+    FileUtils.mv(src, dst, **options)
+  end
+end
+
 PLATFORMS = { 'iphonesimulator' => 'iOS',
               'appletvsimulator' => 'tvOS',
               'watchsimulator' => 'watchOS' }
@@ -76,14 +83,14 @@ def build_for_iosish_platform(sandbox,
   device_binary = device_framework_path + "/#{module_name}"
   simulator_binary = simulator_framework_path + "/#{module_name}"
   return unless File.file?(device_binary) && File.file?(simulator_binary)
-  
+
   # the device_lib path is the final output file path
   # combine the binaries
   tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
   lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
   puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-  FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
-  
+  FileUtils.mvpath tmp_lipoed_binary_path, device_binary
+
   # collect the swiftmodule file for various archs.
   device_swiftmodule_path = device_framework_path + "/Modules/#{module_name}.swiftmodule"
   simulator_swiftmodule_path = simulator_framework_path + "/Modules/#{module_name}.swiftmodule"
@@ -123,16 +130,14 @@ def build_for_iosish_platform(sandbox,
       tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
       lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
       puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-      FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
+      FileUtils.mvpath tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}"
     end
-    # move
-    FileUtils.mv device_dsym, output_path, :force => true
+    FileUtils.mvpath device_dsym, output_path
   end
 
   # output
   output_path.mkpath unless output_path.exist?
-  FileUtils.mv device_framework_path, output_path, :force => true
-
+  FileUtils.mvpath device_framework_path, output_path
 end
 
 def xcodebuild(sandbox, target, configuration, sdk='macosx', deployment_target=nil, other_options=[])
@@ -168,23 +173,18 @@ def xcodebuild(sandbox, target, configuration, sdk='macosx', deployment_target=n
   [is_succeed, log]
 end
 
-
-
 module Pod
   class Prebuild
+    def self.build(options)
+      sandbox_root_path = options[:sandbox_root_path]
+      target = options[:target]
+      configuration = options[:configuration]
+      output_path = options[:output_path]
+      bitcode_enabled = options[:bitcode_enabled] || false
+      device_build_enabled = options[:device_build_enabled] || false
+      custom_build_options = options[:custom_build_options] || []
+      custom_build_options_simulator = options[:custom_build_options_simulator] || []
 
-    # Build the frameworks with sandbox and targets
-    #
-    # @param  [String] sandbox_root_path
-    #         The sandbox root path where the targets project place
-    #
-    #         [PodTarget] target
-    #         The pod targets to build
-    #
-    #         [Pathname] output_path
-    #         output path for generated frameworks
-    #
-    def self.build(sandbox_root_path, target, configuration, output_path, bitcode_enabled = false, custom_build_options=[], custom_build_options_simulator=[])
       return if target.nil?
 
       sandbox_root = Pathname(sandbox_root_path)
@@ -204,7 +204,8 @@ module Pod
           "iphonesimulator",
           bitcode_enabled,
           custom_build_options,
-          custom_build_options_simulator
+          custom_build_options_simulator,
+          device_build_enabled
         )
       when :osx
         xcodebuild(
@@ -227,7 +228,8 @@ module Pod
           "watchsimulator",
           true,
           custom_build_options,
-          custom_build_options_simulator
+          custom_build_options_simulator,
+          device_build_enabled
         )
       else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
 
@@ -242,6 +244,5 @@ module Pod
     def self.build_dir(sandbox_root)
       sandbox_root.parent + "build"
     end
-
   end
 end

data/lib/cocoapods-binary-cache/prebuild_output/metadata.rb

@@ -43,5 +43,21 @@ module PodPrebuild
     def build_settings=(value)
       @data["build_settings"] = value
     end
+
+    def source_hash
+      @data["source_hash"] || {}
+    end
+
+    def source_hash=(value)
+      @data["source_hash"] = value
+    end
+
+    def project_root
+      @data["project_root"]
+    end
+
+    def project_root=(value)
+      @data["project_root"] = value
+    end
   end
 end

data/lib/cocoapods-binary-cache/prebuild_output/output.rb

@@ -7,18 +7,17 @@ module PodPrebuild
       @sandbox = prebuild_sandbox
     end
 
-    def delta_dir
-      @delta_dir ||= File.expand_path("#{@sandbox.root}/../_Prebuild_delta")
+    def prebuild_delta_path
+      @prebuild_delta_path ||= PodPrebuild::Config.instance.prebuild_delta_path
     end
 
-    def delta_file_path
-      # TODO (thuyen): Unify this path with PodPrebuild::Config#delta_file_path
-      "#{delta_dir}/changes.json"
+    def delta_dir
+      @delta_dir ||= File.dirname(prebuild_delta_path)
     end
 
     def clean_delta_file
-      puts "Clean delta file: #{delta_file_path}"
-      FileUtils.rm_rf(delta_file_path)
+      puts "Clean delta file: #{prebuild_delta_path}"
+      FileUtils.rm_rf(prebuild_delta_path)
     end
 
     def create_dir_if_needed(dir)
@@ -32,40 +31,12 @@ module PodPrebuild
         return
       end
 
-      Pod::UI.puts "Write prebuild changes to: #{delta_file_path}"
+      Pod::UI.puts "Write prebuild changes to: #{prebuild_delta_path}"
       create_dir_if_needed(delta_dir)
-      changes = PodPrebuild::JSONFile.new(delta_file_path)
+      changes = PodPrebuild::JSONFile.new(prebuild_delta_path)
       changes["updated"] = updated
       changes["deleted"] = deleted
       changes.save!
     end
-
-    def process_prebuilt_dev_pods
-      devpod_output_path = "#{delta_dir}/devpod_prebuild_output/"
-      create_dir_if_needed(devpod_output_path)
-      Pod::UI.puts "Copy prebuilt devpod frameworks to output dir: #{devpod_output_path}"
-
-      # Inject project path (where the framework is built) to support generating code coverage later
-      project_root = PathUtils.remove_last_path_component(@sandbox.standard_sanbox_path.to_s)
-      template_file_path = devpod_output_path + "prebuilt_map"
-      File.open(template_file_path, "w") do |file|
-        file.write(project_root)
-      end
-
-      # FIXME (thuyen): Revise usage of cache_miss_dev_pods_dic
-      # The behavior of processing outputs of dev pods and non-dev pods should be very SIMILAR
-      cache_miss_dev_pods_dic = {}
-
-      cache_miss_dev_pods_dic.each do |name, hash|
-        Pod::UI.puts "Output dev pod lib: #{name} hash: #{hash}"
-        built_lib_path = @sandbox.framework_folder_path_for_target_name(name)
-        next unless File.directory?(built_lib_path)
-
-        FileUtils.cp(template_file_path, "#{built_lib_path}/#{name}.framework")
-        target_dir = "#{devpod_output_path}#{name}_#{hash}"
-        Pod::UI.puts "From: #{built_lib_path} -> #{target_dir}"
-        FileUtils.cp_r(built_lib_path, target_dir)
-      end
-    end
   end
 end

data/lib/command/binary.rb

@@ -2,16 +2,16 @@ require "fileutils"
 require_relative "config"
 require_relative "fetch"
 require_relative "prebuild"
+require_relative "push"
 require_relative "visualize"
 
 module Pod
   class Command
     class Binary < Command
       self.abstract_command = true
-      self.default_subcommand = "fetch"
 
       def prebuild_config
-        @prebuild_config ||= PodPrebuild::Config.new("PodBinaryCacheConfig.json")
+        @prebuild_config ||= PodPrebuild::Config.instance
       end
     end
   end

data/lib/command/config.rb

@@ -2,13 +2,18 @@ require_relative "../cocoapods-binary-cache/helper/json"
 
 module PodPrebuild
   class Config
-    attr_reader :cache_repo, :cache_path, :prebuild_path
+    attr_reader :cache_repo, :cache_path, :prebuild_path, :prebuild_delta_path
 
     def initialize(path)
       @data = PodPrebuild::JSONFile.new(path)
       @cache_repo = @data["cache_repo"] || @data["prebuilt_cache_repo"]
       @cache_path = File.expand_path(@data["cache_path"])
-      @prebuild_path = @data["prebuild_path"] || "Pods/_Prebuild"
+      @prebuild_path = @data["prebuild_path"] || "_Prebuild"
+      @prebuild_delta_path = @data["prebuild_delta_path"] || "_Prebuild_delta/changes.json"
+    end
+
+    def self.instance
+      @instance ||= new("PodBinaryCacheConfig.json")
     end
 
     def manifest_path(in_cache: false)
@@ -22,10 +27,5 @@ module PodPrebuild
     def generated_frameworks_dir(in_cache: false)
       root_dir(in_cache) + "/GeneratedFrameworks"
     end
-
-    def delta_file_path
-      # TODO (thuyen): Unify this path with PodPrebuild::Output#delta_file_path
-      "Pods/_Prebuild_delta/changes.json"
-    end
   end
 end

data/lib/command/executor/fetcher.rb

@@ -22,7 +22,7 @@ module PodPrebuild
       if Dir.exist?(dest_dir + "/.git")
         git("fetch origin #{branch}")
         git("checkout -f FETCH_HEAD", ignore_output: true)
-        git("branch -D #{branch} || true", ignore_output: true, can_fail: true)
+        git("branch -D #{branch}", ignore_output: true, can_fail: true)
         git("checkout -b #{branch}")
       else
         FileUtils.rm_rf(dest_dir)

data/lib/command/executor/prebuilder.rb

@@ -15,7 +15,7 @@ module PodPrebuild
     def run
       @fetcher.run
       prebuild
-      changes = PodPrebuild::JSONFile.new(@config.delta_file_path)
+      changes = PodPrebuild::JSONFile.new(@config.prebuild_delta_path)
       return if changes.empty?
 
       sync_cache(changes)

data/lib/command/executor/pusher.rb

@@ -12,7 +12,7 @@ module PodPrebuild
         commit_message = "Update prebuilt cache".shellescape
         git("add .")
         git("commit -m '#{commit_message}'")
-        git("push origin head")
+        git("push origin #{@cache_branch}")
       end
     end
   end

data/lib/command/push.rb

@@ -0,0 +1,23 @@
+require_relative "executor/pusher"
+
+module Pod
+  class Command
+    class Binary < Command
+      class Push < Binary
+        self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
+
+        def initialize(argv)
+          super
+          @pusher = PodPrebuild::CachePusher.new(
+            config: prebuild_config,
+            cache_branch: argv.shift_argument || "master"
+          )
+        end
+
+        def run
+          @pusher.run
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -115,6 +115,10 @@ files:
 - lib/cocoapods-binary-cache/cache/validator_with_podfile.rb
 - lib/cocoapods-binary-cache/dependencies_graph/dependencies_graph.rb
 - lib/cocoapods-binary-cache/dependencies_graph/graph_visualizer.rb
+- lib/cocoapods-binary-cache/diagnosis/base.rb
+- lib/cocoapods-binary-cache/diagnosis/diagnosis.rb
+- lib/cocoapods-binary-cache/diagnosis/integration.rb
+- lib/cocoapods-binary-cache/env.rb
 - lib/cocoapods-binary-cache/helper/benchmark_show.rb
 - lib/cocoapods-binary-cache/helper/checksum.rb
 - lib/cocoapods-binary-cache/helper/json.rb
@@ -147,7 +151,6 @@ files:
 - lib/cocoapods-binary-cache/pod-binary/tool/tool.rb
 - lib/cocoapods-binary-cache/pod-rome/LICENSE.txt
 - lib/cocoapods-binary-cache/pod-rome/build_framework.rb
-- lib/cocoapods-binary-cache/prebuild_cache.rb
 - lib/cocoapods-binary-cache/prebuild_output/metadata.rb
 - lib/cocoapods-binary-cache/prebuild_output/output.rb
 - lib/cocoapods-binary-cache/scheme_editor.rb
@@ -164,6 +167,7 @@ files:
 - lib/command/fetch.rb
 - lib/command/helper/zip.rb
 - lib/command/prebuild.rb
+- lib/command/push.rb
 - lib/command/visualize.rb
 homepage: https://github.com/grab/cocoapods-binary-cache
 licenses:
@@ -184,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Reduce build time by building pod frameworks and cache to remote storage,

data/lib/cocoapods-binary-cache/prebuild_cache.rb

@@ -1,47 +0,0 @@
-# Copyright 2019 Grabtaxi Holdings PTE LTE (GRAB), All rights reserved.
-# Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
-
-require 'json'
-require 'cocoapods'
-require_relative "helper/checksum"
-
-class PodCacheValidator
-
-  # Cache miss/hit checking for development pods
-  # Return 2 Hashes for cache miss and cache hit libraries
-  def self.verify_devpod_checksum(sandbox_root, generated_framework_path, lock_file)
-    devpod_path = "#{sandbox_root}/devpod/"
-    target_path = generated_framework_path
-    Pod::UI.puts "verify_devpod_checksum: #{devpod_path}"
-    external_sources = lock_file.to_hash["EXTERNAL SOURCES"]
-    unless File.directory?(target_path)
-      FileUtils.mkdir_p(target_path)
-    end
-    missing_pods_dic = Hash[]
-    cachehit_pods_dic = Hash[]
-    if !external_sources
-      Pod::UI.puts 'No development pods!'
-      return missing_pods_dic, cachehit_pods
-    end
-    external_sources.each do |name, attribs|
-      if attribs.class == Hash
-        path = attribs[:path]
-        if path
-          hash = FolderChecksum.checksum(path)
-          cached_path = "#{devpod_path}#{name}_#{hash}"
-          if !Dir.exists?(cached_path)
-            missing_pods_dic[name] = hash
-          else
-            cachehit_pods_dic[name] = hash
-            target_dir = "#{target_path}/#{name}"
-            FileUtils.rm_r(target_dir, :force => true)
-            FileUtils.cp_r(cached_path, target_dir)
-          end
-        end
-      else
-        Pod::UI.puts "Error, wrong type: #{attribs}"
-      end
-    end
-    return missing_pods_dic, cachehit_pods_dic
-  end
-end