cocoapods-binary-cache 0.1.7 → 0.1.12

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

@@ -16,7 +16,7 @@ module PodPrebuild
     end
 
     def clean_delta_file
-      puts "Clean delta file: #{prebuild_delta_path}"
+      Pod::UI.message "Clean delta file: #{prebuild_delta_path}"
       FileUtils.rm_rf(prebuild_delta_path)
     end
 
@@ -24,14 +24,16 @@ module PodPrebuild
       FileUtils.mkdir_p dir unless File.directory?(dir)
     end
 
-    # Input 2 arrays of library names
-    def write_delta_file(updated, deleted)
+    def write_delta_file(options)
+      updated = options[:updated]
+      deleted = options[:deleted]
+
       if updated.empty? && deleted.empty?
         Pod::UI.puts "No changes in prebuild"
         return
       end
 
-      Pod::UI.puts "Write prebuild changes to: #{prebuild_delta_path}"
+      Pod::UI.message "Write prebuild changes to: #{prebuild_delta_path}"
       create_dir_if_needed(delta_dir)
       changes = PodPrebuild::JSONFile.new(prebuild_delta_path)
       changes["updated"] = updated

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

@@ -1,11 +1,21 @@
 module PodPrebuild
-  class StateStore
-    @excluded_pods = Set.new
-    @cache_validation = CacheValidationResult.new
+  def self.state
+    @state ||= State.new
+  end
+
+  class State
+    def initialize
+      @store = {
+        :cache_validation => CacheValidationResult.new
+      }
+    end
+
+    def update(data)
+      @store.merge!(data)
+    end
 
-    class << self
-      attr_accessor :excluded_pods
-      attr_accessor :cache_validation
+    def cache_validation
+      @store[:cache_validation]
     end
   end
 end

data/lib/command/config.rb

@@ -5,13 +5,14 @@ module PodPrebuild
     PodPrebuild::Config.instance
   end
 
-  class Config
+  class Config # rubocop:disable Metrics/ClassLength
     attr_accessor :dsl_config, :cli_config
 
     def initialize(path)
       @deprecated_config = File.exist?(path) ? PodPrebuild::JSONFile.new(path).data : {}
       @dsl_config = {}
       @cli_config = {}
+      @detected_config = {}
     end
 
     def self.instance
@@ -28,6 +29,10 @@ module PodPrebuild
       @cache_repo ||= cache_repo_config["remote"]
     end
 
+    def local_cache?
+      cache_repo.nil?
+    end
+
     def cache_path
       @cache_path ||= File.expand_path(cache_repo_config["local"])
     end
@@ -53,7 +58,9 @@ module PodPrebuild
     end
 
     def prebuilt_path(path: nil)
-      path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}"
+      p = Pathname.new(path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}")
+      p = p.sub_ext(".xcframework") if xcframework? && p.extname == ".framework"
+      p.to_s
     end
 
     def validate_dsl_config
@@ -83,7 +90,7 @@ module PodPrebuild
     end
 
     def excluded_pods
-      @dsl_config[:excluded_pods] || Set.new
+      ((@dsl_config[:excluded_pods] || Set.new) + (@detected_config[:excluded_pods] || Set.new)).to_set
     end
 
     def dev_pods_enabled?
@@ -98,6 +105,10 @@ module PodPrebuild
       @dsl_config[:device_build_enabled]
     end
 
+    def xcframework?
+      @dsl_config[:xcframework]
+    end
+
     def disable_dsym?
       @dsl_config[:disable_dsym]
     end
@@ -122,10 +133,34 @@ module PodPrebuild
       @dsl_config[:prebuild_code_gen]
     end
 
+    def strict_diagnosis?
+      @dsl_config[:strict_diagnosis]
+    end
+
+    def silent_build?
+      @dsl_config[:silent_build]
+    end
+
     def targets_to_prebuild_from_cli
       @cli_config[:prebuild_targets] || []
     end
 
+    def update_detected_prebuilt_pod_names!(value)
+      @detected_config[:prebuilt_pod_names] = value
+    end
+
+    def update_detected_excluded_pods!(value)
+      @detected_config[:excluded_pods] = value
+    end
+
+    def prebuilt_pod_names
+      @detected_config[:prebuilt_pod_names] || Set.new
+    end
+
+    def tracked_prebuilt_pod_names
+      prebuilt_pod_names - excluded_pods
+    end
+
     private
 
     def applicable_dsl_config
@@ -140,12 +175,15 @@ module PodPrebuild
         :dev_pods_enabled,
         :bitcode_enabled,
         :device_build_enabled,
+        :xcframework,
         :disable_dsym,
         :dont_remove_source_code,
         :build_args,
         :save_cache_validation_to,
         :validate_prebuilt_settings,
-        :prebuild_code_gen
+        :prebuild_code_gen,
+        :strict_diagnosis,
+        :silent_build
       ]
     end
 

data/lib/command/executor/base.rb

