cocoapods-binary-cache 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7896d5bccb5c1b995271da31a02a9374ff4abc833e081bff2b38fe2401dfa2da
-  data.tar.gz: ca520b237ddf0377a1e1ca03f90e5f4afa79f576241662ae22c3a9fc86e158c5
+  metadata.gz: afe99f8a6986c687fb8033d369ffd7db7ac4543782070d386de8ca20d7e303f5
+  data.tar.gz: 8424f90961d5bd08d827ce427f576869b059172b1a07a89e9ff85b012299f0d7
 SHA512:
-  metadata.gz: 3a7a9a3decaa6a14b80c80b77e69576a9b77ccbb3b4a5760c23c6e02b7ebc809a1e326ccf19030d6a1e091cdaa21a2a0d14c141d87457e7fdba7742c04adcf37
-  data.tar.gz: 4b6c9a841f4b98d41b1ad1ed36aaab65e7c7b59cd4ee30b1b13b0f695b264a0ef1222007adf305cab0be216d175f41d471a61368f641653592a31b5e23ecff1f
+  metadata.gz: '09b307361741d28ea6d3343061e9baff47d9eb477ce6c31771b2d0ac3893389e34f48b9cd8b41a9337e22225bf6accbbf402445549d07d733575e19602a33b34'
+  data.tar.gz: d8c33dd9aac8606cb853d6dd3d4cf20cabec06f17974ae7248ff632bb6e34e43a5e3be98357bc975ef9229a9418cfdc463d5b8093e829babde8ab642c157249b

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

@@ -5,7 +5,7 @@ module PodPrebuild
         PodPrebuild::PodfileChangesCacheValidator.new(options),
         PodPrebuild::NonDevPodsCacheValidator.new(options)
       ]
-      @validators << PodPrebuild::DevPodsCacheValidator.new(options) if Pod::Podfile::DSL.dev_pods_enabled
+      @validators << PodPrebuild::DevPodsCacheValidator.new(options) if Pod::Podfile::DSL.dev_pods_enabled?
       @validators << PodPrebuild::DependenciesGraphCacheValidator.new(options)
       @validators << PodPrebuild::ExclusionCacheValidator.new(options)
     end

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

@@ -1,11 +1,16 @@
 module PodPrebuild
   class DependenciesGraphCacheValidator < AccumulatedCacheValidator
+    def initialize(options)
+      super(options)
+      @ignored_pods = options[:ignored_pods] || Set.new
+    end
+
     def validate(accumulated)
       return accumulated if library_evolution_supported? || @pod_lockfile.nil?
 
       dependencies_graph = DependenciesGraph.new(@pod_lockfile.lockfile)
-      clients = dependencies_graph.get_clients(accumulated.missed.to_a)
-      unless Pod::Podfile::DSL.dev_pods_enabled
+      clients = dependencies_graph.get_clients(accumulated.discard(@ignored_pods).missed.to_a)
+      unless Pod::Podfile::DSL.dev_pods_enabled?
         clients = clients.reject { |client| @pod_lockfile.dev_pods.keys.include?(client) }
       end
 

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

@@ -4,9 +4,15 @@
 require "digest/md5"
 
 class FolderChecksum
-  def self.checksum(dir)
-    files = Dir["#{dir}/**/*"].reject { |f| File.directory?(f) }
-    content = files.map { |f| File.read(f) }.join
-    Digest::MD5.hexdigest(content).to_s
+  def self.git_checksum(dir)
+    checksum_of_files(`git ls-files #{dir}`.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) })
+  end
+
+  def self.checksum_of_files(files)
+    checksums = files.sort.map { |f| Digest::MD5.hexdigest(File.read(f)) }
+    Digest::MD5.hexdigest(checksums.join)
   end
 end

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

@@ -68,7 +68,7 @@ module PodPrebuild
     # Generate a map between a dev_pod and it source hash
     def dev_pod_hashes_map
       @dev_pod_hashes_map ||=
