cocoapods-binary-cache 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732c3a4179deba8a6f1ffe95e9035c12d80989a1b3edb0581a5d569f1b9ef542
-  data.tar.gz: c72c2d4333f1525d2078896374b2fbe239891dc404ca35dadffc2f22fc4b8aff
+  metadata.gz: e14f6a05df17d10b35b5ddfb5d263cdeaed50e4e3bf348b6606c27036317c173
+  data.tar.gz: 856426aa42021e6fc6b69f1de0be1e1fbc2dc96f0ac50b146f380280a3dee236
 SHA512:
-  metadata.gz: 9ff71c26afc711721ce4360999a94b03a36fcd49f51ead77583c5ef4b07e86c7c841effcfdc023a4968d26d19d33f66ed9ea0891ce046584e9c4bd50e6afa375
-  data.tar.gz: 1c28065aefc4539864e5645d9d01c5b660c03a9df40ca72a05a07be80cba28c28906e11802ff4fcb676057628e4eb4f39a8eee72ec920a04d4acfc336589a9d2
+  metadata.gz: '090730e3c268eb4f3dc0a1d0d07546e9ed4bc92dae2962a4ebc1d65f58996762aa1866414a683cf94ebee6894ebaec3d916a62cd7fe65295d9e2d6a576fb7488'
+  data.tar.gz: ee499933ce3bb03ec19eefcd52e50dc2170ed92e7f8f9c557e8a7c8d38f9ee1730402666937a494efe655604b320b5b6d012f31a982eb21051fab891a7367a69

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

@@ -8,7 +8,7 @@ module PodPrebuild
     def validate(accumulated)
       return accumulated if library_evolution_supported? || @pod_lockfile.nil?
 
-      dependencies_graph = DependenciesGraph.new(@pod_lockfile.lockfile)
+      dependencies_graph = DependenciesGraph.new(lockfile: @pod_lockfile.lockfile, invert_edge: true)
       clients = dependencies_graph.get_clients(accumulated.discard(@ignored_pods).missed.to_a)
       unless PodPrebuild.config.dev_pods_enabled?
         clients = clients.reject { |client| @pod_lockfile.dev_pods.keys.include?(client) }

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

@@ -10,10 +10,12 @@ require_relative "graph_visualizer"
 # https://github.com/monora/rgl/blob/master/lib/rgl/adjacency.rb
 
 class DependenciesGraph
-  def initialize(lockfile)
-    @lockfile = lockfile
+  def initialize(options)
+    @lockfile = options[:lockfile]
+    @devpod_only = options[:devpod_only]
+    @max_deps = options[:max_deps].to_i if options[:max_deps]
     # A normal edge is an edge (one direction) from library A to library B which is a dependency of A.
-    @invert_edge = true
+    @invert_edge = options[:invert_edge] || false
   end
 
   # Input : a list of library names.
@@ -40,6 +42,10 @@ class DependenciesGraph
     @dependencies ||= (@lockfile && @lockfile.to_hash["PODS"])
   end
 
+  def dev_pod_sources
+    @dev_pod_sources ||= @lockfile.to_hash["EXTERNAL SOURCES"].select { |_, attributes| attributes.key?(:path) } || {}
+  end
+
   # Convert array of dictionaries -> a dictionary with format {A: [A's dependencies]}
   def pod_to_dependencies
     dependencies
@@ -49,6 +55,8 @@ class DependenciesGraph
 
   def add_vertex(graph, pod)
     node_name = sanitized_pod_name(pod)
+    return if @devpod_only && dev_pod_sources[node_name].nil?
+
     graph.add_vertex(node_name)
     node_name
   end
@@ -57,10 +65,20 @@ class DependenciesGraph
     Pod::Dependency.from_string(name).name
   end
 
+  def reach_max_deps(deps)
+    return unless @max_deps
+    return deps.count > @max_deps unless @devpod_only
+
+    deps = deps.reject { |name| dev_pod_sources[name].nil? }
+    deps.count > @max_deps
+  end
+
   def graph
     @graph ||= begin
       graph = RGL::DirectedAdjacencyGraph.new
       pod_to_dependencies.each do |pod, dependencies|
+        next if reach_max_deps(dependencies)
+
         pod_node = add_vertex(graph, pod)
         next if pod_node.nil?
 

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

@@ -5,7 +5,7 @@ require "digest/md5"
 
 class FolderChecksum
   def self.git_checksum(dir)
-    checksum_of_files(`git ls-files #{dir}`.split("\n"))
+    checksum_of_files(`git ls-files #{File.realdirpath(dir).shellescape}`.split("\n"))
   rescue => e
     Pod::UI.warn "Cannot get checksum of tracked files under #{dir}: #{e}"
     checksum_of_files(Dir["#{dir}/**/*"].reject { |f| File.directory?(f) })

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

@@ -2,6 +2,11 @@ module Pod
   class Installer
     def alter_specs_for_prebuilt_pods
       cache = []
+
+      @original_specs = analysis_result.specifications
+        .map { |spec| [spec.name, Pod::Specification.from_file(spec.defined_in_file)] }
+        .to_h
+
       analysis_result.specifications
         .select { |spec| should_integrate_prebuilt_pod?(spec.root.name) }
         .group_by(&:root)

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

@@ -18,8 +18,18 @@ module Pod
       original_create_pod_installer(name)
     end
 
