cocoapods-binary-cache 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe99f8a6986c687fb8033d369ffd7db7ac4543782070d386de8ca20d7e303f5
-  data.tar.gz: 8424f90961d5bd08d827ce427f576869b059172b1a07a89e9ff85b012299f0d7
+  metadata.gz: e068bdcb9e91a8e599e3ad1732837a1a7dbd49a4409e05b97b1cdc476bfb76a7
+  data.tar.gz: 21d3e3fa0374a8818efa927bb822ce9386e43e18ec26a1ab5be7d8b481a688d6
 SHA512:
-  metadata.gz: '09b307361741d28ea6d3343061e9baff47d9eb477ce6c31771b2d0ac3893389e34f48b9cd8b41a9337e22225bf6accbbf402445549d07d733575e19602a33b34'
-  data.tar.gz: d8c33dd9aac8606cb853d6dd3d4cf20cabec06f17974ae7248ff632bb6e34e43a5e3be98357bc975ef9229a9418cfdc463d5b8093e829babde8ab642c157249b
+  metadata.gz: f5588698b1d818071b2bfb568bcbd44bc1e02084f7caf0b4b554a50277f2064209ec527339de4c8166ab74ff358b0a173f149b5db67f33a808c8d562f8d02625
+  data.tar.gz: dd21d19ff94f2a8dcf3b4b1dd7372484993e0aba4705512fde75be14e66d72ddadc592fc88b9ea81ae3983f156e5fe251e4dbcfe8047f7904db1b0fd3cf0cbcf

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 PodPrebuild.config.dev_pods_enabled?
       @validators << PodPrebuild::DependenciesGraphCacheValidator.new(options)
       @validators << PodPrebuild::ExclusionCacheValidator.new(options)
     end

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

@@ -10,7 +10,7 @@ module PodPrebuild
 
       dependencies_graph = DependenciesGraph.new(@pod_lockfile.lockfile)
       clients = dependencies_graph.get_clients(accumulated.discard(@ignored_pods).missed.to_a)
-      unless Pod::Podfile::DSL.dev_pods_enabled?
+      unless PodPrebuild.config.dev_pods_enabled?
         clients = clients.reject { |client| @pod_lockfile.dev_pods.keys.include?(client) }
       end
 

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

@@ -3,14 +3,16 @@ require_relative "base"
 module PodPrebuild
   class IntegrationDiagnosis < BaseDiagnosis
     def run
-      should_be_integrated = if Pod::Podfile::DSL.prebuild_job? \
+      should_be_integrated = if PodPrebuild.config.prebuild_job? \
                              then @cache_validation.hit + @cache_validation.missed \
                              else @cache_validation.hit \
                              end
       should_be_integrated = should_be_integrated.map { |name| name.split("/")[0] }.to_set
       unintegrated = should_be_integrated.reject do |name|
         module_name = spec(name)&.module_name || name
-        framework_path = @standard_sandbox.pod_dir(name) + "#{module_name}.framework"
+        framework_path = \
+          @standard_sandbox.pod_dir(name) + \
+          PodPrebuild.config.prebuilt_path(path: "#{module_name}.framework")
         framework_path.exist?
       end
       Pod::UI.puts "🚩 Unintegrated frameworks: #{unintegrated}".yellow unless unintegrated.empty?

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

@@ -13,7 +13,7 @@ module PodPrebuild
       end
 
       def stages
-        @stages ||= Pod::Podfile::DSL.prebuild_job? ? [:prebuild, :integration] : [:integration]
+        @stages ||= PodPrebuild.config.prebuild_job? ? [:prebuild, :integration] : [:integration]
       end
 
       def current_stage

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 PodPrebuild.config.dev_pods_enabled? && @installer_context.sandbox.instance_of?(Pod::PrebuildSandbox)
 
       # Modify pods scheme to support code coverage
       # If we don't prebuild dev pod -> no need to care about this in Pod project

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

@@ -24,7 +24,7 @@ module PodPrebuild
       create_prebuild_sandbox
       Pod::UI.section("Detect implicit dependencies") { detect_implicit_dependencies }
       Pod::UI.section("Validate prebuilt cache") { validate_cache }
-      prebuild! if Pod::Podfile::DSL.prebuild_job?
+      prebuild! if PodPrebuild.config.prebuild_job?
       Pod::UI.section("Reset environment") { reset_environment }
 
       PodPrebuild::Env.next_stage!
@@ -72,7 +72,7 @@ module PodPrebuild
       # Note: DSL is reloaded when creating an installer (Pod::Installer.new).
       # Any mutation to DSL is highly discouraged
       # --> Rather, perform mutation on PodPrebuild::StateStore instead