-        dev_pod_sources.map { |name, attribs| [name, FolderChecksum.checksum(attribs[:path])] }.to_h
+        dev_pod_sources.map { |name, attribs| [name, FolderChecksum.git_checksum(attribs[:path])] }.to_h
     end
 
     # Parse an item under `PODS` section of a Lockfile

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

@@ -22,7 +22,7 @@ module PodPrebuild
     end
 
     def edit_scheme_for_code_coverage
-      return unless Pod::Podfile::DSL.dev_pods_enabled && @installer_context.sandbox.instance_of?(Pod::PrebuildSandbox)
+      return unless Pod::Podfile::DSL.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

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

@@ -0,0 +1,39 @@
+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?
+
+      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?
+    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
+  end
+end

data/lib/cocoapods-binary-cache/pod-binary/helper/detected_prebuilt_pods/target_definition.rb

@@ -4,19 +4,12 @@ module Pod
       def detect_prebuilt_pod(name, requirements)
         @explicit_prebuilt_pod_names ||= []
         options = requirements.last || {}
-        if Pod::Podfile::DSL.prebuild_all?
-          @explicit_prebuilt_pod_names << Specification.root_name(name)
-        elsif options.is_a?(Hash) && options[:binary]
-          @explicit_prebuilt_pod_names << Specification.root_name(name)
-        end
+        @explicit_prebuilt_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options[:binary]
         options.delete(:binary) if options.is_a?(Hash)
         requirements.pop if options.empty?
       end
 
-      # Returns the names of pod targets explicitly declared as prebuilt in Podfile
-      # using `:binary => true`.
-      # In case `prebuild_all` is ON via `config_cocoapods_binary_cache`, returns the
-      # name of all pod targets
+      # Returns the names of pod targets explicitly declared as prebuilt in Podfile using `:binary => true`.
       def explicit_prebuilt_pod_names
         names = @explicit_prebuilt_pod_names || []
         names += parent.explicit_prebuilt_pod_names if !parent.nil? && parent.is_a?(TargetDefinition)

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

@@ -17,13 +17,14 @@ module Pod
     end
 
     def should_integrate_prebuilt_pod?(name)
-      if Pod::Podfile::DSL.prebuild_job?
+      if Pod::Podfile::DSL.prebuild_job? && Pod::Podfile::DSL.targets_to_prebuild_from_cli.empty?
         # 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)
       else
-        PodPrebuild::StateStore.cache_validation.hit?(name)
+        prebuilt = PodPrebuild::StateStore.cache_validation.hit + Pod::Podfile::DSL.targets_to_prebuild_from_cli
+        prebuilt.include?(name)
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Pod
   class Installer
     class PodSourceInstaller
       def install_for_prebuild!(standard_sanbox)
-        return if !Podfile::DSL.dev_pods_enabled && standard_sanbox.local?(name)
+        return if !Podfile::DSL.dev_pods_enabled? && standard_sanbox.local?(name)
 
         # make a symlink to target folder
         # TODO (bang): Unify to 1 sandbox to optimize and avoid inconsistency

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

@@ -1,17 +1,18 @@
 require "fileutils"
-require_relative "../pod-rome/build_framework"
 require_relative "../prebuild_output/output"
+require_relative "../helper/lockfile"
 require_relative "helper/passer"
 require_relative "helper/target_checker"
-require_relative "../helper/lockfile"
+require_relative "helper/build"
 
-# patch prebuild ability
 module Pod
   class PrebuildInstaller < Installer
+    attr_reader :lockfile_wrapper
+
     def initialize(options)
       super(options[:sandbox], options[:podfile], options[:lockfile])
       @cache_validation = options[:cache_validation]
-      @lockfile_wrapper = PodPrebuild::Lockfile.new(lockfile)
+      @lockfile_wrapper = lockfile && PodPrebuild::Lockfile.new(lockfile)
     end
 
     private
@@ -43,30 +44,25 @@ module Pod
 
     def should_not_prebuild_vendor_pod(name)
       return true if blacklisted?(name)
-      return false if Pod::Podfile::DSL.prebuild_all_vendor_pods
+      return false if Pod::Podfile::DSL.prebuild_all_pods?
     end
 
