cocoapods-binary-cache 0.1.7 → 0.1.8

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

@@ -1,35 +1,36 @@
 # Copyright 2019 Grabtaxi Holdings PTE LTE (GRAB), All rights reserved.
 # Use of this source code is governed by an MIT-style license that can be found in the LICENSE file
 
-require 'rexml/document'
+require "rexml/document"
 
 class SchemeEditor
   def self.edit_to_support_code_coverage(sandbox)
     pod_proj_path = sandbox.project_path
-    puts "Modify schemes of pod project to support code coverage of prebuilt local pod: #{pod_proj_path}"
+    Pod::UI.message "Modify schemes of pod project to support code coverage of prebuilt local pod: #{pod_proj_path}"
     scheme_files = Dir["#{pod_proj_path}/**/*.xcscheme"]
     scheme_files.each do |file_path|
-      scheme_name = File.basename(file_path, '.*')
+      scheme_name = File.basename(file_path, ".*")
       next unless sandbox.local?(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']
-      test_action = scheme.elements['TestAction']
-      next if test_action.attributes['codeCoverageEnabled'] == 'YES'
+      doc = File.open(file_path, "r") { |f| REXML::Document.new(f) }
+      scheme = doc.elements["Scheme"]
+      test_action = scheme.elements["TestAction"]
+      next if test_action.attributes["codeCoverageEnabled"] == "YES"
 
-      test_action.add_attribute('codeCoverageEnabled', 'YES')
-      test_action.add_attribute('onlyGenerateCoverageForSpecifiedTargets', 'YES')
-      coverage_targets = REXML::Element.new('CodeCoverageTargets')
-      buildable_ref = scheme.elements['BuildAction'] \
-                            .elements['BuildActionEntries'] \
-                            .elements['BuildActionEntry'] \
-                            .elements['BuildableReference']
+      test_action.add_attribute("codeCoverageEnabled", "YES")
+      test_action.add_attribute("onlyGenerateCoverageForSpecifiedTargets", "YES")
+      coverage_targets = REXML::Element.new("CodeCoverageTargets")
+      buildable_ref = scheme
+        .elements["BuildAction"]
+        .elements["BuildActionEntries"]
+        .elements["BuildActionEntry"]
+        .elements["BuildableReference"]
       new_buildable_ref = buildable_ref.clone # Need to clone, otherwise the original one will be move to new place
       coverage_targets.add_element(new_buildable_ref)
       test_action.add_element(coverage_targets)
-      File.open(file_path, 'w') { |f| doc.write(f) }
+      File.open(file_path, "w") { |f| doc.write(f) }
     end
   end
 end

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
@@ -83,7 +84,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?
@@ -122,10 +123,30 @@ module PodPrebuild
       @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
@@ -145,7 +166,8 @@ module PodPrebuild
         :build_args,
         :save_cache_validation_to,
         :validate_prebuilt_settings,
-        :prebuild_code_gen
+        :prebuild_code_gen,
+        :strict_diagnosis
       ]
     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/prebuilder.rb

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

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.8
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -125,6 +125,7 @@ files:
 - 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
@@ -132,9 +133,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,14 +141,13 @@ 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

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

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

@@ -1,25 +0,0 @@
-require_relative "../tool/tool"
-
-module Pod
-  class Prebuild
-    # Pass the data between the 2 steps
-    #
-    # At step 2, the normal pod install, it needs some info of the
-    # prebuilt step. So we store it here.
-    #
-    class Passer
-      # indicate the add/remove/update of prebuit pods
-      # @return [Analyzer::SpecsState]
-      #
-      class_attr_accessor :prebuild_pods_changes
-
-      # Some pod won't be build in prebuild stage even if it have `binary=>true`.
-      # The targets of this pods have `oshould_build? == true`.
-      # We should skip integration (patch spec) for this pods
-      #
-      # @return [Array<String>]
-      class_attr_accessor :target_names_to_skip_integration_framework
-      self.target_names_to_skip_integration_framework = []
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module Pod
-  class Installer
-    # Remove the old target files if prebuild frameworks changed
-    def remove_target_files_if_needed
-      changes = Pod::Prebuild::Passer.prebuild_pods_changes
-      updated_names = []
-      if changes.nil?
-        updated_names = PrebuildSandbox.from_standard_sandbox(sandbox).exsited_framework_pod_names
-      else
-        added = changes.added
-        changed = changes.changed
-        deleted = changes.deleted
-        updated_names = added + changed + deleted
-      end
-
-      updated_names.each do |name|
-        root_name = Specification.root_name(name)
-        next if sandbox.local?(root_name)
-
-        UI.message "Delete cached files: #{root_name}"
-        target_path = sandbox.pod_dir(root_name)
-        target_path.rmtree if target_path.exist?
-
-        support_path = sandbox.target_support_files_dir(root_name)
-        support_path.rmtree if support_path.exist?
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-# attr_accessor for class variable.
-# usage:
-#
-#   ```
-#   class Pod
-#       class_attr_accessor :is_prebuild_stage
-#   end
-#   ```
-#
-def class_attr_accessor(symbol)
-  self.class.send(:attr_accessor, symbol)
-end