cocoapods-binary-cache 0.1.7 → 0.1.8

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

@@ -1,16 +1,15 @@
 module Pod
   class Prebuild
-
     # Check the targets, for the current limitation of the plugin
     #
     # @param [Array<PodTarget>] prebuilt_targets
     def self.check_one_pod_should_have_only_one_target(prebuilt_targets)
-      targets_have_different_platforms = prebuilt_targets.select { |t| t.pod_name != t.name }
+      targets_have_different_platforms = prebuilt_targets.reject { |t| t.pod_name == t.name }
+      return unless targets_have_different_platforms.empty?
 
-      if targets_have_different_platforms.count > 0
-        names = targets_have_different_platforms.map(&:pod_name)
-        raw_names = targets_have_different_platforms.map(&:name)
-        message = "Oops, you came across a limitation of cocoapods-binary.
+      names = targets_have_different_platforms.map(&:pod_name)
+      raw_names = targets_have_different_platforms.map(&:name)
+      message = "Oops, you came across a limitation of cocoapods-binary.
 
 The plugin requires that one pod should have ONLY ONE target in the 'Pod.xcodeproj'. There are mainly 2 situations \
 causing this problem:
@@ -36,10 +35,8 @@ causing this problem:
     end
     ```
 
-Related pods: #{names}, target names: #{raw_names}
-        "
-        raise Informative, message
-      end
+Related pods: #{names}, target names: #{raw_names}"
+      raise Informative, message
     end
   end
 end

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

@@ -1,11 +1,10 @@
 require_relative "helper/podfile_options"
 require_relative "helper/prebuild_sandbox"
-require_relative "helper/passer"
 require_relative "helper/names"
 require_relative "helper/target_checker"
 require_relative "integration/alter_specs"
-require_relative "integration/remove_target_files"
 require_relative "integration/validation"
 require_relative "integration/patch/embed_framework_script"
+require_relative "integration/patch/sandbox_analyzer_state"
 require_relative "integration/patch/resolve_dependencies"
 require_relative "integration/patch/source_installation"

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

@@ -9,7 +9,7 @@ module Pod
     class EmbedFrameworksScript
       old_method = instance_method(:script)
       define_method(:script) do
-        script = old_method.bind(self).()
+        script = old_method.bind(self).call
         patch = <<-SH.strip_heredoc
           #!/bin/sh
           # ---- this is added by cocoapods-binary ---

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

@@ -7,9 +7,6 @@ module Pod
     # Modify specification to use only the prebuild framework after analyzing
     original_resolve_dependencies = instance_method(:resolve_dependencies)
     define_method(:resolve_dependencies) do
-      # Remove the old target files. Otherwise, it will not notice file changes.
-      # This call is to make sure subsequent pod installations function properly
-      remove_target_files_if_needed
       original_resolve_dependencies.bind(self).call
 
       # check the pods

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

@@ -0,0 +1,29 @@
+module Pod
+  class Installer
+    class Analyzer
+      class SandboxAnalyzer
+        original_analyze = instance_method(:analyze)
+        define_method(:analyze) do
+          state = original_analyze.bind(self).call
+          state = alter_state(state)
+          state
+        end
+
+        private
+
+        def alter_state(state)
+          return state if PodPrebuild.config.tracked_prebuilt_pod_names.empty?
+
+          prebuilt = PodPrebuild.config.tracked_prebuilt_pod_names
+          Pod::UI.message "Alter sandbox state: treat prebuilt frameworks as added: #{prebuilt.to_a}"
+          SpecsState.new(
+            :added => (state.added + prebuilt).uniq,
+            :changed => state.changed - prebuilt,
+            :removed => state.deleted - prebuilt,
+            :unchanged => state.unchanged - prebuilt
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -21,9 +21,9 @@ module Pod
         # In a prebuild job, at the integration stage, all prebuilt frameworks should be
         # ready for integration regardless of whether there was any cache miss or not.
         # Those that are missed were prebuilt in the prebuild stage.
-        PodPrebuild::StateStore.cache_validation.include?(name)
+        PodPrebuild.state.cache_validation.include?(name)
       else
-        prebuilt = PodPrebuild::StateStore.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
+        prebuilt = PodPrebuild.state.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
         prebuilt.include?(name)
       end
     end

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

@@ -1,12 +1,12 @@
 require "fileutils"
 require_relative "../prebuild_output/output"
 require_relative "../helper/lockfile"
-require_relative "helper/passer"
+require_relative "../helper/prebuild_order"
 require_relative "helper/target_checker"
 require_relative "helper/build"
 
 module Pod
-  class PrebuildInstaller < Installer
+  class PrebuildInstaller < Installer # rubocop:disable Metrics/ClassLength
     attr_reader :lockfile_wrapper
 
     def initialize(options)
@@ -15,38 +15,6 @@ module Pod
       @lockfile_wrapper = lockfile && PodPrebuild::Lockfile.new(lockfile)
     end
 
-    private
-
-    def local_manifest
-      @local_manifest ||= sandbox.manifest
-    end
-
-    # @return [Analyzer::SpecsState]
-    def prebuild_pods_changes
-      return nil if local_manifest.nil?
-
-      if @prebuild_pods_changes.nil?
-        changes = local_manifest.detect_changes_with_podfile(podfile)
-        @prebuild_pods_changes = Analyzer::SpecsState.new(changes)
-        # save the chagnes info for later stage
-        Pod::Prebuild::Passer.prebuild_pods_changes = @prebuild_pods_changes
-      end
-      @prebuild_pods_changes
-    end
-
-    def blacklisted?(name)
-      PodPrebuild::StateStore.excluded_pods.include?(name)
-    end
-
-    def cache_missed?(name)
-      @cache_validation.missed?(name)
-    end
-
-    def should_not_prebuild_vendor_pod(name)
-      return true if blacklisted?(name)
-      return false if PodPrebuild.config.prebuild_all_pods?
-    end
-
     def run_code_gen!(targets)
       return if PodPrebuild.config.prebuild_code_gen.nil?
 
@@ -55,65 +23,23 @@ module Pod
       end
     end
 
-    def targets_to_prebuild
-      existed_framework_folder = sandbox.generate_framework_path
-      targets = pod_targets
-
-      targets_from_cli = PodPrebuild.config.targets_to_prebuild_from_cli
-      if !targets_from_cli.empty?
-        targets = targets.select { |target| targets_from_cli.include?(target.name) }
-      elsif !PodPrebuild.config.prebuild_all_pods? && !local_manifest.nil?
-        changes = prebuild_pods_changes
-        added = changes.added
-        changed = changes.changed
-        unchanged = changes.unchanged
-
-        existed_framework_folder.mkdir unless existed_framework_folder.exist?
-        exsited_framework_pod_names = sandbox.exsited_framework_pod_names
-
-        # additions
-        missing = unchanged.reject { |pod_name| exsited_framework_pod_names.include?(pod_name) }
-
-        root_names_to_update = (added + changed + missing)
-        root_names_to_update += PodPrebuild::StateStore.cache_validation.missed
-
-        # transform names to targets
-        cache = []
-        targets = root_names_to_update.map do |pod_name|
-          tars = Pod.fast_get_targets_for_pod_name(pod_name, pod_targets, cache) || []
-          raise "There's no target named (#{pod_name}) in Pod.xcodeproj" if tars.empty?
-
-          tars
-        end.flatten
-
-        # add the dendencies
-        dependency_targets = targets.map(&:recursive_dependent_targets).flatten.uniq || []
-        targets = (targets + dependency_targets).uniq
-      end
-
-      unless PodPrebuild.config.prebuild_all_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) }
-      unless PodPrebuild.config.dev_pods_enabled?
-        targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) }
-      end
-      targets
-    end
-
-    public
-
     def prebuild_output
       @prebuild_output ||= PodPrebuild::Output.new(sandbox)
     end
 
-    # Build the needed framework files
+    def targets_to_prebuild
+      to_build = PodPrebuild.config.targets_to_prebuild_from_cli
+      if to_build.empty?
+        to_build = PodPrebuild.config.prebuild_all_pods? ? @cache_validation.all : @cache_validation.missed
+      end
+      pod_targets.select { |target| to_build.include?(target.name) }
+    end
+
     def prebuild_frameworks!
-      UI.puts "Start prebuild_frameworks"
       existed_framework_folder = sandbox.generate_framework_path
       sandbox_path = sandbox.root
-      targets = targets_to_prebuild
 
+      targets = PodPrebuild::BuildOrder.order_targets(targets_to_prebuild)
       Pod::UI.puts "Prebuild frameworks (total #{targets.count}): #{targets.map(&:name)}"
       Pod::Prebuild.remove_build_dir(sandbox_path)
       run_code_gen!(targets)
@@ -142,7 +68,6 @@ module Pod
         # If target shouldn't build, we copy all the original files
         # This is for target with only .a and .h files
         unless target.should_build?
-          Prebuild::Passer.target_names_to_skip_integration_framework << target.name
           FileUtils.cp_r(root_path, target_folder, :remove_destination => true)
           next
         end
@@ -173,7 +98,7 @@ module Pod
         all_needed_names.include? name
       end
       useless_target_names.each do |name|
-        UI.puts "Remove: #{name}"
+        Pod::UI.message "Remove: #{name}"
         path = sandbox.framework_folder_path_for_target_name(name)
         path.rmtree if path.exist?
       end
@@ -189,12 +114,10 @@ module Pod
         to_delete_files.each { |file| file.rmtree if file.exist? }
       end
 
-      updated_target_names = targets.map { |target| target.label.to_s }
-      deleted_target_names = useless_target_names
-      Pod::UI.puts "Targets to prebuild: #{updated_target_names}"
-      Pod::UI.puts "Targets to cleanup: #{deleted_target_names}"
-
-      prebuild_output.write_delta_file(updated_target_names, deleted_target_names)
+      prebuild_output.write_delta_file(
+        updated: targets.map { |target| target.label.to_s },
+        deleted: useless_target_names
+      )
     end
 
     def clean_delta_file

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

@@ -1,5 +1,3 @@
-require_relative "tool/tool"
-
 module Pod
   class Podfile
     module DSL

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

@@ -1,4 +1,3 @@
-require_relative "helper/passer"
 require_relative "helper/podfile_options"
 require_relative "helper/prebuild_sandbox"
 

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

@@ -1,6 +1,6 @@
 require_relative "xcodebuild_raw"
 
-class XcodebuildCommand
+class XcodebuildCommand # rubocop:disable Metrics/ClassLength
   def initialize(options)
     @options = options
     case options[:target].platform.name
@@ -18,19 +18,33 @@ class XcodebuildCommand
   end
 
   def run
-    build_for_sdk(simulator)
-    if device_build_enabled?
-      build_for_sdk(device)
+    build_for_sdk(simulator) if build_types.include?(:simulator)
+    build_for_sdk(device) if build_types.include?(:device)
+
+    case build_types
+    when [:simulator]
+      collect_output(Dir[target_products_dir_of(simulator) + "/*"])
+    when [:device]
+      collect_output(Dir[target_products_dir_of(device) + "/*"])
+    else
+      # When merging contents of `simulator` & `device`, prefer contents of `device` over `simulator`
+      # https://github.com/grab/cocoapods-binary-cache/issues/25
+      collect_output(Dir[target_products_dir_of(device) + "/*"])
       create_universal_framework
-      merge_dsym unless disable_dsym?
-      merge_swift_headers
-      merge_swift_modules
     end
-    collect_output(Dir[target_products_dir_of(simulator) + "/*"])
   end
 
   private
 
+  def build_types
+    @build_types ||= begin
+      # TODO (thuyen): Add DSL options `build_for_types` to specify build types
+      types = [:simulator]
+      types << :device if device_build_enabled?
+      types
+    end
+  end
+
   def make_up_build_args(args)
     args_ = args.clone
     args_[:default] ||= []
@@ -47,7 +61,7 @@ class XcodebuildCommand
   def build_for_sdk(sdk)
     framework_path = framework_path_of(sdk)
     if Dir.exist?(framework_path)
-      Pod::UI.puts "Framework already exists at: #{framework_path}"
+      Pod::UI.puts_indented "--> Framework already exists at: #{framework_path}"
       return
     end
 
@@ -63,62 +77,64 @@ class XcodebuildCommand
   end
 
   def create_universal_framework
-    create_fat_binary(
-      simulator: "#{framework_path_of(simulator)}/#{module_name}",
-      device: "#{framework_path_of(device)}/#{module_name}"
-    )
+    merge_framework_binary
+    merge_framework_dsym
+    merge_swift_headers
+    merge_swift_modules
   end
 
-  def merge_dsym
-    simulator_dsym = framework_path_of(simulator) + ".dSYM"
-    device_dsym = framework_path_of(device) + ".dSYM"
-    return unless File.exist?(simulator_dsym) && File.exist?(device_dsym)
-
-    create_fat_binary(
-      simulator: "#{simulator_dsym}/Contents/Resources/DWARF/#{module_name}",
-      device: "#{device_dsym}/Contents/Resources/DWARF/#{module_name}"
-    )
-    collect_output(simulator_dsym)
+  def merge_framework_binary
+    merge_contents("/#{module_name}", &method(:create_fat_binary))
   end
 
-  def create_fat_binary(options)
-    cmd = ["lipo", " -create"]
-    cmd << "-output" << options[:simulator]
-    cmd << options[:simulator] << options[:device]
-    Pod::UI.puts `#{cmd.join(" ")}`
+  def merge_framework_dsym
+    merge_contents(".dSYM/Contents/Resources/DWARF/#{module_name}", &method(:create_fat_binary))
   end
 
   def merge_swift_headers