-    public
+    def run_code_gen!(targets)
+      return if Pod::Podfile::DSL.prebuild_code_gen.nil?
 
-    def prebuild_output
-      @prebuild_output ||= PodPrebuild::Output.new(sandbox)
+      Pod::UI.title("Running code generation...") do
+        Pod::Podfile::DSL.prebuild_code_gen.call(self, targets)
+      end
     end
 
-    # Build the needed framework files
-    def prebuild_frameworks!
-      UI.puts "Start prebuild_frameworks"
-
-      # build options
-      sandbox_path = sandbox.root
+    def targets_to_prebuild
       existed_framework_folder = sandbox.generate_framework_path
-      bitcode_enabled = Pod::Podfile::DSL.bitcode_enabled
-      targets = []
-
-      if Pod::Podfile::DSL.prebuild_all_vendor_pods
-        UI.puts "Rebuild all vendor frameworks"
-        targets = pod_targets
-      elsif !local_manifest.nil?
-        UI.puts "Update some frameworks"
+      targets = pod_targets
+
+      targets_from_cli = Pod::Podfile::DSL.targets_to_prebuild_from_cli
+      if !targets_from_cli.empty?
+        targets = targets.select { |target| targets_from_cli.include?(target.name) }
+      elsif !Pod::Podfile::DSL.prebuild_all_pods? && !local_manifest.nil?
         changes = prebuild_pods_changes
         added = changes.added
         changed = changes.changed
@@ -93,39 +89,46 @@ module Pod
         # add the dendencies
         dependency_targets = targets.map(&:recursive_dependent_targets).flatten.uniq || []
         targets = (targets + dependency_targets).uniq
-      else
-        UI.puts "Rebuild all frameworks"
-        targets = pod_targets
       end
 
-      unless Pod::Podfile::DSL.prebuild_all_vendor_pods
+      unless Pod::Podfile::DSL.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) }
-      targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) } unless Podfile::DSL.dev_pods_enabled
+      unless Podfile::DSL.dev_pods_enabled?
+        targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) }
+      end
+      targets
+    end
 
-      # build!
-      Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
-      Pod::UI.puts targets.map(&:name)
+    public
+
+    def prebuild_output
+      @prebuild_output ||= PodPrebuild::Output.new(sandbox)
+    end
 
+    # Build the needed framework files
+    def prebuild_frameworks!
+      UI.puts "Start prebuild_frameworks"
+      existed_framework_folder = sandbox.generate_framework_path
+      sandbox_path = sandbox.root
+      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)
       targets.each do |target|
-        unless target.should_build?
-          Pod::UI.puts "Skip prebuilding #{target.label} because of no source files".yellow
-          next
-        end
-
         output_path = sandbox.framework_folder_path_for_target_name(target.name)
         output_path.mkpath unless output_path.exist?
         Pod::Prebuild.build(
-          sandbox_root_path: sandbox_path,
+          sandbox: sandbox_path,
           target: target,
           configuration: Pod::Podfile::DSL.prebuild_config,
           output_path: output_path,
-          bitcode_enabled: bitcode_enabled,
-          device_build_enabled: Pod::Podfile::DSL.device_build_enabled,
-          custom_build_options: Pod::Podfile::DSL.custom_device_build_options,
-          custom_build_options_simulator: Pod::Podfile::DSL.custom_simulator_build_options
+          bitcode_enabled: Pod::Podfile::DSL.bitcode_enabled?,
+          device_build_enabled: Pod::Podfile::DSL.device_build_enabled?,
+          disable_dsym: Pod::Podfile::DSL.disable_dsym?,
+          args: Pod::Podfile::DSL.build_args
         )
         collect_metadata(target, output_path)
       end
@@ -175,7 +178,7 @@ module Pod
         path.rmtree if path.exist?
       end
 
-      if Podfile::DSL.dont_remove_source_code
+      if Podfile::DSL.dont_remove_source_code?
         # just remove the tmp files
         path = sandbox.root + "Manifest.lock.tmp"
         path.rmtree if path.exist?
