cocoapods-binary-cache 0.1.5 → 0.1.10

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,24 +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
           [
-            ["--push", "Push cache to repo upon completion"]
-          ]
+            ["--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(",")
+          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.prebuild_job = true
           @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.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Bang Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2020-11-03 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
@@ -129,11 +129,10 @@ 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
 - 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
@@ -141,19 +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/build_framework.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
 - lib/cocoapods-binary-cache/state_store.rb
 - lib/cocoapods-binary-cache/ui.rb
 - lib/cocoapods_plugin.rb
@@ -188,7 +186,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/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/pod-rome/build_framework.rb

@@ -1,248 +0,0 @@
-require 'fourflusher'
-require 'xcpretty' # TODO (thuyen): Revise this dependency
-
-module FileUtils
-  def self.mvpath(src, dst, **options)
-    FileUtils.rm_rf(File.join(dst, File.basename(src)))
-    FileUtils.mv(src, dst, **options)
-  end
-end
-
-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.mvpath tmp_lipoed_binary_path, device_binary
-
-  # 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.mvpath tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}"
-    end
-    FileUtils.mvpath device_dsym, output_path
-  end
-
-  # output
-  output_path.mkpath unless output_path.exist?
-  FileUtils.mvpath device_framework_path, output_path
-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
-    def self.build(options)
-      sandbox_root_path = options[:sandbox_root_path]
-      target = options[:target]
-      configuration = options[:configuration]
-      output_path = options[:output_path]
-      bitcode_enabled = options[:bitcode_enabled] || false
-      device_build_enabled = options[:device_build_enabled] || false
-      custom_build_options = options[:custom_build_options] || []
-      custom_build_options_simulator = 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,
-          device_build_enabled
-        )
-      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,
-          device_build_enabled
-        )
-      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