cocoapods-binary-cache 0.1.1 → 0.1.7

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

@@ -9,13 +9,14 @@ require_relative "helper/json"
 require_relative "helper/lockfile"
 require_relative "helper/path_utils"
 require_relative "helper/podspec"
+require_relative "env"
 require_relative "state_store"
 require_relative "hooks/post_install"
 require_relative "hooks/pre_install"
 require_relative "pod-binary/prebuild_dsl"
 require_relative "pod-binary/prebuild_hook"
 require_relative "pod-binary/prebuild"
-require_relative "prebuild_cache"
 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

@@ -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/installer.rb

@@ -17,7 +17,7 @@ module Pod
         targets = pod_targets.select { |target| explicit_prebuilt_pod_names.include?(target.pod_name) }
         dependencies = targets.flat_map(&:recursive_dependent_targets) # Treat dependencies as prebuilt pods
         all = (targets + dependencies).uniq
-        all = all.reject { |target| sandbox.local?(target.pod_name) } unless Podfile::DSL.dev_pods_enabled?
+        all = all.reject { |target| sandbox.local?(target.pod_name) } unless PodPrebuild.config.dev_pods_enabled?
         all
       end
     end

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

@@ -3,20 +3,13 @@ module Pod
     class TargetDefinition
       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
+        options = requirements.last || {}
+        @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/helper/feature_switches.rb

@@ -2,44 +2,6 @@ require_relative "../tool/tool"
 require_relative "prebuild_sandbox"
 
 module Pod
-
-  # a flag that indicate stages
-  class_attr_accessor :is_prebuild_stage
-
-  # a switch for the `pod` DSL to make it only valid for ':binary => true'
-  class Podfile
-    module DSL
-      @@enable_prebuild_patch = false
-
-      # when enable, `pod` function will skip all pods without 'prebuild => true'
-      def self.enable_prebuild_patch(value)
-        @@enable_prebuild_patch = value
-      end
-
-      # --- patch ---
-      old_method = instance_method(:pod)
-
-      define_method(:pod) do |name, *args|
-        if !@@enable_prebuild_patch
-          old_method.bind(self).(name, *args)
-          return
-        end
-
-        # patched content
-        should_prebuild = Pod::Podfile::DSL.prebuild_all
-        local = false
-
-        options = args.last
-        if options.is_a?(Hash) and options[Pod::Prebuild.keyword] != nil
-          should_prebuild = options[Pod::Prebuild.keyword]
-          local = (options[:path] != nil)
-        end
-
-        old_method.bind(self).call(name, *args) if should_prebuild && (!local || Podfile::DSL.dev_pods_enabled)
-      end
-    end
-  end
-
   # a force disable option for integral
   class Installer
     def self.force_disable_integration(value)

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

@@ -18,19 +18,10 @@
 module Pod
   def self.fast_get_targets_for_pod_name(pod_name, targets, cache)
     pod_name = pod_name.split("/")[0] # Look for parent spec instead of subspecs
-    pod_name_to_targets_hash = nil
     if cache.empty?
-      pod_name_to_targets_hash = targets.reduce({}) do |sum, target|
-        array = sum[target.pod_name] || []
-        array << target
-        sum[target.pod_name] = array
-        sum
-      end
-      cache << pod_name_to_targets_hash
+      targets.select { |target| target.name == pod_name }
     else
-      pod_name_to_targets_hash = cache.first
+      cache.first[pod_name] || []
     end
-
-    pod_name_to_targets_hash[pod_name] || []
   end
 end

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

@@ -2,10 +2,9 @@ require_relative "names"
 
 module Pod
   class PrebuildSandbox < Sandbox
-
     # [String] standard_sandbox_path
     def self.from_standard_sanbox_path(path)
-      prebuild_sandbox_path = Pathname.new(path).realpath + "_Prebuild"
+      prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild.config.prebuild_sandbox_path
       self.new(prebuild_sandbox_path)
     end
 

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

@@ -5,7 +5,6 @@ require_relative "helper/names"
 require_relative "helper/target_checker"
 require_relative "integration/alter_specs"
 require_relative "integration/remove_target_files"
-require_relative "integration/source_installer"
 require_relative "integration/validation"
 require_relative "integration/patch/embed_framework_script"
 require_relative "integration/patch/resolve_dependencies"

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

@@ -15,6 +15,7 @@ module Pod
         # 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.prebuilt_path(path: framework_file_path)
         add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
       end
 
@@ -61,7 +62,9 @@ module Pod
         attributes["resource_bundles"] = nil
         attributes["resources"] ||= []
         attributes["resources"] = [attributes["resources"]] if attributes["resources"].is_a?(String)
-        attributes["resources"] += resource_bundle_names.map { |n| n + ".bundle" }
+        attributes["resources"] += resource_bundle_names.map do |name|
+          PodPrebuild.config.prebuilt_path(path: "#{name}.bundle")
+        end
       end
 
       add_resource_bundles_to_resources.call(spec.attributes_hash)

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

