cocoapods-binary-cache 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e068bdcb9e91a8e599e3ad1732837a1a7dbd49a4409e05b97b1cdc476bfb76a7
-  data.tar.gz: 21d3e3fa0374a8818efa927bb822ce9386e43e18ec26a1ab5be7d8b481a688d6
+  metadata.gz: 116f1017bbeca303037ea4873ed6f6ec0b6ae8e9d976958f5f2b95109c50b252
+  data.tar.gz: 0dd220d2c51ddaa367cf7cca6b68f23f4c898fbbeddc53d025ab39ab67b2a9d6
 SHA512:
-  metadata.gz: f5588698b1d818071b2bfb568bcbd44bc1e02084f7caf0b4b554a50277f2064209ec527339de4c8166ab74ff358b0a173f149b5db67f33a808c8d562f8d02625
-  data.tar.gz: dd21d19ff94f2a8dcf3b4b1dd7372484993e0aba4705512fde75be14e66d72ddadc592fc88b9ea81ae3983f156e5fe251e4dbcfe8047f7904db1b0fd3cf0cbcf
+  metadata.gz: 1120f16b6bba0bb97db8d61d0799aebc3a395e94d6c1a0a273fe0c2d3ba9b3ffa3bd3c573ef36c7697457fc10d3546d1c92a130c8b8a4cd64b66004f3a798b50
+  data.tar.gz: 0efa97b49bdc34edf8ce4ebf8762b90114a2443bce9873fbb64482d0d6ab2a6e85d68c2d48904bd391d9d2d52566850abba4b7f7d6bf1f852c41e9fb3d389054

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

@@ -7,6 +7,10 @@ module PodPrebuild
       @hit = hit.to_set - missed_with_reasons.keys
     end
 
+    def all
+      (hit + missed).to_set
+    end
+
     def missed
       @missed_with_reasons.keys.to_set
     end

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

@@ -1,56 +1,50 @@
 # 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 'rgl/adjacency'
-require 'rgl/dot'
-require_relative 'graph_visualizer'
+require "rgl/adjacency"
+require "rgl/dot"
+require_relative "graph_visualizer"
 
-# Using RGL graph because GraphViz doesn't store adjacent of a node/vertex but we need to traverse a substree from any node
+# Using RGL graph because GraphViz doesn't store adjacent of a node/vertex
+# but we need to traverse a substree from any node
 # https://github.com/monora/rgl/blob/master/lib/rgl/adjacency.rb
 
 class DependenciesGraph
   def initialize(lockfile)
     @lockfile = lockfile
-    @invert_edge = true # A normal edge is an edge (one direction) from library A to library B which is a dependency of A.
+    # A normal edge is an edge (one direction) from library A to library B which is a dependency of A.
+    @invert_edge = true
   end
 
   # Input : a list of library names.
   # Output: a set of library names which are clients (directly and indirectly) of those input libraries.
   def get_clients(libnames)
-    result = Set.new()
+    result = Set.new
     libnames.each do |lib|
       if graph.has_vertex?(lib)
         result.merge(traverse_sub_tree(graph, lib))
       else
-        puts "Warning: cannot find lib: #{lib}"
+        Pod::UI.puts "Warning: cannot find lib: #{lib}"
       end
     end
     result
   end
 
-  def write_graphic_file(output_graphic_fmt, filename='graph', highlight_nodes=Set[])
-    if !output_graphic_fmt
-      puts 'Error: Need graphic format.'
-      return
-    end
-    graph.write_to_graphic_file(output_graphic_fmt, dotfile=filename, options={}, highlight_nodes)
+  def write_graphic_file(options)
+    graph.write_to_graphic_file(options)
   end
 
   private
 
   def dependencies
-    @dependencies ||= begin
-      if @lockfile
-        @lockfile.to_hash['PODS']
-      else
-        nil
-      end
-    end
+    @dependencies ||= (@lockfile && @lockfile.to_hash["PODS"])
   end
 
   # Convert array of dictionaries -> a dictionary with format {A: [A's dependencies]}
   def pod_to_dependencies
-    dependencies.map { |d| d.is_a?(Hash) ? d : { d => [] } }.reduce({}) { |combined, individual| combined.merge!(individual) }
+    dependencies
+      .map { |d| d.is_a?(Hash) ? d : { d => [] } }
+      .reduce({}) { |combined, individual| combined.merge!(individual) }
   end
 
   def add_vertex(graph, pod)
@@ -65,14 +59,15 @@ class DependenciesGraph
 
   def graph
     @graph ||= begin
-      graph = RGL::DirectedAdjacencyGraph.new()
-
+      graph = RGL::DirectedAdjacencyGraph.new
       pod_to_dependencies.each do |pod, dependencies|
         pod_node = add_vertex(graph, pod)
         next if pod_node.nil?