-    simulator_header_path = framework_path_of(simulator) + "/Headers/#{module_name}-Swift.h"
-    device_header_path = framework_path_of(device) + "/Headers/#{module_name}-Swift.h"
-    return unless File.exist?(simulator_header_path) && File.exist?(device_header_path)
-
-    merged_header = <<~HEREDOC
-      #if TARGET_OS_SIMULATOR // merged by cocoapods-binary
-      #{File.read(simulator_header_path)}
-      #else // merged by cocoapods-binary
-      #{File.read(device_header_path)}
-      #endif // merged by cocoapods-binary
-    HEREDOC
-    File.write(simulator_header_path, merged_header.strip)
+    merge_contents("/Headers/#{module_name}-Swift.h") do |options|
+      merged_header = <<~HEREDOC
+        #if TARGET_OS_SIMULATOR // merged by cocoapods-binary
+        #{File.read(options[:simulator])}
+        #else // merged by cocoapods-binary
+        #{File.read(options[:device])}
+        #endif // merged by cocoapods-binary
+      HEREDOC
+      File.write(options[:output], merged_header.strip)
+    end
   end
 
   def merge_swift_modules
-    simulator_swift_module_path = framework_path_of(simulator) + "/Modules/#{module_name}.swiftmodule"
-    device_swift_module_path = framework_path_of(device) + "/Modules/#{module_name}.swiftmodule"
-    return unless File.exist?(simulator_swift_module_path) && File.exist?(device_swift_module_path)
+    merge_contents("/Modules/#{module_name}.swiftmodule") do |options|
+      # Note: swiftmodules of `device` were copied beforehand,
+      # here, we only need to copy swiftmodules of `simulator`
+      FileUtils.cp_r(options[:simulator] + "/.", options[:output])
+    end
+  end
 