@@ -1,3 +1,5 @@
+require_relative "../source_installer"
+
 module Pod
   class Installer
     # Override the download step to skip download and prepare file in target folder
@@ -15,13 +17,14 @@ module Pod
     end
 
     def should_integrate_prebuilt_pod?(name)
-      if Pod::Podfile::DSL.prebuild_job?
+      if PodPrebuild.config.prebuild_job? && PodPrebuild.config.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 + PodPrebuild.config.targets_to_prebuild_from_cli
+        prebuilt.include?(name)
       end
     end
   end

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

@@ -15,9 +15,9 @@ module Pod
 
       updated_names.each do |name|
         root_name = Specification.root_name(name)
-        next if !Pod::Podfile::DSL.dev_pods_enabled && sandbox.local?(root_name)
+        next if sandbox.local?(root_name)
 
-        UI.puts "Delete cached files: #{root_name}"
+        UI.message "Delete cached files: #{root_name}"
         target_path = sandbox.pod_dir(root_name)
         target_path.rmtree if target_path.exist?
 

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

@@ -11,69 +11,34 @@ 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 !PodPrebuild.config.dev_pods_enabled? && standard_sanbox.local?(name)
 
         # make a symlink to target folder
+        # 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.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
@@ -87,8 +52,9 @@ module Pod
           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"
@@ -106,6 +72,32 @@ module Pod
           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.rmtree if target.exist?
+        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

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

@@ -1,15 +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/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 = lockfile && PodPrebuild::Lockfile.new(lockfile)
     end
 
     private
@@ -35,38 +38,31 @@ module Pod
       PodPrebuild::StateStore.excluded_pods.include?(name)
     end
 
-    def cache_hit?(name)
-      @cache_validation.hit?(name)
+    def cache_missed?(name)
+      @cache_validation.missed?(name)
     end
 
     def should_not_prebuild_vendor_pod(name)
       return true if blacklisted?(name)
-      return false if Pod::Podfile::DSL.prebuild_all_vendor_pods
-
-      cache_hit?(name)
+      return false if PodPrebuild.config.prebuild_all_pods?
     end
 
-    public
+    def run_code_gen!(targets)
+      return if PodPrebuild.config.prebuild_code_gen.nil?
 
-    def prebuild_output
-      @prebuild_output ||= PodPrebuild::Output.new(sandbox)
+      Pod::UI.title("Running code generation...") do
+        PodPrebuild.config.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 = 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
@@ -93,35 +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 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) }
-      targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) } unless Podfile::DSL.dev_pods_enabled
+      unless PodPrebuild.config.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_path,
-          target,
-          Pod::Podfile::DSL.prebuild_config,
-          output_path,
-          bitcode_enabled,
-          Pod::Podfile::DSL.custom_device_build_options,
-          Pod::Podfile::DSL.custom_simulator_build_options
+          sandbox: sandbox_path,
+          target: target,
+          configuration: PodPrebuild.config.prebuild_config,
+          output_path: output_path,
+          bitcode_enabled: PodPrebuild.config.bitcode_enabled?,
+          device_build_enabled: PodPrebuild.config.device_build_enabled?,
+          disable_dsym: PodPrebuild.config.disable_dsym?,
+          args: PodPrebuild.config.build_args
         )
         collect_metadata(target, output_path)
       end
@@ -171,7 +178,7 @@ module Pod
         path.rmtree if path.exist?
       end
 
-      if Podfile::DSL.dont_remove_source_code
+      if PodPrebuild.config.dont_remove_source_code?
         # just remove the tmp files
         path = sandbox.root + "Manifest.lock.tmp"
         path.rmtree if path.exist?
@@ -188,7 +195,6 @@ module Pod
       Pod::UI.puts "Targets to cleanup: #{deleted_target_names}"
 
       prebuild_output.write_delta_file(updated_target_names, deleted_target_names)
-      prebuild_output.process_prebuilt_dev_pods
     end
 
     def clean_delta_file
@@ -209,8 +215,14 @@ module Pod
       metadata.build_settings = pods_project.targets
         .detect { |native_target| native_target.name == target.name }
         .build_configurations
-        .detect { |config| config.name == Pod::Podfile::DSL.prebuild_config }
+        .detect { |config| config.name == PodPrebuild.config.prebuild_config }
         .build_settings
+      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
+      project_root = PathUtils.remove_last_path_component(@sandbox.standard_sanbox_path.to_s)
+      metadata.project_root = project_root
       metadata.save!
     end
 
@@ -218,7 +230,7 @@ module Pod
     old_method2 = instance_method(:run_plugins_post_install_hooks)
     define_method(:run_plugins_post_install_hooks) do
       old_method2.bind(self).call
-      prebuild_frameworks! if Pod.is_prebuild_stage && Pod::Podfile::DSL.prebuild_job?
+      prebuild_frameworks! if PodPrebuild::Env.prebuild_stage?
     end
   end
 end