@@ -214,8 +217,7 @@ module Pod
         .build_configurations
         .detect { |config| config.name == Pod::Podfile::DSL.prebuild_config }
         .build_settings
-      hash = @lockfile_wrapper.dev_pod_hash(target.name)
-      metadata.source_hash = hash unless hash.nil?
+      metadata.source_hash = @lockfile_wrapper && @lockfile_wrapper.dev_pod_hash(target.name)
 
       # Store root path for code-coverage support later
       # TODO: update driver code-coverage logic to use path stored here

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

@@ -3,68 +3,71 @@ require_relative "tool/tool"
 module Pod
   class Podfile
     module DSL
+      @binary_cache_config = {}
+      @binary_cache_cli_config = {}
       def config_cocoapods_binary_cache(options)
-        apply_config = lambda do |config|
-          DSL.send("#{config}=", options[config]) unless options[config].nil?
+        Pod::Podfile::DSL.binary_cache_config = options
+      end
+
+      class << self
+        attr_accessor :binary_cache_config
+        attr_accessor :binary_cache_cli_config
+
+        def prebuild_config
+          @binary_cache_config[:prebuild_config] || "Debug"
         end
 
-        apply_config.call(:prebuild_config)
-        apply_config.call(:prebuild_all) # TODO (thuyen): Revise this option
-        apply_config.call(:prebuild_all_vendor_pods)
-        apply_config.call(:excluded_pods)
-        apply_config.call(:dev_pods_enabled)
-        apply_config.call(:bitcode_enabled)
-        apply_config.call(:device_build_enabled)
-        apply_config.call(:dont_remove_source_code)
-        apply_config.call(:custom_device_build_options)
-        apply_config.call(:custom_simulator_build_options)
-        apply_config.call(:save_cache_validation_to)
-        apply_config.call(:validate_prebuilt_settings)
-      end
+        def prebuild_job?
+          @binary_cache_cli_config[:prebuild_job] || @binary_cache_config[:prebuild_job]
+        end
 
-      @prebuild_config = "Debug"
-      @prebuild_job = false
-      @prebuild_all = false
-      @prebuild_all_vendor_pods = false
-      @excluded_pods = Set.new
-      @dev_pods_enabled = false
-      @bitcode_enabled = false
-      @device_build_enabled = false
-      @dont_remove_source_code = false
-      @custom_device_build_options = []
-      @custom_simulator_build_options = []
-      @save_cache_validation_to = nil
-      # A proc to validate the provided build settings (per target) with the build settings of the prebuilt frameworks
-      # For example, in Podfile:
-      # -----------------------------------------------
-      #   validate_prebuilt_settings do |target|
-      #     settings = {}
-      #     settings["MACH_O_TYPE"] == "staticlib"
-      #     settings["SWIFT_VERSION"] == swift_version_of(target)
-      #     settings
-      #   end
-      # -----------------------------------------------
-      @validate_prebuilt_settings = nil
+        def prebuild_all_pods?
+          @binary_cache_cli_config[:prebuild_all_pods] || @binary_cache_config[:prebuild_all_pods]
+        end
 
-      class << self
-        attr_accessor :prebuild_config
-        attr_accessor :prebuild_job
-        attr_accessor :prebuild_all
-        attr_accessor :prebuild_all_vendor_pods
-        attr_accessor :excluded_pods
-        attr_accessor :dev_pods_enabled
-        attr_accessor :bitcode_enabled
-        attr_accessor :device_build_enabled
-        attr_accessor :dont_remove_source_code
-        attr_accessor :custom_device_build_options
-        attr_accessor :custom_simulator_build_options
-        attr_accessor :save_cache_validation_to
-        attr_accessor :validate_prebuilt_settings
-
-        alias prebuild_job? prebuild_job
-        alias prebuild_all? prebuild_all
-        alias prebuild_all_vendor_pods? prebuild_all_vendor_pods
-        alias dev_pods_enabled? dev_pods_enabled
+        def excluded_pods
+          @binary_cache_config[:excluded_pods] || Set.new
+        end
+
+        def dev_pods_enabled?
+          @binary_cache_config[:dev_pods_enabled]
+        end
+
+        def bitcode_enabled?
+          @binary_cache_config[:bitcode_enabled]
+        end
+
+        def device_build_enabled?
+          @binary_cache_config[:device_build_enabled]
+        end
+
+        def disable_dsym?
+          @binary_cache_config[:disable_dsym]
+        end
+
+        def dont_remove_source_code?
+          @binary_cache_config[:dont_remove_source_code]
+        end
+
+        def build_args
+          @binary_cache_config[:build_args]
+        end
+
+        def save_cache_validation_to
+          @binary_cache_config[:save_cache_validation_to]
+        end
+
+        def validate_prebuilt_settings
+          @binary_cache_config[:validate_prebuilt_settings]
+        end
+
+        def prebuild_code_gen
+          @binary_cache_config[:prebuild_code_gen]
+        end
+
+        def targets_to_prebuild_from_cli
+          @binary_cache_cli_config[:prebuild_targets] || []
+        end
       end
     end
   end

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