-    FileUtils.cp_r(
-      device_swift_module_path + "/.",
-      simulator_swift_module_path
-    )
+  def merge_contents(path_suffix, &merger)
+    simulator_, device_, output_ = [
+      framework_path_of(simulator),
+      framework_path_of(device),
+      "#{output_path}/#{module_name}.framework"
+    ].map { |p| p + path_suffix }
+    return unless File.exist?(simulator_) && File.exist?(device_)
+
+    merger.call(simulator: simulator_, device: device_, output: output_)
+  end
+
+  def create_fat_binary(options)
+    cmd = ["lipo", " -create"]
+    cmd << "-output" << options[:output]
+    cmd << options[:simulator] << options[:device]
+    Pod::UI.puts `#{cmd.join(" ")}`
   end
 
   def collect_output(paths)
     paths = [paths] unless paths.is_a?(Array)
     paths.each do |path|
       FileUtils.rm_rf(File.join(output_path, File.basename(path)))
-      FileUtils.mv(path, output_path)
+      FileUtils.cp_r(path, output_path)
     end
   end
 

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

@@ -20,10 +20,10 @@ def xcodebuild(options)
   cmd << "2>&1"
   cmd = cmd.join(" ")
 
-  puts "xcodebuild command: #{cmd}"
+  Pod::UI.puts_indented "$ #{cmd}"
   log = `#{cmd}`
 
-  succeeded = $?.exitstatus.zero?
+  succeeded = $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
   unless succeeded
     begin
       raise "Unexpected error" unless log.include?("** BUILD FAILED **")
@@ -36,7 +36,7 @@ def xcodebuild(options)
         printer.pretty_print(line)
       end
     rescue
-      puts log.red
+      Pod::UI.puts log.red
     end
   end
   [succeeded, log]