Merge branch 'chris.thuyen/chore/exclude_deleted_when_check_cachehit' into 'master'

chore(*): exclude deleted frameworks when checking cachehit + fix cache miss fallback

See merge request mobile/dax-ios/cocoapods-binary-cache!18

Author: christhuyenatgrab

.rubocop.yml

@@ -4,5 +4,4 @@ inherit_from:
 AllCops:
   Exclude:
     - 'PodBinaryCacheExample/**/*'
-    - 'lib/cocoapods-binary-cache/pod-binary/**/*'
     - 'lib/cocoapods-binary-cache/pod-rome/**/*'

Gemfile

@@ -14,3 +14,7 @@ end
 group :test do
   gem 'rspec'
 end
+
+group :lint do
+  gem 'rubocop'
+end

Gemfile.lock

@@ -19,6 +19,7 @@ GEM
     algoliasearch (1.27.1)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
+    ast (2.4.0)
     atomos (0.1.3)
     bacon (1.2.0)
     claide (1.0.3)
@@ -67,6 +68,7 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     json (2.3.0)
     lazy_priority_queue (0.1.1)
     minitest (5.13.0)
@@ -77,9 +79,14 @@ GEM
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
+    parallel (1.19.1)
+    parser (2.7.1.1)
+      ast (~> 2.4.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
+    rainbow (3.0.0)
     rake (10.5.0)
+    rexml (3.2.4)
     rgl (0.5.6)
       lazy_priority_queue (~> 0.1.0)
       stream (~> 0.5.2)
@@ -97,11 +104,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.82.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-macho (1.4.0)
+    ruby-progressbar (1.10.1)
     stream (0.5.2)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
     xcodeproj (1.13.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -124,6 +141,7 @@ DEPENDENCIES
   prettybacon
   rake (~> 10.0)
   rspec
+  rubocop
 
 BUNDLED WITH
    1.17.3

…pods-binary-cache/pod-binary/Prebuild.rb …pods-binary-cache/pod-binary/prebuild.rblib/cocoapods-binary-cache/pod-binary/Prebuild.rb renamed to lib/cocoapods-binary-cache/pod-binary/prebuild.rb lib/cocoapods-binary-cache/pod-binary/Prebuild.rb renamed to lib/cocoapods-binary-cache/pod-binary/prebuild.rb

@@ -56,9 +56,7 @@ def prebuild_output
             @prebuild_output
         end
 
-        # check if need to prebuild
-        def have_exact_prebuild_cache?
-            # check if need build frameworks
+        def cache_miss
             return false if local_manifest == nil
 
             changes = prebuild_pods_changes
@@ -76,16 +74,15 @@ def have_exact_prebuild_cache?
             UI.puts "Changed frameworks: #{changed.to_a}"
             UI.puts "Deleted frameworks: #{deleted.to_a}"
             UI.puts "Missing frameworks: #{missing.to_a}"
-            needed = (added + changed + deleted + missing)
+            needed = (added + changed + missing)
             if Pod::Podfile::DSL.enable_prebuild_dev_pod && Pod::Podfile::DSL.is_prebuild_job
                 needed += Pod::Prebuild::CacheInfo.cache_miss_dev_pods_dic.keys
             end
             needed = needed.reject { |name| blacklisted?(name) || cache_hit?(name) }
             UI.puts "Need to rebuild: #{needed.count} #{needed}"
-            return needed.empty?
+            return needed
         end
 
-
         # The install method when have completed cache
         def install_when_cache_hit!
             # just print log

lib/cocoapods-binary-cache/pod-binary/prebuild_hook.rb

@@ -121,10 +121,18 @@
     binary_installer.install!
   end
 
+  # Currently, `binary_installer.cache_miss` depends on the output of `Pod::Podfile::DSL.unbuilt_pods`
+  # -> indirectly depends on:
+  #   - `PodCacheValidator.verify_prebuilt_vendor_pods`
+  #   - `PodCacheValidator.verify_devpod_checksum`
+  # TODO (thuyen): Simplify this logic
+  cache_miss = binary_installer.cache_miss
+  Pod::Podfile::DSL.add_unbuilt_pods(cache_miss)
+
   if Pod::Podfile::DSL.prebuild_all_vendor_pods
     Pod::UI.puts "Prebuild all vendor pods"
     installer_exec.call
-  elsif (binary_installer.have_exact_prebuild_cache? && !update) # If not in prebuild job, we never rebuild and just use cache
+  elsif !update && cache_miss.empty? # If not in prebuild job, we never rebuild and just use cache
     Pod::UI.puts "Cache hit"
     binary_installer.install_when_cache_hit!
   else