-      PodPrebuild::StateStore.excluded_pods += Pod::Podfile::DSL.excluded_pods
+      PodPrebuild::StateStore.excluded_pods += PodPrebuild.config.excluded_pods
     end
 
     def create_prebuild_sandbox
@@ -101,13 +101,13 @@ module PodPrebuild
         podfile: podfile,
         pod_lockfile: installer_context.lockfile,
         prebuilt_lockfile: prebuilt_lockfile,
-        validate_prebuilt_settings: Pod::Podfile::DSL.validate_prebuilt_settings,
+        validate_prebuilt_settings: PodPrebuild.config.validate_prebuilt_settings,
         generated_framework_path: prebuild_sandbox.generate_framework_path,
         sandbox_root: prebuild_sandbox.root,
         ignored_pods: PodPrebuild::StateStore.excluded_pods,
         prebuilt_pod_names: @original_installer.prebuilt_pod_names
       ).validate
-      path_to_save_cache_validation = Pod::Podfile::DSL.save_cache_validation_to
+      path_to_save_cache_validation = PodPrebuild.config.save_cache_validation_to
       @cache_validation.update_to(path_to_save_cache_validation) unless path_to_save_cache_validation.nil?
       cache_validation.print_summary
       PodPrebuild::StateStore.cache_validation = cache_validation

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

@@ -4,7 +4,7 @@ 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
+      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/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

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

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

@@ -11,70 +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
@@ -88,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"
@@ -107,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

@@ -44,14 +44,14 @@ module Pod
 
     def should_not_prebuild_vendor_pod(name)
       return true if blacklisted?(name)
-      return false if Pod::Podfile::DSL.prebuild_all_pods?
+      return false if PodPrebuild.config.prebuild_all_pods?
     end
 
     def run_code_gen!(targets)
-      return if Pod::Podfile::DSL.prebuild_code_gen.nil?
+      return if PodPrebuild.config.prebuild_code_gen.nil?
 
       Pod::UI.title("Running code generation...") do
-        Pod::Podfile::DSL.prebuild_code_gen.call(self, targets)
+        PodPrebuild.config.prebuild_code_gen.call(self, targets)
       end
     end
 
@@ -59,10 +59,10 @@ module Pod
       existed_framework_folder = sandbox.generate_framework_path
       targets = pod_targets
 
-      targets_from_cli = Pod::Podfile::DSL.targets_to_prebuild_from_cli
+      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 !Pod::Podfile::DSL.prebuild_all_pods? && !local_manifest.nil?
+      elsif !PodPrebuild.config.prebuild_all_pods? && !local_manifest.nil?
         changes = prebuild_pods_changes
         added = changes.added
         changed = changes.changed
@@ -91,11 +91,11 @@ module Pod
         targets = (targets + dependency_targets).uniq
       end
 
-      unless Pod::Podfile::DSL.prebuild_all_pods?
+      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 Podfile::DSL.dev_pods_enabled?
+      unless PodPrebuild.config.dev_pods_enabled?
         targets = targets.reject { |pod_target| sandbox.local?(pod_target.pod_name) }
       end
       targets
@@ -123,12 +123,12 @@ module Pod
         Pod::Prebuild.build(
           sandbox: sandbox_path,
           target: target,
-          configuration: Pod::Podfile::DSL.prebuild_config,
+          configuration: PodPrebuild.config.prebuild_config,
           output_path: output_path,
-          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
+          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
@@ -178,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?
@@ -215,7 +215,7 @@ 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)
 

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

@@ -3,71 +3,9 @@ require_relative "tool/tool"
 module Pod
   class Podfile
     module DSL
-      @binary_cache_config = {}
-      @binary_cache_cli_config = {}
       def config_cocoapods_binary_cache(options)
-        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
-
-        def prebuild_job?
-          @binary_cache_cli_config[:prebuild_job] || @binary_cache_config[:prebuild_job]
-        end
-
-        def prebuild_all_pods?
-          @binary_cache_cli_config[:prebuild_all_pods] || @binary_cache_config[:prebuild_all_pods]
-        end
-
-        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
+        PodPrebuild.config.dsl_config = options
+        PodPrebuild.config.validate_dsl_config
       end
     end
   end

data/lib/cocoapods-binary-cache/prebuild_output/output.rb

@@ -8,7 +8,7 @@ module PodPrebuild
     end
 
     def prebuild_delta_path
-      @prebuild_delta_path ||= PodPrebuild::Config.instance.prebuild_delta_path
+      @prebuild_delta_path ||= PodPrebuild.config.prebuild_delta_path
     end
 
     def delta_dir

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

@@ -12,7 +12,7 @@ class SchemeEditor
       scheme_name = File.basename(file_path, '.*')
       next unless sandbox.local?(scheme_name)
 
