cocoapods-binary-cache 0.1.5 → 0.1.10

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

@@ -0,0 +1,37 @@
+require_relative "../../pod-rome/xcodebuild_raw"
+require_relative "../../pod-rome/xcodebuild_command"
+
+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)
+
+    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.build_dir(sandbox_root)
+    sandbox_root.parent + "build"
+  end
+end

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

@@ -3,7 +3,7 @@ module Pod
     # Returns the names of pod targets detected as prebuilt, including
     # those declared in Podfile and their dependencies
     def prebuilt_pod_names
-      prebuilt_pod_targets.map(&:name)
+      prebuilt_pod_targets.map(&:name).to_set
     end
 
     # Returns the pod targets detected as prebuilt, including
@@ -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

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

@@ -4,43 +4,44 @@ module Pod
   class PrebuildSandbox < Sandbox
     # [String] standard_sandbox_path
     def self.from_standard_sanbox_path(path)
-      prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild::Config.instance.prebuild_path
-      self.new(prebuild_sandbox_path)
+      prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild.config.prebuild_sandbox_path
+      new(prebuild_sandbox_path)
     end
 
     def self.from_standard_sandbox(sandbox)
-      self.from_standard_sanbox_path(sandbox.root)
+      from_standard_sanbox_path(sandbox.root)
     end
 
     def standard_sanbox_path
-      self.root.parent
+      root.parent
     end
 
     def generate_framework_path
-      self.root + "GeneratedFrameworks"
+      root + "GeneratedFrameworks"
     end
 
     # @param name [String] pass the target.name (may containing platform suffix)
     # @return [Pathname] the folder containing the framework file.
     def framework_folder_path_for_target_name(name)
-      self.generate_framework_path + name
+      generate_framework_path + name
     end
 
     def exsited_framework_target_names
-      exsited_framework_name_pairs.map { |pair| pair[0] }.uniq
+      existed_framework_name_pairs.map { |pair| pair[0] }.uniq
     end
 
     def exsited_framework_pod_names
-      exsited_framework_name_pairs.map { |pair| pair[1] }.uniq
+      existed_framework_name_pairs.map { |pair| pair[1] }.uniq
     end
 
     def existed_target_names_for_pod_name(pod_name)
-      exsited_framework_name_pairs.select { |pair| pair[1] == pod_name }.map { |pair| pair[0] }
+      existed_framework_name_pairs.select { |pair| pair[1] == pod_name }.map { |pair| pair[0] }
     end
 
     def save_pod_name_for_target(target)
       folder = framework_folder_path_for_target_name(target.name)
       return unless folder.exist?
+
       flag_file_path = folder + "#{target.pod_name}.pod_name"
       File.write(flag_file_path.to_s, "")
     end
@@ -53,16 +54,16 @@ module Pod
       end
       name = name.basename(".pod_name").to_s unless name.nil?
       name ||= Pathname.new(target_folder_path).basename.to_s # for compatibility with older version
+      name
     end
 
     # Array<[target_name, pod_name]>
-    def exsited_framework_name_pairs
+    def existed_framework_name_pairs
       return [] unless generate_framework_path.exist?
-      generate_framework_path.children().map do |framework_path|
-        if framework_path.directory? && (not framework_path.children.empty?)
+
+      generate_framework_path.children.map do |framework_path|
+        if framework_path.directory? && !framework_path.children.empty?
           [framework_path.basename.to_s, pod_name_for_target_folder(framework_path)]
-        else
-          nil
         end
       end.reject(&:nil?).uniq
     end

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/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/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

@@ -3,27 +3,42 @@ require_relative "../source_installer"
 module Pod
   class Installer
     # Override the download step to skip download and prepare file in target folder
-    define_method(:install_source_of_pod) do |pod_name|
-      pod_installer = create_pod_installer(pod_name)
-      # Injected code
-      # ------------------------------------------
-      if should_integrate_prebuilt_pod?(pod_name)
-        pod_installer.install_for_prebuild!(sandbox)
+    alias original_create_pod_installer create_pod_installer
+    def create_pod_installer(name)
+      if should_integrate_prebuilt_pod?(name)
+        create_prebuilt_source_installer(name)
       else
-        pod_installer.install!
+        create_normal_source_installer(name)
       end
-      # ------------------------------------------
-      @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
+    end
+
+    private
+
+    def create_normal_source_installer(name)
+      original_create_pod_installer(name)
+    end
+
+    def create_prebuilt_source_installer(name)
+      source_installer = PodSourceInstaller.new(sandbox, podfile, specs_for_pod(name))
+      pod_installer = PrebuiltSourceInstaller.new(
+        sandbox,
+        podfile,
+        specs_for_pod(name),
+        source_installer: source_installer
+      )
+      pod_installers << pod_installer
+      pod_installer
     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)
+        PodPrebuild.state.cache_validation.include?(name)
       else
-        PodPrebuild::StateStore.cache_validation.hit?(name)
+        prebuilt = PodPrebuild.state.cache_validation.hit + PodPrebuild.config.targets_to_prebuild_from_cli
+        prebuilt.include?(name)
       end
     end
   end

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

@@ -1,80 +1,50 @@
-# NOTE:
-# This file will only be loaded on normal pod install step
-# so there's no need to check is_prebuild_stage
-
-# Provide a special "download" process for prebuilded pods.
-#
-# As the frameworks is already exsited in local folder. We
-# just create a symlink to the original target folder.
-#
 module Pod
   class Installer
-    class PodSourceInstaller
-      def install_for_prebuild!(standard_sanbox)
-        return if !Podfile::DSL.dev_pods_enabled && standard_sanbox.local?(name)
+    class PrebuiltSourceInstaller < PodSourceInstaller
+      def initialize(*args, **kwargs)
+        @source_installer = kwargs.delete(:source_installer)
+        super(*args, **kwargs)
+      end
 
-        # 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 prebuild_sandbox
+        @prebuild_sandbox ||= Pod::PrebuildSandbox.from_standard_sandbox(sandbox)
+      end
 
-        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 install!
+        @source_installer.install! if PodPrebuild.config.still_download_sources?(name)
+        install_prebuilt_framework!
+      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
+      private
 
-        def mirror_with_symlink(source, basefolder, target_folder)
-          target = target_folder + source.relative_path_from(basefolder)
-          make_link(source, target)
-        end
+      def install_prebuilt_framework!
+        return if !PodPrebuild.config.dev_pods_enabled? && sandbox.local?(name)
 
+        # make a symlink to target folder
+        # TODO (bang): Unify to 1 sandbox to optimize and avoid inconsistency
+        # if spec used in multiple platforms, it may return multiple paths
+        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 = sandbox.pod_dir(self.name)
+          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
@@ -88,8 +58,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"
@@ -107,6 +78,30 @@ module Pod
           end
         end
       end
+
+      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