@@ -0,0 +1,176 @@
+require_relative "xcodebuild_raw"
+
+class XcodebuildCommand
+  def initialize(options)
+    @options = options
+    case options[:target].platform.name
+    when :ios
+      @options[:device] = "iphoneos"
+      @options[:simulator] = "iphonesimulator"
+    when :tvos
+      @options[:device] = "appletvos"
+      @options[:simulator] = "appletvsimulator"
+    when :watchos
+      @options[:device] = "watchos"
+      @options[:simulator] = "watchsimulator"
+    end
+    @build_args = make_up_build_args(options[:args] || {})
+  end
+
+  def run
+    build_for_sdk(simulator)
+    if device_build_enabled?
+      build_for_sdk(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 make_up_build_args(args)
+    args_ = args.clone
+    args_[:default] ||= []
+    args_[:simulator] ||= []
+    args_[:device] ||= []
+    args_[:default] += ["BITCODE_GENERATION_MODE=bitcode"] if bitcode_enabled?
+    args_[:default] += ["DEBUG_INFORMATION_FORMAT=dwarf"] if disable_dsym?
+    args_[:simulator] += ["ARCHS=x86_64", "ONLY_ACTIVE_ARCH=NO"] if simulator == "iphonesimulator"
+    args_[:simulator] += args_[:default]
+    args_[:device] += args_[:default]
+    args_
+  end
+
+  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}"
+      return
+    end
+
+    succeeded, = xcodebuild(
+      sandbox: sandbox,
+      target: target.label,
+      configuration: configuration,
+      sdk: sdk,
+      deployment_target: target.platform.deployment_target.to_s,
+      args: sdk == simulator ? @build_args[:simulator] : @build_args[:device]
+    )
+    raise "Build framework failed: #{target.label}" unless succeeded
+  end
+
+  def create_universal_framework
+    create_fat_binary(
+      simulator: "#{framework_path_of(simulator)}/#{module_name}",
+      device: "#{framework_path_of(device)}/#{module_name}"
+    )
+  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)
+  end
+
+  def create_fat_binary(options)
+    cmd = ["lipo", " -create"]
+    cmd << "-output" << options[:simulator]
+    cmd << options[:simulator] << options[:device]
+    Pod::UI.puts `#{cmd.join(" ")}`
+  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)
+  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)
+
+    FileUtils.cp_r(
+      device_swift_module_path + "/.",
+      simulator_swift_module_path
+    )
+  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)
+    end
+  end
+
+  def target_products_dir_of(sdk)
+    "#{build_dir}/#{configuration}-#{sdk}/#{target.name}"
+  end
+
+  def framework_path_of(sdk)
+    "#{target_products_dir_of(sdk)}/#{module_name}.framework"
+  end
+
+  def module_name
+    target.product_module_name
+  end
+
+  def sandbox
+    @options[:sandbox]
+  end
+
+  def build_dir
+    @options[:build_dir]
+  end
+
+  def output_path
+    @options[:output_path]
+  end
+
+  def target
+    @options[:target]
+  end
+
+  def configuration
+    @options[:configuration]
+  end
+
+  def bitcode_enabled?
+    @options[:bitcode_enabled]
+  end
+
+  def device_build_enabled?
+    @options[:device_build_enabled]
+  end
+
+  def device
+    @options[:device] || "iphoneos"
+  end
+
+  def simulator
+    @options[:simulator] || "iphonesimulator"
+  end
+
+  def disable_dsym?
+    @options[:disable_dsym]
+  end
+end

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

