cocoapods-binary-cache 0.1.2 → 0.1.8

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

@@ -2,16 +2,35 @@ require "fileutils"
 require_relative "config"
 require_relative "fetch"
 require_relative "prebuild"
+require_relative "push"
 require_relative "visualize"
 
 module Pod
   class Command
     class Binary < Command
       self.abstract_command = true
-      self.default_subcommand = "fetch"
+      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.new("PodBinaryCacheConfig.json")
+        @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,14 +1,44 @@
 require_relative "../cocoapods-binary-cache/helper/json"
 
 module PodPrebuild
-  class Config
-    attr_reader :cache_repo, :cache_path, :prebuild_path
+  def self.config
+    PodPrebuild::Config.instance
+  end
+
+  class Config # rubocop:disable Metrics/ClassLength
+    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"] || "Pods/_Prebuild"
+      @deprecated_config = File.exist?(path) ? PodPrebuild::JSONFile.new(path).data : {}
+      @dsl_config = {}
+      @cli_config = {}
+      @detected_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)
@@ -16,16 +46,149 @@ module PodPrebuild
     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 delta_file_path
-      # TODO (thuyen): Unify this path with PodPrebuild::Output#delta_file_path
-      "Pods/_Prebuild_delta/changes.json"
+    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) + (@detected_config[:excluded_pods] || Set.new)).to_set
+    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 strict_diagnosis?
+      @dsl_config[:strict_diagnosis]
+    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
+      [
+        :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,
+        :strict_diagnosis
+      ]
+    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/base.rb

@@ -4,6 +4,13 @@ module PodPrebuild
       @config = options[:config]
     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 git(cmd, options = {})
       comps = ["git"]
       comps << "-C" << @config.cache_path unless options[:cache_repo] == false

data/lib/command/executor/fetcher.rb

@@ -22,7 +22,7 @@ module PodPrebuild
       if Dir.exist?(dest_dir + "/.git")
         git("fetch origin #{branch}")
         git("checkout -f FETCH_HEAD", ignore_output: true)
-        git("branch -D #{branch} || true", ignore_output: true, can_fail: true)
+        git("branch -D #{branch}", ignore_output: true, can_fail: true)
         git("checkout -b #{branch}")
       else
         FileUtils.rm_rf(dest_dir)
@@ -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/executor/prebuilder.rb

@@ -15,7 +15,7 @@ module PodPrebuild
     def run
       @fetcher.run
       prebuild
-      changes = PodPrebuild::JSONFile.new(@config.delta_file_path)
+      changes = PodPrebuild::JSONFile.new(@config.prebuild_delta_path)
       return if changes.empty?
 
       sync_cache(changes)
@@ -26,7 +26,7 @@ module PodPrebuild
 
     def prebuild
       Pod::UI.step("Installation") do
-        Pod::Command::Install.new(CLAide::ARGV.new([])).run
+        installer.install!
       end
     end
 

data/lib/command/executor/pusher.rb

@@ -12,7 +12,7 @@ module PodPrebuild
         commit_message = "Update prebuilt cache".shellescape
         git("add .")
         git("commit -m '#{commit_message}'")
-        git("push origin head")
+        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/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

@@ -1,4 +1,5 @@
 require_relative "executor/prebuilder"
+require_relative "../cocoapods-binary-cache/pod-binary/prebuild_dsl"
 
 module Pod
   class Command
@@ -7,12 +8,23 @@ module Pod
         self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
         def self.options
           [
-            ["--push", "Push cache to repo upon completion"]
-          ]
+            ["--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(",")
+          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",

data/lib/command/push.rb

@@ -0,0 +1,22 @@
+require_relative "executor/pusher"
+
+module Pod
+  class Command
+    class Binary < Command
+      class Push < Binary
+        self.arguments = [CLAide::Argument.new("CACHE-BRANCH", false)]
+        def initialize(argv)
+          super
+          @pusher = PodPrebuild::CachePusher.new(
+            config: prebuild_config,
+            cache_branch: argv.shift_argument || "master"
+          )
+        end
+
+        def run
+          @pusher.run
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-10-09 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
@@ -115,21 +115,25 @@ files:
 - lib/cocoapods-binary-cache/cache/validator_with_podfile.rb
 - lib/cocoapods-binary-cache/dependencies_graph/dependencies_graph.rb
 - lib/cocoapods-binary-cache/dependencies_graph/graph_visualizer.rb
+- lib/cocoapods-binary-cache/diagnosis/base.rb
+- lib/cocoapods-binary-cache/diagnosis/diagnosis.rb
+- lib/cocoapods-binary-cache/diagnosis/integration.rb
+- lib/cocoapods-binary-cache/env.rb
 - lib/cocoapods-binary-cache/helper/benchmark_show.rb
 - lib/cocoapods-binary-cache/helper/checksum.rb
 - lib/cocoapods-binary-cache/helper/json.rb
 - lib/cocoapods-binary-cache/helper/lockfile.rb
 - lib/cocoapods-binary-cache/helper/path_utils.rb
 - lib/cocoapods-binary-cache/helper/podspec.rb
+- lib/cocoapods-binary-cache/helper/prebuild_order.rb
 - lib/cocoapods-binary-cache/hooks/post_install.rb
 - 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
 - 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
@@ -137,17 +141,16 @@ 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/build_framework.rb
-- lib/cocoapods-binary-cache/prebuild_cache.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
@@ -164,6 +167,7 @@ files:
 - lib/command/fetch.rb
 - lib/command/helper/zip.rb
 - lib/command/prebuild.rb
+- lib/command/push.rb
 - lib/command/visualize.rb
 homepage: https://github.com/grab/cocoapods-binary-cache
 licenses:
@@ -184,7 +188,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,