+
         dependencies.each do |dependency|
           dep_node = add_vertex(graph, dependency)
           next if dep_node.nil?
+
           if @invert_edge
             graph.add_edge(dep_node, pod_node)
           else
@@ -85,11 +80,11 @@ class DependenciesGraph
   end
 
   def traverse_sub_tree(graph, vertex)
-    visited_nodes = Set.new()
+    visited_nodes = Set.new
     graph.each_adjacent(vertex) do |v|
       visited_nodes.add(v)
       visited_nodes.merge(traverse_sub_tree(graph, v))
     end
     visited_nodes
   end
-end
+end

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

@@ -2,73 +2,64 @@
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 # https://github.com/monora/rgl/blob/0b526e16f9fb344abf387f4c5523d7917ce8f4b1/lib/rgl/dot.rb
 
-require 'rgl/rdot'
+require "rgl/rdot"
 
 module RGL
   module Graph
-    def to_dot_graph(params={}, highlight_nodes)
-      params['name'] ||= self.class.name.gsub(/:/, '_')
-      fontsize       = params['fontsize'] ? params['fontsize'] : '12'
-      graph          = (directed? ? DOT::Digraph : DOT::Graph).new(params)
-      edge_class     = directed? ? DOT::DirectedEdge : DOT::Edge
-      vertex_options = params['vertex'] || {}
-      edge_options   = params['edge'] || {}
+    def to_dot_graph(options)
+      highlight_nodes = options[:highlight_nodes] || Set.new
+      options["name"] ||= self.class.name.gsub(/:/, "_")
+      fontsize = options["fontsize"] || "12"
+      graph = (directed? ? DOT::Digraph : DOT::Graph).new(options)
+      edge_class = directed? ? DOT::DirectedEdge : DOT::Edge
+      vertex_options = options["vertex"] || {}
+      edge_options = options["edge"] || {}
 
       each_vertex do |v|