@@ -0,0 +1,43 @@
+require "fourflusher"
+
+PLATFORM_OF_SDK = {
+  "iphonesimulator" => "iOS",
+  "appletvsimulator" => "tvOS",
+  "watchsimulator" => "watchOS"
+}.freeze
+
+def xcodebuild(options)
+  sdk = options[:sdk] || "iphonesimulator"
+  platform = PLATFORM_OF_SDK[sdk]
+
+  cmd = ["xcodebuild"]
+  cmd << "-project" << options[:sandbox].project_path.realdirpath
+  cmd << "-scheme" << options[:target]
+  cmd << "-configuration" << options[:configuration]
+  cmd << "-sdk" << sdk
+  cmd << Fourflusher::SimControl.new.destination(:oldest, platform, options[:deployment_target]) unless platform.nil?
+  cmd += options[:args] if options[:args]
+  cmd << "2>&1"
+  cmd = cmd.join(" ")
+
+  puts "xcodebuild command: #{cmd}"
+  log = `#{cmd}`
+
+  succeeded = $?.exitstatus.zero?
+  unless succeeded
+    begin
+      raise "Unexpected error" unless log.include?("** BUILD FAILED **")
+
+      require "xcpretty" # TODO (thuyen): Revise this dependency
+      # use xcpretty to print build log
+      # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
+      printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => "auto"})
+      log.each_line do |line|
+        printer.pretty_print(line)
+      end
+    rescue
+      puts log.red
+    end
+  end
+  [succeeded, log]
+end

data/lib/command/prebuild.rb

@@ -8,12 +8,16 @@ module Pod
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
         def self.options
           [
-            ["--push", "Push cache to repo upon completion"]
+            ["--push", "Push cache to repo upon completion"],
+            ["--all", "Prebuild all binary pods regardless of cache validation"],
+            ["--targets", "Targets to prebuild. Use comma (,) to specify a list of targets"]
           ]
         end
 
         def initialize(argv)
           super
