cocoapods-binary-cache 0.1.1 → 0.1.7

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,11 +31,16 @@ 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)
 
-      FileUtils.cp(@config.manifest_path(in_cache: true), @config.manifest_path)
+      if File.exist?(@config.manifest_path(in_cache: true))
+        FileUtils.cp(
+          @config.manifest_path(in_cache: true),
+          @config.manifest_path
+        )
+      end
       Dir[@config.generated_frameworks_dir(in_cache: true) + "/*.zip"].each do |path|
         ZipUtils.unzip(path, to_dir: @config.generated_frameworks_dir)
       end

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)
@@ -39,6 +39,7 @@ module PodPrebuild
     end
 
     def zip_to_cache(pods_to_update)
+      FileUtils.mkdir_p(@config.generated_frameworks_dir(in_cache: true))
       pods_to_update.each do |pod|
         Pod::UI.puts "- Update cache: #{pod}"
         ZipUtils.zip(

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/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/helper/zip.rb

@@ -5,7 +5,7 @@ module PodPrebuild
       out_path = to_dir.nil? ? "#{basename}.zip" : "#{to_dir}/#{basename}.zip"
       cmd = []
       cmd << "cd" << File.dirname(path)
-      cmd << "&& zip --symlinks" << out_path << basename
+      cmd << "&& zip -r --symlinks" << out_path << basename
       cmd << "&& cd -"
       `#{cmd.join(" ")}`
     end

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.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -39,45 +39,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: xcpretty
+  name: rgl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
-  name: rgl
+  name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   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,7 +115,10 @@ 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/gem_version.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
@@ -126,6 +129,7 @@ files:
 - 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
@@ -147,8 +151,8 @@ files:
 - 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
@@ -165,6 +169,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:
@@ -185,7 +190,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,

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

@@ -1,6 +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
-
-module CocoapodsBinaryCache
-  VERSION = "0.1.1".freeze
-end

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

@@ -1,247 +0,0 @@
-require 'fourflusher'
-require 'xcpretty' # TODO (thuyen): Revise this dependency
-
-PLATFORMS = { 'iphonesimulator' => 'iOS',
-              'appletvsimulator' => 'tvOS',
-              'watchsimulator' => 'watchOS' }
-
-#  Build specific target to framework file
-#  @param [PodTarget] target
-#         a specific pod target
-#
-def build_for_iosish_platform(sandbox, 
-                              build_dir, 
-                              output_path,
-                              target, 
-                              configuration,
-                              device, 
-                              simulator,
-                              bitcode_enabled,
-                              custom_build_options = [], # Array<String>
-                              custom_build_options_simulator = [], # Array<String>
-                              enable_device_build = false
-                              )
-
-  deployment_target = target.platform.deployment_target.to_s
-  
-  target_label = target.label # name with platform if it's used in multiple platforms
-  Pod::UI.puts "Prebuilding #{target_label}..."
-  
-  other_options = []
-  # bitcode enabled
-  other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
-  # make less arch to iphone simulator for faster build
-  custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
-
-  # paths
-  target_name = target.name # equals target.label, like "AFNeworking-iOS" when AFNetworking is used in multiple platforms.
-  module_name = target.product_module_name
-  device_framework_path = "#{build_dir}/#{configuration}-#{device}/#{target_name}/#{module_name}.framework"
-  simulator_framework_path = "#{build_dir}/#{configuration}-#{simulator}/#{target_name}/#{module_name}.framework"
-  simulator_target_products_path = "#{build_dir}/#{configuration}-#{simulator}/#{target_name}"
-
-  if !Dir.exist?(simulator_framework_path)
-    is_succeed, = xcodebuild(
-      sandbox,
-      target_label,
-      configuration,
-      simulator,
-      deployment_target,
-      other_options + custom_build_options_simulator
-    )
-    raise "Build simulator framework failed: #{target_label}" unless is_succeed
-  else
-    puts "Simulator framework already exist at: #{simulator_framework_path}"
-  end
-
-  unless enable_device_build
-    FileUtils.cp_r Dir["#{simulator_target_products_path}/*"], output_path
-    return
-  end
-
-  if !Dir.exist?(device_framework_path)
-    is_succeed, = xcodebuild(
-      sandbox,
-      target_label,
-      configuration,
-      device,
-      deployment_target,
-      other_options + custom_build_options
-    )
-    raise "Build device framework failed: #{target_label}" unless is_succeed
-  else
-    puts "Device framework already exist at: #{device_framework_path}"
-  end
-
-  device_binary = device_framework_path + "/#{module_name}"
-  simulator_binary = simulator_framework_path + "/#{module_name}"
-  return unless File.file?(device_binary) && File.file?(simulator_binary)
-  
-  # the device_lib path is the final output file path
-  # combine the binaries
-  tmp_lipoed_binary_path = "#{build_dir}/#{target_name}"
-  lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_binary} #{simulator_binary}`
-  puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-  FileUtils.mv tmp_lipoed_binary_path, device_binary, :force => true
-  
-  # collect the swiftmodule file for various archs.
-  device_swiftmodule_path = device_framework_path + "/Modules/#{module_name}.swiftmodule"
-  simulator_swiftmodule_path = simulator_framework_path + "/Modules/#{module_name}.swiftmodule"
-  if File.exist?(device_swiftmodule_path)
-    FileUtils.cp_r simulator_swiftmodule_path + "/.", device_swiftmodule_path
-  end
-
-  # combine the generated swift headers
-  # (In xcode 10.2, the generated swift headers vary for each archs)
-  # https://github.com/leavez/cocoapods-binary/issues/58
-  simulator_generated_swift_header_path = simulator_framework_path + "/Headers/#{module_name}-Swift.h"
-  device_generated_swift_header_path = device_framework_path + "/Headers/#{module_name}-Swift.h"
-  if File.exist? simulator_generated_swift_header_path
-    device_header = File.read(device_generated_swift_header_path)
-    simulator_header = File.read(simulator_generated_swift_header_path)
-    # https://github.com/Carthage/Carthage/issues/2718#issuecomment-473870461
-    combined_header_content = %Q{
-#if TARGET_OS_SIMULATOR // merged by cocoapods-binary
-
-#{simulator_header}
-
-#else // merged by cocoapods-binary
-
-#{device_header}
-
-#endif // merged by cocoapods-binary
-}
-    File.write(device_generated_swift_header_path, combined_header_content.strip)
-  end
-
-  # handle the dSYM files
-  device_dsym = "#{device_framework_path}.dSYM"
-  if File.exist? device_dsym
-    # lipo the simulator dsym
-    simulator_dsym = "#{simulator_framework_path}.dSYM"
-    if File.exist? simulator_dsym
-      tmp_lipoed_binary_path = "#{output_path}/#{module_name}.draft"
-      lipo_log = `lipo -create -output #{tmp_lipoed_binary_path} #{device_dsym}/Contents/Resources/DWARF/#{module_name} #{simulator_dsym}/Contents/Resources/DWARF/#{module_name}`
-      puts lipo_log unless File.exist?(tmp_lipoed_binary_path)
-      FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
-    end
-    # move
-    FileUtils.mv device_dsym, output_path, :force => true
-  end
-
-  # output
-  output_path.mkpath unless output_path.exist?
-  FileUtils.mv device_framework_path, output_path, :force => true
-
-end
-
-def xcodebuild(sandbox, target, configuration, sdk='macosx', deployment_target=nil, other_options=[])
-  args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk} )
-  platform = PLATFORMS[sdk]
-  args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
-  args += other_options
-
-  args_str = args.join(" ")
-  cmd = "xcodebuild #{args_str} 2>&1"
-  puts "xcodebuild command: #{cmd}"
-  log = `#{cmd}`
-
-  exit_code = $?.exitstatus  # Process::Status
-  is_succeed = (exit_code == 0)
-
-  if !is_succeed
-    begin
-        if log.include?('** BUILD FAILED **')
-            # 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
-        else
-            raise "shouldn't be handle by xcpretty"
-        end
-    rescue
-        puts log.red
-    end
-  end
-  [is_succeed, log]
-end
-
-
-
-module Pod
-  class Prebuild
-
-    # Build the frameworks with sandbox and targets
-    #
-    # @param  [String] sandbox_root_path
-    #         The sandbox root path where the targets project place
-    #
-    #         [PodTarget] target
-    #         The pod targets to build
-    #
-    #         [Pathname] output_path
-    #         output path for generated frameworks
-    #
-    def self.build(sandbox_root_path, target, configuration, output_path, bitcode_enabled = false, custom_build_options=[], custom_build_options_simulator=[])
-      return if target.nil?
-
-      sandbox_root = Pathname(sandbox_root_path)
-      sandbox = Pod::Sandbox.new(sandbox_root)
-      build_dir = self.build_dir(sandbox_root)
-
-      # -- build the framework
-      case target.platform.name
-      when :ios
-        build_for_iosish_platform(
-          sandbox,
-          build_dir,
-          output_path,
-          target,
-          configuration,
-          "iphoneos",
-          "iphonesimulator",
-          bitcode_enabled,
-          custom_build_options,
-          custom_build_options_simulator
-        )
-      when :osx
-        xcodebuild(
-          sandbox,
-          target.label,
-          configuration,
-          "macosx",
-          nil,
-          custom_build_options
-        )
-      # when :tvos then build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator')
-      when :watchos
-        build_for_iosish_platform(
-          sandbox,
-          build_dir,
-          output_path,
-          target,
-          configuration,
-          "watchos",
-          "watchsimulator",
-          true,
-          custom_build_options,
-          custom_build_options_simulator
-        )
-      else raise "Unsupported platform for '#{target.name}': '#{target.platform.name}'" end
-
-      raise Pod::Informative, "The build directory was not found in the expected location" unless build_dir.directory?
-    end
-
-    def self.remove_build_dir(sandbox_root)
-      path = build_dir(sandbox_root)
-      path.rmtree if path.exist?
-    end
-
-    def self.build_dir(sandbox_root)
-      sandbox_root.parent + "build"
-    end
-
-  end
-end