-        default_vertex_options =  {
-          'name'     => vertex_id(v),
-          'fontsize' => fontsize,
-          'label'    => vertex_label(v),
-          'style'    => 'filled',
+        default_vertex_options = {
+          "name" => vertex_id(v),
+          "fontsize" => fontsize,
+          "label" => vertex_label(v),
+          "style" => "filled"
         }
-        if highlight_nodes.include?(v)
-          default_vertex_options = default_vertex_options.merge({
-            'color' => 'red',
-            'fillcolor' => 'red'
-          })
-        else
-          default_vertex_options = default_vertex_options.merge({
-            'color' => 'blue',
-            'fillcolor' => 'blue'
-          })
-        end
-
+        default_vertex_options.merge!("color" => "red", "fillcolor" => "red") if highlight_nodes.include?(v)
         each_vertex_options = default_vertex_options.merge(vertex_options)
-        vertex_options.each{|option, val| each_vertex_options[option] = val.call(v) if val.is_a?(Proc)}
+        vertex_options.each { |option, val| each_vertex_options[option] = val.call(v) if val.is_a?(Proc) }
         graph << DOT::Node.new(each_vertex_options)
       end
 
       each_edge do |u, v|
         default_edge_options = {
-          'from'     => vertex_id(u),
-          'to'       => vertex_id(v),
-          'fontsize' => fontsize
+          "from" => vertex_id(u),
+          "to" => vertex_id(v),
+          "fontsize" => fontsize
         }
         each_edge_options = default_edge_options.merge(edge_options)
-        edge_options.each{|option, val| each_edge_options[option] = val.call(u, v) if val.is_a?(Proc)}
+        edge_options.each { |option, val| each_edge_options[option] = val.call(u, v) if val.is_a?(Proc) }
         graph << edge_class.new(each_edge_options)
       end
 
       graph
     end
 
-    def write_to_graphic_file(fmt='png', dotfile="graph", options={}, highlight_nodes)
-      src = dotfile + ".dot"
-      dot = dotfile + "." + fmt
+    def write_to_graphic_file(options)
+      output_path = Pathname.new(options[:output_path])
+      fmt = output_path.extname.delete_prefix(".")
+      dotfile = output_path.sub_ext(".dot")
 
-      File.open(src, 'w') do |f|
-        f << self.to_dot_graph(params=options, highlight_nodes=highlight_nodes).to_s << "\n"
+      File.open(dotfile, "w") do |f|
+        f << to_dot_graph(options).to_s
       end
 
-      unless system("dot -T#{fmt} #{src} -o #{dot}")
-        message = <<-HEREDOC # Use <<- to indent End of String terminator
+      unless system("dot -T#{fmt} #{dotfile} -o #{output_path}")
+        message = <<~HEREDOC
           Error executing dot. Did you install GraphViz?
           Try installing it via Homebrew: `brew install graphviz`.
           Visit https://graphviz.org/download/ for more installation instructions.
         HEREDOC
         raise message
       end
-      dot
+      output_path
     end
   end
 end

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

@@ -10,7 +10,15 @@ module PodPrebuild
     end
 
     def run
-      @diagnosers.each(&:run)
+      diagnosis = @diagnosers.map(&:run)
+      errors = diagnosis.select { |d| d[0] == :error }.map { |d| d[1] }
+      warnings = diagnosis.select { |d| d[0] == :error }.map { |d| d[1] }
+
+      warnings.each { |d| Pod::UI.puts "⚠️  #{d[1]}" }
+      errors.each { |d| Pod::UI.puts "🚩  #{d[1]}" }
+      return if errors.empty? || !PodPrebuild.config.strict_diagnosis?
+
+      raise "There are #{errors.count} error(s) spotted after the diagnosis"
     end
   end
 end

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

@@ -15,7 +15,9 @@ module PodPrebuild
           PodPrebuild.config.prebuilt_path(path: "#{module_name}.framework")
         framework_path.exist?
       end
-      Pod::UI.puts "🚩 Unintegrated frameworks: #{unintegrated}".yellow unless unintegrated.empty?
+      return [] if unintegrated.empty?
+
+      [[:error, "Unintegrated frameworks: #{unintegrated}"]]
     end
   end
 end

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

@@ -1,8 +1,10 @@
 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?
+      unless subspecs.empty?
+        # return early if there are some files in subpec(s) but process the spec itself
+        return false unless subspecs.all?(&:empty_source_files?)
+      end
 
       check = lambda do |patterns|
         patterns = [patterns] if patterns.is_a?(String)

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

@@ -5,29 +5,19 @@ 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
+      Pod::UI.title("Diagnosing cocoapods-binary-cache") do
         PodPrebuild::Diagnosis.new(
-          cache_validation: PodPrebuild::StateStore.cache_validation,
+          cache_validation: PodPrebuild.state.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 PodPrebuild.config.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)
-    end
   end
 end

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

@@ -2,32 +2,30 @@ module PodPrebuild
   class PreInstallHook
     include ObjectSpace
 
-    attr_reader :installer_context, :podfile, :prebuild_sandbox, :cache_validation
+    attr_reader :installer_context, :podfile, :prebuild_sandbox, :standard_sandbox, :cache_validation
 
     def initialize(installer_context)
       @installer_context = installer_context
       @podfile = installer_context.podfile
       @pod_install_options = {}
       @prebuild_sandbox = nil
+      @standard_sandbox = installer_context.sandbox
       @cache_validation = nil
     end
 
     def run
       return if @installer_context.sandbox.is_a?(Pod::PrebuildSandbox)
 
-      require_relative "../pod-binary/helper/feature_switches"
-
       log_section "🚀  Prebuild frameworks"
       ensure_valid_podfile
       save_installation_states
-      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 }
+      Pod::UI.title("Detect implicit dependencies") { detect_implicit_dependencies }
+      Pod::UI.title("Validate prebuilt cache") { validate_cache }
       prebuild! if PodPrebuild.config.prebuild_job?
-      Pod::UI.section("Reset environment") { reset_environment }
 
       PodPrebuild::Env.next_stage!
+      prepare_for_integration
       log_section "🤖  Resume pod installation"
       require_relative "../pod-binary/integration"
     end
@@ -36,7 +34,6 @@ module PodPrebuild
 
     def save_installation_states
       save_pod_install_options
-      save_states_from_dsl
     end
 
     def save_pod_install_options
@@ -55,28 +52,7 @@ module PodPrebuild
       end
     end
 
-    def prepare_environment
-      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::Installer.force_disable_integration 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.
-    end
-
-    def save_states_from_dsl
-      # Note: DSL is reloaded when creating an installer (Pod::Installer.new).
-      # Any mutation to DSL is highly discouraged
-      # --> Rather, perform mutation on PodPrebuild::StateStore instead
-      PodPrebuild::StateStore.excluded_pods += PodPrebuild.config.excluded_pods
-    end
-
     def create_prebuild_sandbox
-      standard_sandbox = installer_context.sandbox
       @prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
       Pod::UI.message "Create prebuild sandbox at #{@prebuild_sandbox.root}"
     end
@@ -88,11 +64,9 @@ module PodPrebuild
         .group_by { |spec| spec.name.split("/")[0] }
         .select { |_, specs| specs.all?(&:empty_source_files?) }
         .keys