@@ -2,6 +2,22 @@ module PodPrebuild
   class CommandExecutor
     def initialize(options)
       @config = options[:config]
+      prepare_cache_dir
+    end
+
+    def installer
+      @installer ||= begin
+        pod_config = Pod::Config.instance
+        Pod::Installer.new(pod_config.sandbox, pod_config.podfile, pod_config.lockfile)
+      end
+    end
+
+    def use_local_cache?
+      @config.cache_repo.nil?
+    end
+
+    def prepare_cache_dir
+      FileUtils.mkdir_p(@config.cache_path) if @config.cache_path
     end
 
     def git(cmd, options = {})
@@ -10,7 +26,8 @@ module PodPrebuild
       comps << cmd
       comps << "&> /dev/null" if options[:ignore_output]
       comps << "|| true" if options[:can_fail]
-      `#{comps.join(" ")}`
+      cmd = comps.join(" ")
+      raise "Fail to run command '#{cmd}'" unless system(cmd)
     end
 
     def git_clone(cmd, options = {})

data/lib/command/executor/fetcher.rb

@@ -1,8 +1,11 @@
+require "parallel"
 require_relative "base"
 require_relative "../helper/zip"
 
 module PodPrebuild
   class CacheFetcher < CommandExecutor
+    attr_reader :cache_branch
+
     def initialize(options)
       super(options)
       @cache_branch = options[:cache_branch]
@@ -10,14 +13,28 @@ module PodPrebuild
 
     def run
       Pod::UI.step("Fetching cache") do
-        fetch_cache(@config.cache_repo, @cache_branch, @config.cache_path)
+        if @config.local_cache?
+          print_message_for_local_cache(@config.cache_path)
+        else
+          fetch_remote_cache(@config.cache_repo, @cache_branch, @config.cache_path)
+        end
         unzip_cache
       end
     end
 
     private
 
-    def fetch_cache(repo, branch, dest_dir)
+    def print_message_for_local_cache(cache_dir)
+      Pod::UI.puts "You're using local cache at: #{cache_dir}.".yellow
+      message = <<~HEREDOC
+        To enable remote cache (with a git repo), add the `remote` field to the repo config in the `cache_repo` option.
+        For more details, check out this doc:
+          https://github.com/grab/cocoapods-binary-cache/blob/master/docs/configure_cocoapods_binary_cache.md#cache_repo-
+      HEREDOC
+      Pod::UI.puts message
+    end
+
+    def fetch_remote_cache(repo, branch, dest_dir)
       Pod::UI.puts "Fetching cache from #{repo} (branch: #{branch})".green
       if Dir.exist?(dest_dir + "/.git")
         git("fetch origin #{branch}")
@@ -41,7 +58,8 @@ module PodPrebuild
           @config.manifest_path
         )
       end
-      Dir[@config.generated_frameworks_dir(in_cache: true) + "/*.zip"].each do |path|
+      zip_paths = Dir[@config.generated_frameworks_dir(in_cache: true) + "/*.zip"]
+      Parallel.each(zip_paths, in_threads: 8) do |path|
         ZipUtils.unzip(path, to_dir: @config.generated_frameworks_dir)
       end
     end

data/lib/command/executor/prebuilder.rb

@@ -4,29 +4,31 @@ require_relative "pusher"
 
 module PodPrebuild
   class CachePrebuilder < CommandExecutor
+    attr_reader :repo_update, :fetcher, :pusher
+
     def initialize(options)
       super(options)
-      @cache_branch = options[:cache_branch]
-      @push_cache = options[:push_cache]
-      @fetcher = PodPrebuild::CacheFetcher.new(options)
-      @pusher = PodPrebuild::CachePusher.new(options)
+      @repo_update = options[:repo_update]
+      @fetcher = PodPrebuild::CacheFetcher.new(options) unless options[:no_fetch]
+      @pusher = PodPrebuild::CachePusher.new(options) if options[:push_cache]
     end
 
     def run
-      @fetcher.run
+      @fetcher&.run
       prebuild
       changes = PodPrebuild::JSONFile.new(@config.prebuild_delta_path)
       return if changes.empty?
 
       sync_cache(changes)
-      @pusher.run if @push_cache
+      @pusher&.run
     end
 
     private
 
     def prebuild
       Pod::UI.step("Installation") do
-        Pod::Command::Install.new(CLAide::ARGV.new([])).run
+        installer.repo_update = @repo_update
+        installer.install!
       end
     end
 

data/lib/command/executor/pusher.rb

@@ -2,6 +2,8 @@ require_relative "base"
 
 module PodPrebuild
   class CachePusher < CommandExecutor
+    attr_reader :cache_branch
+
     def initialize(options)
       super(options)
       @cache_branch = options[:cache_branch]
@@ -9,11 +11,25 @@ module PodPrebuild
 
     def run
       Pod::UI.step("Pushing cache") do