+    def original_specs_by_platform(name)
+      specs_for_pod(name).map do |platform, specs|
+        specs_ = specs.map { |spec| @original_specs[spec.name] }
+        [platform, specs_]
+      end.to_h
+    end
+
     def create_prebuilt_source_installer(name)
-      source_installer = PodSourceInstaller.new(sandbox, podfile, specs_for_pod(name))
+      # A source installer needs to install with the original spec (instead of the altered spec).
+      # Otherwise, the cache will be corrupted because CocoaPods packs necessary dirs/files from temp dir
+      # to the cache dir based on the spec.
+      source_installer = PodSourceInstaller.new(sandbox, podfile, original_specs_by_platform(name))
       pod_installer = PrebuiltSourceInstaller.new(
         sandbox,
         podfile,

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

@@ -58,6 +58,7 @@ module Pod
         bitcode_enabled: PodPrebuild.config.bitcode_enabled?,
         device_build_enabled: PodPrebuild.config.device_build_enabled?,
         disable_dsym: PodPrebuild.config.disable_dsym?,
+        log_path: PodPrebuild.config.xcodebuild_log_path,
         args: PodPrebuild.config.build_args
       )
       PodPrebuild.remove_build_dir(sandbox_path)

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

@@ -43,6 +43,10 @@ module PodPrebuild
       end
     end
 
+    def preferred_sdk
+      @preferred_sdk ||= sdks.include?(device) ? device : sdks[0]
+    end
+
     def build_types
       @build_types ||= begin
         # TODO (thuyen): Add DSL options `build_for_types` to specify build types
@@ -78,15 +82,16 @@ module PodPrebuild
         configuration: configuration,
         sdk: sdk,
         deployment_target: targets.map { |t| t.platform.deployment_target }.max.to_s,
+        log_path: log_path(sdk),
         args: sdk == simulator ? @build_args[:simulator] : @build_args[:device]
       )
     end
 
     def create_xcframework(target)
-      non_framework_paths = Dir[target_products_dir_of(target, sdks[0]) + "/*"] \
-        - [framework_path_of(target, sdks[0])] \
-        - dsym_paths_of(target, sdks[0]) \
-        - bcsymbolmap_paths_of(target, sdks[0])
+      non_framework_paths = Dir[target_products_dir_of(target, preferred_sdk) + "/*"] \
+        - [framework_path_of(target, preferred_sdk)] \
+        - dsym_paths_of(target, preferred_sdk) \
+        - bcsymbolmap_paths_of(target, preferred_sdk)
       collect_output(target, non_framework_paths)
 
       output = "#{output_path(target)}/#{target.product_module_name}.xcframework"
@@ -248,5 +253,9 @@ module PodPrebuild
     def disable_dsym?
       @options[:disable_dsym]
     end
+
+    def log_path(sdk)
+      @options[:log_path].nil? ? nil : "#{@options[:log_path]}_#{sdk}"
+    end
   end
 end

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

@@ -32,7 +32,13 @@ module PodPrebuild
       end
       cmd += options[:args] if options[:args]
       cmd << "build"
-      cmd << "2>&1"
+
+      if options[:log_path].nil?
+        cmd << "2>&1"
+      else
+        FileUtils.mkdir_p(File.dirname(options[:log_path]))
+        cmd << "> #{options[:log_path].shellescape}"
+      end
       cmd = cmd.join(" ")
 
       Pod::UI.puts_indented "$ #{cmd}" unless PodPrebuild.config.silent_build?

data/lib/command/config.rb

@@ -117,6 +117,10 @@ module PodPrebuild
       @dsl_config[:dont_remove_source_code]
     end
 
+    def xcodebuild_log_path
+      @dsl_config[:xcodebuild_log_path]
+    end
+
     def build_args
       @dsl_config[:build_args]
     end
@@ -178,6 +182,7 @@ module PodPrebuild
         :xcframework,
         :disable_dsym,
         :dont_remove_source_code,
+        :xcodebuild_log_path,
         :build_args,
         :save_cache_validation_to,
         :validate_prebuilt_settings,

data/lib/command/executor/visualizer.rb

@@ -8,11 +8,13 @@ module PodPrebuild
       @lockfile = options[:lockfile]
       @open = options[:open]
       @output_dir = options[:output_dir]
+      @devpod_only = options[:devpod_only]
+      @max_deps = options[:max_deps]
     end
 
     def run
       FileUtils.mkdir_p(@output_dir)
-      graph = DependenciesGraph.new(@lockfile)
+      graph = DependenciesGraph.new(lockfile: @lockfile, devpod_only: @devpod_only, max_deps: @max_deps)
       output_path = "#{@output_dir}/graph.png"
       graph.write_graphic_file(output_path: output_path)
       system("open #{@output_path}") if @open

data/lib/command/visualize.rb

@@ -7,7 +7,9 @@ module Pod
         self.arguments = [CLAide::Argument.new("OUTPUT-DIR", false)]
         def self.options
           [
-            ["--open", "Open the graph upon completion"]
+            ["--open", "Open the graph upon completion"],
+            ["--devpod_only", "Only include development pod"],
+            ["--max_deps", "Only include pod with number of dependencies <= max_deps"]
           ]
         end
 
@@ -17,7 +19,9 @@ module Pod
             config: prebuild_config,
             lockfile: config.lockfile,
             output_dir: argv.shift_argument || ".",
-            open: argv.flag?("open")
+            open: argv.flag?("open"),
+            devpod_only: argv.flag?("devpod_only"),
+            max_deps: argv.option("max_deps")
           )
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Reduce build time by building pod frameworks and cache to remote storage,