-      puts "Modify scheme to enable coverage symbol when prebuild: #{scheme_name}"
+      Pod::UI.message "Modify scheme to enable coverage symbol when prebuild: #{scheme_name}"
 
       doc = File.open(file_path, 'r') { |f| REXML::Document.new(f) }
       scheme = doc.elements['Scheme']

data/lib/command/binary.rb

@@ -9,9 +9,28 @@ module Pod
   class Command
     class Binary < Command
       self.abstract_command = true
+      def self.options
+        [
+          ["--repo", "Cache repo (in accordance with `cache_repo` in `config_cocoapods_binary_cache`)"]
+        ]
+      end
+
+      def initialize(argv)
+        super
+        load_podfile
+        update_cli_config(:repo => argv.option("repo"))
+      end
 
       def prebuild_config
-        @prebuild_config ||= PodPrebuild::Config.instance
+        @prebuild_config ||= PodPrebuild.config
+      end
+
+      def load_podfile
+        Pod::Config.instance.podfile
+      end
+
+      def update_cli_config(options)
+        PodPrebuild.config.cli_config.merge!(options)
       end
     end
   end

data/lib/command/config.rb

@@ -1,31 +1,172 @@
 require_relative "../cocoapods-binary-cache/helper/json"
 
 module PodPrebuild
+  def self.config
+    PodPrebuild::Config.instance
+  end
+
   class Config
-    attr_reader :cache_repo, :cache_path, :prebuild_path, :prebuild_delta_path
+    attr_accessor :dsl_config, :cli_config
 
     def initialize(path)
-      @data = PodPrebuild::JSONFile.new(path)
-      @cache_repo = @data["cache_repo"] || @data["prebuilt_cache_repo"]
-      @cache_path = File.expand_path(@data["cache_path"])
-      @prebuild_path = @data["prebuild_path"] || "_Prebuild"
-      @prebuild_delta_path = @data["prebuild_delta_path"] || "_Prebuild_delta/changes.json"
+      @deprecated_config = File.exist?(path) ? PodPrebuild::JSONFile.new(path).data : {}
+      @dsl_config = {}
+      @cli_config = {}
     end
 
     def self.instance
       @instance ||= new("PodBinaryCacheConfig.json")
     end
 
+    def reset!
+      @deprecated_config = {}
+      @dsl_config = {}
+      @cli_config = {}
+    end
+
+    def cache_repo
+      @cache_repo ||= cache_repo_config["remote"]
+    end
+
+    def cache_path
+      @cache_path ||= File.expand_path(cache_repo_config["local"])
+    end
+
+    def prebuild_sandbox_path
+      @dsl_config[:prebuild_sandbox_path] || @deprecated_config["prebuild_path"] || "_Prebuild"
+    end
+
+    def prebuild_delta_path
+      @dsl_config[:prebuild_delta_path] || @deprecated_config["prebuild_delta_path"] || "_Prebuild_delta/changes.json"
+    end
+
     def manifest_path(in_cache: false)
       root_dir(in_cache) + "/Manifest.lock"
     end
 
     def root_dir(in_cache)
-      in_cache ? @cache_path : @prebuild_path
+      in_cache ? cache_path : prebuild_sandbox_path
     end
 
     def generated_frameworks_dir(in_cache: false)
       root_dir(in_cache) + "/GeneratedFrameworks"
     end