-        commit_message = "Update prebuilt cache".shellescape
-        git("add .")
-        git("commit -m '#{commit_message}'")
-        git("push origin #{@cache_branch}")
+        if @config.local_cache?
+          print_message_for_local_cache
+        else
+          commit_and_push_cache
+        end
       end
     end
+
+    private
+
+    def print_message_for_local_cache
+      Pod::UI.puts "Skip pushing cache as you're using local cache".yellow
+    end
+
+    def commit_and_push_cache
+      commit_message = "Update prebuilt cache"
+      git("add .")
+      git("commit -m '#{commit_message}'")
+      git("push origin #{@cache_branch}")
+    end
   end
 end

data/lib/command/executor/visualizer.rb

@@ -13,8 +13,9 @@ module PodPrebuild
     def run
       FileUtils.mkdir_p(@output_dir)
       graph = DependenciesGraph.new(@lockfile)
-      graph.write_graphic_file("png", "#{@output_dir}/graph", Set.new)
-      `open #{@output_dir}/graph.png` if @open
+      output_path = "#{@output_dir}/graph.png"
+      graph.write_graphic_file(output_path: output_path)
+      system("open #{@output_path}") if @open
     end
   end
 end

data/lib/command/prebuild.rb

@@ -5,10 +5,14 @@ module Pod
   class Command
     class Binary < Command
       class Prebuild < Binary
+        attr_reader :prebuilder
+
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
         def self.options
           [
             ["--config", "Config (Debug, Test...) to prebuild"],
+            ["--repo-update", "Update pod repo before installing"],
+            ["--no-fetch", "Do not perform a cache fetch beforehand"],
             ["--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"]
@@ -28,6 +32,8 @@ module Pod
           @prebuilder = PodPrebuild::CachePrebuilder.new(
             config: prebuild_config,
             cache_branch: argv.shift_argument || "master",
+            repo_update: argv.flag?("repo-update"),
+            no_fetch: argv.flag?("fetch") == false,
             push_cache: argv.flag?("push")
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,9 +146,7 @@ files:
 - 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
 - lib/cocoapods-binary-cache/pod-binary/helper/names.rb
-- lib/cocoapods-binary-cache/pod-binary/helper/passer.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/podfile_options.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/prebuild_sandbox.rb
 - lib/cocoapods-binary-cache/pod-binary/helper/target_checker.rb
@@ -142,20 +154,18 @@ files:
 - lib/cocoapods-binary-cache/pod-binary/integration/alter_specs.rb
 - lib/cocoapods-binary-cache/pod-binary/integration/patch/embed_framework_script.rb
 - lib/cocoapods-binary-cache/pod-binary/integration/patch/resolve_dependencies.rb
+- lib/cocoapods-binary-cache/pod-binary/integration/patch/sandbox_analyzer_state.rb
 - lib/cocoapods-binary-cache/pod-binary/integration/patch/source_installation.rb
-- lib/cocoapods-binary-cache/pod-binary/integration/remove_target_files.rb
 - lib/cocoapods-binary-cache/pod-binary/integration/source_installer.rb
 - lib/cocoapods-binary-cache/pod-binary/integration/validation.rb
 - lib/cocoapods-binary-cache/pod-binary/prebuild.rb
 - lib/cocoapods-binary-cache/pod-binary/prebuild_dsl.rb
 - 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/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
 - lib/cocoapods-binary-cache/state_store.rb
 - lib/cocoapods-binary-cache/ui.rb
 - lib/cocoapods_plugin.rb

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

@@ -1,52 +0,0 @@
-require_relative "../tool/tool"
-require_relative "prebuild_sandbox"
-
-module Pod
-  # a force disable option for integral
-  class Installer
-    def self.force_disable_integration(value)
-      @@force_disable_integration = value
-    end
-
-    old_method = instance_method(:integrate_user_project)
-    define_method(:integrate_user_project) do
-      if @@force_disable_integration
-        return
-      end
-      old_method.bind(self).()
-    end
-  end
-
-  # a option to disable install complete message
-  class Installer
-    def self.disable_install_complete_message(value)
-      @@disable_install_complete_message = value
-    end
-
-    old_method = instance_method(:print_post_install_message)
-    define_method(:print_post_install_message) do
-      if @@disable_install_complete_message
-        return
-      end
-      old_method.bind(self).()
-    end
-  end
-
-  # option to disable write lockfiles
-  class Config
-    @@force_disable_write_lockfile = false
-    def self.force_disable_write_lockfile(value)
-      @@force_disable_write_lockfile = value
-    end
-
-    old_method = instance_method(:lockfile_path)
-    define_method(:lockfile_path) do
-      if @@force_disable_write_lockfile
-        # As config is a singleton, sandbox_root refer to the standard sandbox.
-        return PrebuildSandbox.from_standard_sanbox_path(sandbox_root).root + "Manifest.lock.tmp"
-      else
-        return old_method.bind(self).()
-      end
-    end
-  end
-end