+          @prebuild_all_pods = argv.flag?("all")
+          @prebuild_targets = argv.option("targets", "").split(",")
           @prebuilder = PodPrebuild::CachePrebuilder.new(
             config: prebuild_config,
             cache_branch: argv.shift_argument || "master",
@@ -22,7 +26,9 @@ module Pod
         end
 
         def run
-          Pod::Podfile::DSL.prebuild_job = true
+          Pod::Podfile::DSL.binary_cache_cli_config[:prebuild_job] = true
+          Pod::Podfile::DSL.binary_cache_cli_config[:prebuild_all_pods] = @prebuild_all_pods
+          Pod::Podfile::DSL.binary_cache_cli_config[:prebuild_targets] = @prebuild_targets unless @prebuild_all_pods
           @prebuilder.run
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -129,6 +129,7 @@ files:
 - lib/cocoapods-binary-cache/hooks/pre_install.rb
 - lib/cocoapods-binary-cache/main.rb
 - lib/cocoapods-binary-cache/pod-binary/LICENSE.txt
+- lib/cocoapods-binary-cache/pod-binary/helper/build.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/detected_prebuilt_pods/installer.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/detected_prebuilt_pods/target_definition.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/feature_switches.rb
@@ -150,7 +151,8 @@ files:
 - lib/cocoapods-binary-cache/pod-binary/prebuild_hook.rb
 - lib/cocoapods-binary-cache/pod-binary/tool/tool.rb
 - lib/cocoapods-binary-cache/pod-rome/LICENSE.txt
-- lib/cocoapods-binary-cache/pod-rome/build_framework.rb
+- lib/cocoapods-binary-cache/pod-rome/xcodebuild_command.rb
+- lib/cocoapods-binary-cache/pod-rome/xcodebuild_raw.rb
 - lib/cocoapods-binary-cache/prebuild_output/metadata.rb
 - lib/cocoapods-binary-cache/prebuild_output/output.rb
 - lib/cocoapods-binary-cache/scheme_editor.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Reduce build time by building pod frameworks and cache to remote storage,

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

@@ -1,248 +0,0 @@
-require 'fourflusher'
-require 'xcpretty' # TODO (thuyen): Revise this dependency
-
-module FileUtils
-  def self.mvpath(src, dst, **options)
-    FileUtils.rm_rf(File.join(dst, File.basename(src)))
-    FileUtils.mv(src, dst, **options)
-  end
-end
-
-PLATFORMS = { 'iphonesimulator' => 'iOS',
-              'appletvsimulator' => 'tvOS',
-              'watchsimulator' => 'watchOS' }
-
-#  Build specific target to framework file
-#  @param [PodTarget] target
-#         a specific pod target
-#
-def build_for_iosish_platform(sandbox, 
-                              build_dir, 
-                              output_path,
-                              target, 
-                              configuration,
-                              device, 
-                              simulator,
-                              bitcode_enabled,
-                              custom_build_options = [], # Array<String>
-                              custom_build_options_simulator = [], # Array<String>
-                              enable_device_build = false
-                              )
-
-  deployment_target = target.platform.deployment_target.to_s
-  
-  target_label = target.label # name with platform if it's used in multiple platforms
-  Pod::UI.puts "Prebuilding #{target_label}..."
-  
-  other_options = []
-  # bitcode enabled
-  other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
-  # make less arch to iphone simulator for faster build
-  custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
-
-  # paths
-  target_name = target.name # equals target.label, like "AFNeworking-iOS" when AFNetworking is used in multiple platforms.
-  module_name = target.product_module_name
-  device_framework_path = "#{build_dir}/#{configuration}-#{device}/#{target_name}/#{module_name}.framework"
-  simulator_framework_path = "#{build_dir}/#{configuration}-#{simulator}/#{target_name}/#{module_name}.framework"
-  simulator_target_products_path = "#{build_dir}/#{configuration}-#{simulator}/#{target_name}"
-
-  if !Dir.exist?(simulator_framework_path)
-    is_succeed, = xcodebuild(
-      sandbox,
-      target_label,
-      configuration,
-      simulator,
-      deployment_target,
-      other_options + custom_build_options_simulator
-    )
-    raise "Build simulator framework failed: #{target_label}" unless is_succeed
-  else
-    puts "Simulator framework already exist at: #{simulator_framework_path}"
-  end
-
-  unless enable_device_build
-    FileUtils.cp_r Dir["#{simulator_target_products_path}/*"], output_path
-    return
-  end
-
-  if !Dir.exist?(device_framework_path)
-    is_succeed, = xcodebuild(
-      sandbox,
-      target_label,
-      configuration,
-      device,
-      deployment_target,
-      other_options + custom_build_options
-    )
-    raise "Build device framework failed: #{target_label}" unless is_succeed
-  else
-    puts "Device framework already exist at: #{device_framework_path}"
-  end
-
-  device_binary = device_framework_path + "/#{module_name}"
-  simulator_binary = simulator_framework_path + "/#{module_name}"
-  return unless File.file?(device_binary) && File.file?(simulator_binary)
-
-  # the device_lib path is the final output file path
-  # combine the binaries
-  tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
-  lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
-  puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-  FileUtils.mvpath tmp_lipoed_binary_path, device_binary
-
-  # collect the swiftmodule file for various archs.
-  device_swiftmodule_path = device_framework_path + "/Modules/#{module_name}.swiftmodule"
-  simulator_swiftmodule_path = simulator_framework_path + "/Modules/#{module_name}.swiftmodule"
-  if File.exist?(device_swiftmodule_path)
-    FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
-  end
-
-  # combine the generated swift headers
-  # (In xcode 10.2, the generated swift headers vary for each archs)
-  # https://github.com/leavez/cocoapods-binary/issues/58
-  simulator_generated_swift_header_path = simulator_framework_path + "/Headers/#{module_name}-Swift.h"
-  device_generated_swift_header_path = device_framework_path + "/Headers/#{module_name}-Swift.h"
-  if File.exist? simulator_generated_swift_header_path
-    device_header = File.read(device_generated_swift_header_path)
-    simulator_header = File.read(simulator_generated_swift_header_path)
-    # https://github.com/Carthage/Carthage/issues/2718#issuecomment-473870461
-    combined_header_content = %Q{
-#if TARGET_OS_SIMULATOR // merged by cocoapods-binary
-
-#{simulator_header}
-
-#else // merged by cocoapods-binary
-
-#{device_header}
-
-#endif // merged by cocoapods-binary
-}
-    File.write(device_generated_swift_header_path, combined_header_content.strip)
-  end
-
-  # handle the dSYM files
-  device_dsym = "#{device_framework_path}.dSYM"
-  if File.exist? device_dsym
-    # lipo the simulator dsym
-    simulator_dsym = "#{simulator_framework_path}.dSYM"
-    if File.exist? simulator_dsym
-      tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
-      lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
-      puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-      FileUtils.mvpath tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}"
-    end
-    FileUtils.mvpath device_dsym, output_path
-  end
-
-  # output
-  output_path.mkpath unless output_path.exist?
-  FileUtils.mvpath device_framework_path, output_path
-end
-
-def xcodebuild(sandbox, target, configuration, sdk='macosx', deployment_target=nil, other_options=[])
-  args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk} )
-  platform = PLATFORMS[sdk]
-  args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
-  args += other_options
-
-  args_str = args.join(" ")
-  cmd = "xcodebuild #{args_str} 2>&1"
-  puts "xcodebuild command: #{cmd}"
-  log = `#{cmd}`
-
-  exit_code = $?.exitstatus  # Process::Status
-  is_succeed = (exit_code == 0)
-
-  if !is_succeed
-    begin
-        if log.include?('** BUILD FAILED **')
-            # use xcpretty to print build log
-            # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
-            printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => 'auto'})
-            log.each_line do |line|
-              printer.pretty_print(line)
-            end
-        else
-            raise "shouldn't be handle by xcpretty"
-        end
-    rescue
-        puts log.red
-    end
-  end
-  [is_succeed, log]
-end
-
-module Pod
-  class Prebuild
-    def self.build(options)
-      sandbox_root_path = options[:sandbox_root_path]
-      target = options[:target]
-      configuration = options[:configuration]
-      output_path = options[:output_path]
-      bitcode_enabled = options[:bitcode_enabled] || false
-      device_build_enabled = options[:device_build_enabled] || false
-      custom_build_options = options[:custom_build_options] || []
-      custom_build_options_simulator = options[:custom_build_options_simulator] || []
-
-      return if target.nil?
-
-      sandbox_root = Pathname(sandbox_root_path)
-      sandbox = Pod::Sandbox.new(sandbox_root)
-      build_dir = self.build_dir(sandbox_root)
-
-      # -- build the framework
-      case target.platform.name
-      when :ios
-        build_for_iosish_platform(
-          sandbox,
-          build_dir,
-          output_path,
-          target,
-          configuration,
-          "iphoneos",
-          "iphonesimulator",
-          bitcode_enabled,
-          custom_build_options,
-          custom_build_options_simulator,
-          device_build_enabled
-        )
-      when :osx
-        xcodebuild(
-          sandbox,
-          target.label,
-          configuration,
-          "macosx",
-          nil,
-          custom_build_options
-        )
-      # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
-      when :watchos
-        build_for_iosish_platform(
-          sandbox,
-          build_dir,
-          output_path,
-          target,
-          configuration,
-          "watchos",
-          "watchsimulator",
-          true,
-          custom_build_options,
-          custom_build_options_simulator,
-          device_build_enabled
-        )
-      else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
-
-      raise Pod::Informative, "The build directory was not found in the expected location" unless build_dir.directory?
-    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
-  end
-end