+
+    def prebuilt_path(path: nil)
+      path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}"
+    end
+
+    def validate_dsl_config
+      inapplicable_options = @dsl_config.keys - applicable_dsl_config
+      return if inapplicable_options.empty?
+
+      message = <<~HEREDOC
+        [WARNING] The following options (in `config_cocoapods_binary_cache`) are not correct: #{inapplicable_options}.
+        Available options: #{applicable_dsl_config}.
+        Check out the following doc for more details
+          https://github.com/grab/cocoapods-binary-cache/blob/master/docs/configure_cocoapods_binary_cache.md
+      HEREDOC
+
+      Pod::UI.puts message.yellow
+    end
+
+    def prebuild_config
+      @cli_config[:prebuild_config] || @dsl_config[:prebuild_config] || "Debug"
+    end
+
+    def prebuild_job?
+      @cli_config[:prebuild_job] || @dsl_config[:prebuild_job]
+    end
+
+    def prebuild_all_pods?
+      @cli_config[:prebuild_all_pods] || @dsl_config[:prebuild_all_pods]
+    end
+
+    def excluded_pods
+      @dsl_config[:excluded_pods] || Set.new
+    end
+
+    def dev_pods_enabled?
+      @dsl_config[:dev_pods_enabled]
+    end
+
+    def bitcode_enabled?
+      @dsl_config[:bitcode_enabled]
+    end
+
+    def device_build_enabled?
+      @dsl_config[:device_build_enabled]
+    end
+
+    def disable_dsym?
+      @dsl_config[:disable_dsym]
+    end
+
+    def dont_remove_source_code?
+      @dsl_config[:dont_remove_source_code]
+    end
+
+    def build_args
+      @dsl_config[:build_args]
+    end
+
+    def save_cache_validation_to
+      @dsl_config[:save_cache_validation_to]
+    end
+
+    def validate_prebuilt_settings
+      @dsl_config[:validate_prebuilt_settings]
+    end
+
+    def prebuild_code_gen
+      @dsl_config[:prebuild_code_gen]
+    end
+
+    def targets_to_prebuild_from_cli
+      @cli_config[:prebuild_targets] || []
+    end
+
+    private
+
+    def applicable_dsl_config
+      [
+        :cache_repo,
+        :prebuild_sandbox_path,
+        :prebuild_delta_path,
+        :prebuild_config,
+        :prebuild_job,
+        :prebuild_all_pods,
+        :excluded_pods,
+        :dev_pods_enabled,
+        :bitcode_enabled,
+        :device_build_enabled,
+        :disable_dsym,
+        :dont_remove_source_code,
+        :build_args,
+        :save_cache_validation_to,
+        :validate_prebuilt_settings,
+        :prebuild_code_gen
+      ]
+    end
+
+    def cache_repo_config
+      @cache_repo_config ||= begin
+        repo = @cli_config[:repo] || "default"
+        config_ = @dsl_config[:cache_repo] || {}
+        if config_[repo].nil?
+          message = <<~HEREDOC
+            [Deprecated] Configs in `PodBinaryCacheConfig.json` are deprecated.
+            Declare option `cache_repo` in `config_cocoapods_binary_cache` instead.
+            Check out the following doc for more details
+              https://github.com/grab/cocoapods-binary-cache/blob/master/docs/configure_cocoapods_binary_cache.md
+          HEREDOC
+          Pod::UI.puts message.yellow
+        end
+        config_[repo] || {
+          "remote" => @deprecated_config["cache_repo"] || @deprecated_config["prebuilt_cache_repo"],
+          "local" => @deprecated_config["cache_path"] || "~/.cocoapods-binary-cache/prebuilt-frameworks"
+        }
+      end
+    end
   end
 end

data/lib/command/executor/fetcher.rb

@@ -31,9 +31,9 @@ module PodPrebuild
     end
 
     def unzip_cache
-      Pod::UI.puts "Unzipping cache: #{@config.cache_path} -> #{@config.prebuild_path}".green
-      FileUtils.rm_rf(@config.prebuild_path)
-      FileUtils.mkdir_p(@config.prebuild_path)
+      Pod::UI.puts "Unzipping cache: #{@config.cache_path} -> #{@config.prebuild_sandbox_path}".green
+      FileUtils.rm_rf(@config.prebuild_sandbox_path)
+      FileUtils.mkdir_p(@config.prebuild_sandbox_path)
 
       if File.exist?(@config.manifest_path(in_cache: true))
         FileUtils.cp(

data/lib/command/fetch.rb

@@ -5,7 +5,6 @@ module Pod
     class Binary < Command
       class Fetch < Binary
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
-
         def initialize(argv)
           super
           @fetcher = PodPrebuild::CacheFetcher.new(

data/lib/command/prebuild.rb

@@ -8,16 +8,23 @@ module Pod
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
         def self.options
           [
+            ["--config", "Config (Debug, Test...) to prebuild"],
             ["--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"]
-          ]
+          ].concat(super)
         end
 
         def initialize(argv)
           super
-          @prebuild_all_pods = argv.flag?("all")
-          @prebuild_targets = argv.option("targets", "").split(",")
+          prebuild_all_pods = argv.flag?("all")
+          prebuild_targets = argv.option("targets", "").split(",")
+          update_cli_config(
+            :prebuild_job => true,
+            :prebuild_all_pods => prebuild_all_pods,
+            :prebuild_config => argv.option("config")
+          )
+          update_cli_config(:prebuild_targets => prebuild_targets) unless prebuild_all_pods
           @prebuilder = PodPrebuild::CachePrebuilder.new(
             config: prebuild_config,
             cache_branch: argv.shift_argument || "master",
@@ -26,9 +33,6 @@ module Pod
         end
 
         def run
-          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

data/lib/command/push.rb

@@ -5,7 +5,6 @@ module Pod
     class Binary < Command
       class Push < Binary
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
-
         def initialize(argv)
           super
           @pusher = PodPrebuild::CachePusher.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -70,14 +70,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency