cocoapods-binary-cache 0.1.6 → 0.1.11

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

@@ -5,30 +5,40 @@ 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"]
-          ]
+          ].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",
+            repo_update: argv.flag?("repo-update"),
+            no_fetch: argv.flag?("fetch") == false,
             push_cache: argv.flag?("push")
           )
         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.11
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-11-15 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
@@ -132,9 +132,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 +140,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

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

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

@@ -1,35 +0,0 @@
-# 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'
-
-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}"
-    scheme_files = Dir["#{pod_proj_path}/**/*.xcscheme"]
-    scheme_files.each do |file_path|
-      scheme_name = File.basename(file_path, '.*')
-      next unless sandbox.local?(scheme_name)
-
-      puts "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'
-
-      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) }
-    end
-  end
-end