-
-      PodPrebuild::StateStore.excluded_pods += pods_with_empty_source_files
+      PodPrebuild.config.update_detected_excluded_pods!(pods_with_empty_source_files)
+      PodPrebuild.config.update_detected_prebuilt_pod_names!(@original_installer.prebuilt_pod_names)
       Pod::UI.puts "Exclude pods with empty source files: #{pods_with_empty_source_files.to_a}"
-
-      # TODO (thuyen): Detect dependencies of a prebuilt pod and treat them as prebuilt pods as well
     end
 
     def validate_cache
@@ -104,13 +78,13 @@ module PodPrebuild
         validate_prebuilt_settings: PodPrebuild.config.validate_prebuilt_settings,
         generated_framework_path: prebuild_sandbox.generate_framework_path,
         sandbox_root: prebuild_sandbox.root,
-        ignored_pods: PodPrebuild::StateStore.excluded_pods,
-        prebuilt_pod_names: @original_installer.prebuilt_pod_names
+        ignored_pods: PodPrebuild.config.excluded_pods,
+        prebuilt_pod_names: PodPrebuild.config.prebuilt_pod_names
       ).validate
       path_to_save_cache_validation = PodPrebuild.config.save_cache_validation_to
       @cache_validation.update_to(path_to_save_cache_validation) unless path_to_save_cache_validation.nil?
       cache_validation.print_summary
-      PodPrebuild::StateStore.cache_validation = cache_validation
+      PodPrebuild.state.update(:cache_validation => cache_validation)
     end
 
     def prebuild!
@@ -129,6 +103,15 @@ module PodPrebuild
       end
     end
 
+    def prepare_for_integration
+      # Remove local podspec of external sources so that it downloads sources correctly.
+      # Otherwise, with incremental pod installation, CocoaPods downloads the sources
+      # based on the `s.source` declaration in the podspecs which are sometimes incorrect.
+      PodPrebuild.config.prebuilt_pod_names.each do |name|
+        @standard_sandbox.remove_local_podspec(name) if @standard_sandbox.checkout_sources.key?(name)
+      end
+    end
+
     def log_section(message)
       Pod::UI.puts "-----------------------------------------"
       Pod::UI.puts message

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

@@ -18,5 +18,4 @@ require_relative "pod-binary/prebuild_hook"
 require_relative "pod-binary/prebuild"
 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/build.rb

@@ -1,39 +1,37 @@
 require_relative "../../pod-rome/xcodebuild_raw"
 require_relative "../../pod-rome/xcodebuild_command"
 
-module Pod
-  class Prebuild
-    def self.build(options)
-      target = options[:target]
-      return if target.nil?
+module PodPrebuild
+  def self.build(options)
+    targets = options[:targets] || []
+    return if targets.empty?
 
-      options[:sandbox] = Pod::Sandbox.new(Pathname(options[:sandbox])) unless options[:sandbox].is_a?(Pod::Sandbox)
-      options[:build_dir] = build_dir(options[:sandbox].root)
+    options[:sandbox] = Pod::Sandbox.new(Pathname(options[:sandbox])) unless options[:sandbox].is_a?(Pod::Sandbox)
+    options[:build_dir] = build_dir(options[:sandbox].root)
 
-      case target.platform.name
-      when :ios, :tvos, :watchos
-        XcodebuildCommand.new(options).run
-      when :osx
-        xcodebuild(
-          sandbox: options[:sandbox],
-          target: target.label,
-          configuration: options[:configuration],
-          sdk: "macosx",
-          args: options[:args]
-        )
-      else
-        raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'"
-      end
-      raise "The build directory was not found in the expected location" unless options[:build_dir].directory?
+    case targets[0].platform.name
+    when :ios, :tvos, :watchos
+      PodPrebuild::XcodebuildCommand.new(options).run
+    when :osx
+      xcodebuild(
+        sandbox: options[:sandbox],
+        targets: targets,
+        configuration: options[:configuration],
+        sdk: "macosx",
+        args: options[:args]
+      )
+    else
+      raise "Unsupported platform for '#{targets[0].name}': '#{targets[0].platform.name}'"
     end
+    raise "The build directory was not found in the expected location" unless options[:build_dir].directory?
+  end
 
-    def self.remove_build_dir(sandbox_root)
-      path = build_dir(sandbox_root)
-      path.rmtree if path.exist?
-    end
+  def self.remove_build_dir(sandbox_root)
+    path = build_dir(sandbox_root)
+    path.rmtree if path.exist?
+  end
 
-    def self.build_dir(sandbox_root)
-      sandbox_root.parent + "build"
-    end
+  def self.build_dir(sandbox_root)
+    sandbox_root.parent + "build"
   end
 end