cocoapods-binary-cache 0.1.8 → 0.1.13

data/lib/cocoapods-binary-cache/pod-rome/xcodebuild_raw.rb

@@ -1,43 +1,58 @@
 require "fourflusher"
 
-PLATFORM_OF_SDK = {
-  "iphonesimulator" => "iOS",
-  "appletvsimulator" => "tvOS",
-  "watchsimulator" => "watchOS"
-}.freeze
+module PodPrebuild
+  class XcodebuildCommand
+    PLATFORM_OF_SDK = {
+      "iphonesimulator" => "iOS",
+      "appletvsimulator" => "tvOS",
+      "watchsimulator" => "watchOS"
+    }.freeze
 
-def xcodebuild(options)
-  sdk = options[:sdk] || "iphonesimulator"
-  platform = PLATFORM_OF_SDK[sdk]
+    DESTINATION_OF_SDK = {
+      "iphoneos" => "\"generic/platform=iOS\"",
+      "iphonesimulator" => "\"generic/platform=iOS Simulator\""
+    }.freeze
 
-  cmd = ["xcodebuild"]
-  cmd << "-project" << options[:sandbox].project_path.realdirpath
-  cmd << "-scheme" << options[:target]
-  cmd << "-configuration" << options[:configuration]
-  cmd << "-sdk" << sdk
-  cmd << Fourflusher::SimControl.new.destination(:oldest, platform, options[:deployment_target]) unless platform.nil?
-  cmd += options[:args] if options[:args]
-  cmd << "2>&1"
-  cmd = cmd.join(" ")
+    def self.xcodebuild(options)
+      sdk = options[:sdk] || "iphonesimulator"
+      targets = options[:targets] || [options[:target]]
+      platform = PLATFORM_OF_SDK[sdk]
 
-  Pod::UI.puts_indented "$ #{cmd}"
-  log = `#{cmd}`
+      cmd = ["xcodebuild"]
+      cmd << "-project" << options[:sandbox].project_path.realdirpath.shellescape
+      targets.each { |target| cmd << "-target" << target }
+      cmd << "-configuration" << options[:configuration]
+      cmd << "-sdk" << sdk
+      if DESTINATION_OF_SDK.key?(sdk)
+        cmd << "-destination" << DESTINATION_OF_SDK[sdk]
+      else
+        unless platform.nil?
+          cmd << Fourflusher::SimControl.new.destination(:oldest, platform, options[:deployment_target])
+        end
+      end
+      cmd += options[:args] if options[:args]
+      cmd << "build"
+      cmd << "2>&1"
+      cmd = cmd.join(" ")
+
+      Pod::UI.puts_indented "$ #{cmd}" unless PodPrebuild.config.silent_build?
 
-  succeeded = $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
-  unless succeeded
-    begin
-      raise "Unexpected error" unless log.include?("** BUILD FAILED **")
+      log = `#{cmd}`
+      return if $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
 
-      require "xcpretty" # TODO (thuyen): Revise this dependency
-      # use xcpretty to print build log
-      # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
-      printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => "auto"})
-      log.each_line do |line|
-        printer.pretty_print(line)
+      begin
+        require "xcpretty" # TODO (thuyen): Revise this dependency
+        # use xcpretty to print build log
+        # 64 represent command invalid. http://www.manpagez.com/man/3/sysexits/
+        printer = XCPretty::Printer.new({:formatter => XCPretty::Simple, :colorize => "auto"})
+        log.each_line do |line|
+          printer.pretty_print(line)
+        end
+      rescue
+        Pod::UI.puts log.red
+      ensure
+        raise "Fail to build targets: #{targets}"
       end
-    rescue
-      Pod::UI.puts log.red
     end
   end
-  [succeeded, log]
 end

data/lib/command/config.rb

@@ -29,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
@@ -54,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
@@ -99,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
@@ -127,6 +137,10 @@ module PodPrebuild
       @dsl_config[:strict_diagnosis]
     end
 
+    def silent_build?
+      @dsl_config[:silent_build]
+    end
+
     def targets_to_prebuild_from_cli
       @cli_config[:prebuild_targets] || []
     end
@@ -161,13 +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,
-        :strict_diagnosis
+        :strict_diagnosis,
+        :silent_build
       ]
     end
 

data/lib/command/executor/base.rb

@@ -2,6 +2,7 @@ module PodPrebuild
   class CommandExecutor
     def initialize(options)
       @config = options[:config]
+      prepare_cache_dir
     end
 
     def installer
@@ -11,13 +12,22 @@ module PodPrebuild
       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 = {})
       comps = ["git"]
       comps << "-C" << @config.cache_path unless options[:cache_repo] == false
       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,28 +4,30 @@ 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
+        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/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.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-02-16 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
@@ -125,7 +139,6 @@ 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
@@ -153,7 +166,6 @@ files:
 - 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/helper/prebuild_order.rb

@@ -1,12 +0,0 @@
-module PodPrebuild
-  module BuildOrder
-    def self.order_targets(targets)
-      # It's more efficient to build frameworks that have more dependencies first
-      # so that the build parallelism is ultilized
-      # >> --- MyFramework ----------------------------------|
-      #        >> --- ADependency ---|
-      #          >> --- AnotherADependency ---|
-      targets.sort_by { |t| -t.recursive_dependent_targets.count }
-    end
-  end
-end

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

@@ -1,36 +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
-    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, ".*")
-      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"
-
-      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