chore(*): update framework path

Author: christhuyenatgrab

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-binary-cache (0.1.5)
+    cocoapods-binary-cache (0.1.6)
       cocoapods (>= 1.5.0)
       fourflusher (~> 2.0)
       rgl (~> 0.5.6)
@@ -138,7 +138,7 @@ PLATFORMS
 
 DEPENDENCIES
   bacon
-  bundler (~> 1.3)
+  bundler (>= 1.3)
   cocoapods
   cocoapods-binary-cache!
   mocha
@@ -153,4 +153,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.17.3
+   2.1.2

cocoapods-binary-cache.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rgl", "~> 0.5.6"
   spec.add_dependency "xcpretty", "~> 0.3.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -10,7 +10,9 @@ def run
       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 = \
+          @standard_sandbox.pod_dir(name) + \
+          PodPrebuild::Config.instance.prebuilt_path(path: "#{module_name}.framework")
         framework_path.exist?
       end
       Pod::UI.puts "🚩 Unintegrated frameworks: #{unintegrated}".yellow unless unintegrated.empty?

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

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

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

@@ -15,6 +15,7 @@ def alter_spec(spec, cache)
         # 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.instance.prebuilt_path(path: framework_file_path)
         add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
       end
 

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

@@ -17,64 +17,28 @@ def install_for_prebuild!(standard_sanbox)
         # 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.instance.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
@@ -88,8 +52,9 @@ def mirror_with_symlink(source, basefolder, target_folder)
           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"
@@ -107,6 +72,31 @@ def mirror_with_symlink(source, basefolder, target_folder)
           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.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

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

@@ -211,7 +211,7 @@ def collect_metadata(target, output_path)
         .file_accessors
         .map { |f| f.resource_bundles.keys }
         .flatten
-        .map { |name| "#{name}.bundle" }
+        .map { |name| PodPrebuild::Config.instance.prebuilt_path(path: "#{name}.bundle") }
       metadata.build_settings = pods_project.targets
         .detect { |native_target| native_target.name == target.name }
         .build_configurations

lib/command/config.rb

@@ -2,13 +2,13 @@
 
 module PodPrebuild
   class Config
-    attr_reader :cache_repo, :cache_path, :prebuild_path, :prebuild_delta_path
+    attr_reader :cache_repo, :cache_path, :prebuild_sandbox_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"] || "_Prebuild"
+      @prebuild_sandbox_path = @data["prebuild_path"] || "_Prebuild"
       @prebuild_delta_path = @data["prebuild_delta_path"] || "_Prebuild_delta/changes.json"
     end
 
@@ -21,11 +21,15 @@ def manifest_path(in_cache: false)
     end
 
     def root_dir(in_cache)
-      in_cache ? @cache_path : @prebuild_path
+      in_cache ? @cache_path : @prebuild_sandbox_path
     end
 
     def generated_frameworks_dir(in_cache: false)
       root_dir(in_cache) + "/GeneratedFrameworks"
     end
+
+    def prebuilt_path(path: nil)
+      path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}"
+    end
   end
 end

lib/command/executor/fetcher.rb

@@ -31,9 +31,9 @@ def fetch_cache(repo, branch, dest_dir)
     end
 
     def unzip_cache
-      Pod::UI.puts "Unzipping cache: #{@config.cache_path} -> #{@config.prebuild_path}".green
-      FileUtils.rm_rf(@config.prebuild_path)
-      FileUtils.mkdir_p(@config.prebuild_path)
+      Pod::UI.puts "Unzipping cache: #{@config.cache_path} -> #{@config.prebuild_sandbox_path}".green
+      FileUtils.rm_rf(@config.prebuild_sandbox_path)
+      FileUtils.mkdir_p(@config.prebuild_sandbox_path)
 
       if File.exist?(@config.manifest_path(in_cache: true))
         FileUtils.cp(

scripts/integration_test.sh

@@ -66,7 +66,7 @@ check_prebuilt_integration() {
 
   local should_fail=false
   for pod in $(cat ".stats/pods_to_integrate.txt"); do
-    local framework_dir="Pods/${pod}/${pod}.framework"
+    local framework_dir="Pods/${pod}/_Prebuilt/${pod}.framework"
     if [[ ! -f "${framework_dir}/${pod}" ]]; then
       should_fail=true
       echo "🚩 Prebuilt framework ${pod} was not integrated. Expect to have: ${framework_dir}"