cocoapods-dongjia 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126bfc1cf1fdf266d9b8d0801f531d8dab5b5656ed3f6f7392144c1b0782a564
-  data.tar.gz: 27bf7cf27a82203f6bce0b6a4c289830b18f50cd909896a23595af038663d635
+  metadata.gz: dca107525ae9be1b7ed4f8bd40b5247cbcc5258035b9a0cc33ad4e4a96def6f3
+  data.tar.gz: c0d15ab36c6ad63daf5c82cffd1cbd8d41fc30d3a5ba1c1ddab2e3a468d2a36d
 SHA512:
-  metadata.gz: f5e54d1dca186cdf7c45aed044ccdbd41df1125925fb40e11bb49ef981fe3994ec48625e1c9a7cd3a6d3fb3a193672bba541dd9255da0d754e9da469ed3e0c32
-  data.tar.gz: 78a68150bdf76f6a27f358a7bda31f1f81542e30cfde5b58ef39c8487fe5eb645d00229e4f3516ab6a734f65525b3bb9612701c6e5b3d3a511640a5e9be0beef
+  metadata.gz: 43b4aa9ab668b94cfca481ab715c5de4f338f4ba22bfdc13c2c0cdbd673ed69aac48668fbe794f56c4a2babed20e527fc5e3c246ec485436b070b3dce02290f2
+  data.tar.gz: 364c8b20c8dd4c8c1e1255abeaf69049f57c656bb6690cbaea4153278a108d8f84d892505d63c21048cfedac2f55fae29c8fcc775f50c1d32829d67165ea1d55

data/lib/cocoapods-dongjia/command.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-dongjia/command/reinstall'
 require 'cocoapods-dongjia/command/install'
+require 'cocoapods-dongjia/command/release'
 require 'cocoapods-dongjia/command/demo'
 require 'cocoapods-dongjia/command/strip'
 require 'cocoapods-dongjia/command/open'

data/lib/cocoapods-dongjia/command/reinstall.rb

@@ -18,7 +18,14 @@ module Pod
         CLAide::Argument.new('XCODE_PROJECT', false),
       ]
 
+      def self.options
+        [
+          ["--save", "将重新生成的 project.pbxproj 文件保存下来"]
+        ]
+      end
+
       def initialize(argv)
+        @save = argv.flag?("save")
         path = argv.shift_argument
         @project_path = Pathname.new(path) if path
         super
@@ -45,7 +52,7 @@ module Pod
 
         deintegrator = Deintegrator.new
         deintegrator.deintegrate_project(@project)
-        @project.save
+        @project.save if @save
 
         verify_podfile_exists!
         installer = installer_for_config

data/lib/cocoapods-dongjia/command/release.rb

@@ -0,0 +1,40 @@
+require 'cocoapods'
+
+module Pod
+
+  class Podfile
+    @@is_release_mode = false
+    def self.set_is_release_mode(mode)
+      @@is_release_mode = mode
+    end
+    def self.is_release_mode?
+      @@is_release_mode
+    end
+  end
+
+  class Command
+
+    class Release < Command
+
+      self.summary = '以 release 模式集成 pods'
+
+      self.description = <<-DESC
+        
+        以 release 模式集成 Pods
+        
+        可以在 Podfile 中通过 @@debug_only_pods = [pod_name] 的方式指定 debug 模式下的 Pod
+
+        当执行 pod release 时，会自动剔除 @@debug_only_pods 内所定义的 Pod
+
+      DESC
+
+      def run
+        Pod::Podfile::set_is_release_mode(true)
+        installer_for_config.install!
+      end
+
+    end
+
+  end
+
+end

data/lib/cocoapods-dongjia/command/strip.rb

@@ -104,17 +104,18 @@ module Pod
       def get_images
         images = Set[]
         except_dirs = [
-          'QYResource.bundle', 
-          'DJMate', 
-          'IQKeyboardManager', 
-          'EnterpriseEditionImages.xcassets',
+          'QYResource.bundle',
+          'DJMate',
+          'IQKeyboardManager',
           'MJRefresh.bundle',
           'AlipaySDK.bundle',
           'AppIcon.appiconset',
-          'KPCameraImages.xcassets'
+          'KPCameraImages.xcassets',
+          'UMSocialSDKResources.bundle',
+          'LaunchResource'
         ]
         except_files = [
-          'image_placeholder', 
+          'image_placeholder',
           'register_add_avatar'
         ]
         bk = Proc.new do |dir, name, ext|
@@ -127,20 +128,32 @@ module Pod
 
       # 分析
       def analyze(source_files, images)
-        source_files.map { |x| x.file_ref.real_path }.each do | path |
+        source_file_paths = source_files.map { |x| 
+          x.file_ref.real_path
+        }
+        .select { |x| 
+          File.exist?(x)
+        }
+        count = source_file_paths.count
+        source_file_paths.each_index do | index |
+          percent = index.to_f / count.to_f * 100
+          print "\r" if index != 0
+          print "#{format("%.2f", percent)}%"
+          path = source_file_paths[index]
           File.open(path, 'r') do |f|
             image_using = []
             f.each_line do |line|
               next unless line.include?('"')
-              images.each do |img|
-                if line.include?('"' + img.name)
-                  image_using << img
-                else
-                  # 根据下划线分割剔除最后一项，再尝试匹配
-                  if !img.fuzzy_name.empty?
-                    if line.include?('"' + img.fuzzy_name + '%') || 
-                      line.include?('"' + img.fuzzy_name + '"')
-                      image_using << img
+              ['"', '/'].each do |prefix|
+                images.each do |img|
+                  if line.include?(prefix + img.name)
+                    image_using << img
+                  else
+                    # 根据下划线分割剔除最后一项，再尝试匹配
+                    if !img.fuzzy_name.empty?
+                      ['%', '"'].each do |suffix|
+                        image_using << img if line.include?(prefix + img.fuzzy_name + suffix)
+                      end
                     end
                   end
                 end
@@ -149,15 +162,20 @@ module Pod
             images = images - image_using
           end
         end
+        print "\r"
         images
       end
 
       def run
         images = analyze(get_source_files, get_images)
-        puts "无效资源文件："
-        images.each do |img|
-          path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
-          puts "  #{path}"
+        if images.empty?
+          puts "未找到无效资源"
+        else
+          puts "无效资源文件："
+          images.each do |img|
+            path = Pathname.new(img.fullpath).relative_path_from(Dir.pwd).to_s
+            puts "  #{path}"
+          end
         end
       end
 

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,6 +1,7 @@
 module CocoapodsDongjia
-  VERSION = "1.1.1"
+  VERSION = "1.1.6"
   UPDATE_DESC = <<-EOS
-  - 修复依赖
+  - 支持集成二进制版本的 Pod
+  - 优化 reinstall 命令
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -4,16 +4,21 @@ require_relative 'dongjia_branch_inspector'
 require_relative 'dongjia_enterprise_inspector'
 require_relative 'dongjia_pods_iterator'
 require_relative 'dongjia_router'
-require_relative 'dongjia_scheme_manager'
+require_relative 'dongjia_binarization'
 
-require_relative 'helper/podfile_local_importer'
+require_relative 'helper/podfile'
 require_relative 'helper/podfile_options'
-require_relative 'helper/podfile_warnings'
+require_relative 'helper/installer'
+require_relative 'helper/Core/podfile/dsl'
 
 module Dongjia
 
   Pod::HooksManager.register('cocoapods-dongjia', :pre_install) do |ctx, params|
 
+    Binarization.load_private_config(ctx)
+
+    Binarization.remove_dirty_pod_projects()
+
     podfile = ctx.podfile
 
     # 禁用集成完后的反馈
@@ -24,7 +29,6 @@ module Dongjia
 
     # 关闭静态框架依赖传递的校验
     Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
-
   end
   
   Pod::HooksManager.register('cocoapods-dongjia', :post_install) do |ctx, params|
@@ -32,17 +36,8 @@ module Dongjia
     # 关闭警告 / 检查 LTO
     PodsIterator.iterate(params, ctx.sandbox_root)
 
-    # 处理 appspec 配置
-    SchemeManager.setup(ctx, params)
-
-    # 企业版文件引用校验
-    files = EnterpriseInspector.inspect()
-    Pod::UI.warn "文件未加入企业版：#{files}" if files.count > 0
-
     # 抓取所有路由汇总至
-    router = Router.new
-    router.scrape_routers(ctx.sandbox_root, params[:scrap_routers])
-
+    # router = Router.new
+    # router.scrape_routers(ctx.sandbox_root, params[:scrap_routers])
   end
-
 end

data/lib/dongjia_binarization.rb

@@ -0,0 +1,577 @@
+require 'xcodeproj'
+require 'fileutils'
+require 'archive/zip'
+require 'net/http'
+require 'json'
+require 'yaml'
+require 'down'
+require 'pry'
+require 'uri'
+
+module Dongjia
+  class Binarization
+
+    @@ctx = nil
+    @@pod_cfg = {}
+    @@enabled = false
+    @@target_name = ""
+    @@submodules = {}
+    @@server_host = ""
+
+    # 配置文件 PrivateConfig.yml 是否存在，如果不存在，不做任何额外处理
+    @@config_file_exist = false
+
+    class << self
+      # 加载配置
+      def load_private_config(ctx)
+        @@ctx = ctx
+
+        submodule_info = load_submodules_info
+        @@submodules = submodule_info.to_h { |s|
+          [
+            s[:name],
+            { sha: s[:sha], binary: s[:binary], }
+          ]
+        }
+        
+        path = ctx.podfile.defined_in_file.dirname.join("PrivateConfig.yml")
+        if path.exist?
+          config = YAML.load(File.read(path))
+          @@config_file_exist = true
+          if config
+            binary = config["binary"]
+            if binary
+              @@enabled ||= binary["enabled"]
+              @@server_host = binary["server_host"]
+              @@target_name = binary["target_name"].strip
+              ignores = binary["ignores"] || []
+
+              begin
+                @@submodules = query_components_existing(submodule_info).to_h { |s|
+                  [
+                    s["name"], 
+                    { sha: s["sha"], binary: s["binary"], }
+                  ]
+                }.each { |k, v|
+                  ignored = ignores.include?(k)
+                  v[:binary] &&= !ignored && @@enabled
+                  v[:ignored] = ignored
+                }
+              rescue => e
+                puts "Error: #{e}"
+              end
+            end
+          end
+        end
+      end
+
+      # 移除脏工程
+      def remove_dirty_pod_projects
+        @@submodules
+          .filter { |k,v| !v[:binary] }
+          .map { |k,v| k }
+          .each { |name|
+            path = "./Pods/#{name}.xcodeproj"
+            next unless File.exist?(path)
+            proj = Xcodeproj::Project.open(path)
+            if proj.targets.map(&:name).include?("#{name}-Binary")
+              FileUtils.rm_rf(path)
+            end
+          }
+      end
+
+      # 加载子模块信息
+      def load_submodules_info
+        # 获取子模块的哈希值
+        def git_sha_value(component_name)
+          git_dir = ".git/modules/componentsOnRemote/#{component_name}"
+          git_sha = File.read(File.join(git_dir, "HEAD")).strip
+          if git_sha.start_with?("ref: ")
+            head_file = git_sha[5, git_sha.length]
+            git_sha = File.read(File.join(git_dir, head_file)).strip
+          end
+          git_sha
+        end
+      
+        Dir.foreach("./componentsOnRemote").to_a
+          .delete_if { |x| x.start_with?('.') }
+          .map { |comp|
+            {
+              name: comp,
+              sha: git_sha_value(comp),
+              binary: false,
+            }
+          }
+      end
+
+      # 开始处理二进制
+      def process(installer)
+        return unless @@config_file_exist
+        return if @@ctx == nil || @@ctx.sandbox_root == nil
+
+        installer.analysis_result.podfile_dependency_cache.podfile_dependencies.each { |dep|
+          name = dep.name.split('/').first
+          next if @@pod_cfg.include?(name)
+          @@pod_cfg[name] = @@submodules[name] || {
+            binary: false
+          }
+        }
+
+        pods_proj = Xcodeproj::Project.open(File.join(@@ctx.sandbox_root, "Pods.xcodeproj"))
+        if @@target_name && !@@target_name.empty?
+          pods_target = pods_proj.targets.find { |t| t.name == "Pods-#{@@target_name}" }
+        else
+          pods_target = pods_proj.targets.first
+        end
+
+        download_frameworks
+
+        each_pod_proj do |name|
+          proj = Xcodeproj::Project.open(File.join(@@ctx.sandbox_root, "#{name}.xcodeproj"))
+          cfg = @@pod_cfg[name]
+          cfg[:project] = proj
+
+          cfg[:save] = process_target_and_dependencies(proj, name, pods_target, cfg)
+
+          # 处理 Binary Group
+          process_binary_group(proj, name)
+
+          # 处理 XXX-xcframeworks.sh 脚本
+          process_xcframeworks_shell(name)
+
+          process_pod_xcconfig(name)
+        end
+
+        # 更新依赖关系
+        each_pod_proj do |name|
+          cfg = @@pod_cfg[name]
+          proj = cfg[:project]
+          target = cfg[:target]
+          next if target.nil?
+          delete_list = []
+          target.dependencies.each { |dep|
+            dep_cfg = @@pod_cfg[dep.name]
+            next if dep_cfg.nil?
+            if dep_cfg[:binary]
+              target.add_dependency(dep_cfg[:target])
+              delete_list << dep
+            end
+          }
+          target.dependencies.delete_if { |dep| delete_list.include?(dep) }
+          cfg[:save] ||= !delete_list.empty?
+        end
+
+        # 保存
+        should_save = false
+        each_pod_proj do |name|
+          cfg = @@pod_cfg[name]
+          cfg[:project].save if cfg[:save]
+          should_save ||= cfg[:save]
+        end
+        pods_proj.save if should_save
+
+        process_aggregate_target_xcconfig(installer.aggregate_targets.first.name)
+      end
+
+      private
+
+      # 遍历 Pods 目录下的 xcodeproj
+      def each_pod_proj
+        Dir.foreach(@@ctx.sandbox_root) do |filename|
+          next if File.extname(filename) != '.xcodeproj'
+          
+          name = File.basename(filename, '.xcodeproj')
+          next if name == 'Pods'
+
+          cfg = @@pod_cfg[name]
+
+          yield(name) if block_given?
+        end
+      end
+
+      # 向服务器查询哪些 Pod 需要打包
+      def query_components_existing(components)
+        result = components
+        begin
+          uri = URI.parse(URI::join(@@server_host, 'api/binary/checkup').to_s)
+          headers = {
+            'Content-Type': 'application/json'
+          }
+          req = Net::HTTP::Post.new(uri, headers)
+          req.body = {components: components}.to_json
+          resp = Net::HTTP.start(uri.host, uri.port) do |http|
+            http.request(req)
+          end
+          result = JSON.parse(resp.body).dig('res', 'components')
+        rescue => e
+          puts "Error: #{e}"
+        end
+        return result
+      end
+
+      def process_target_and_dependencies(proj, name, pods_target, cfg)
+        changed = false
+        source_target = proj.target_by_name(name)
+        binary_target = proj.target_by_name("#{name}-Binary")
+
+        if cfg[:binary] == true
+          # 使用 Binary 版本的 target
+          if binary_target == nil
+            binary_target = add_binary_target(proj, name)
+            changed = true
+          end
+
+          @@pod_cfg[name][:target] = binary_target
+
+          # 移除源码版本的 target
+          if source_target
+            replace_target_dependency(pods_target, source_target, binary_target)
+            proj.targets.delete_if { |t| t == source_target }
+            changed = true
+          end
+        else
+          @@pod_cfg[name][:target] = source_target
+          # 使用源码版本的 target
+          source_target.build_configurations.each { |cfg|
+            if cfg.build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] != "YES"
+              cfg.build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
+              changed = true
+            end
+          }
+        end
+        changed
+      end
+
+      # 处理对应 pod 的 xcconfig
+      def process_pod_xcconfig(name)
+        # 根据 pod 是源码还是二进制包，切换路径为 PODS_CONFIGURATION_BUILD_DIR 或 PODS_XCFRAMEWORKS_BUILD_DIR
+        ["debug", "release"].each { |cfg_name|
+          cfg_path = Pathname("./Pods/Target Support Files/#{name}/#{name}.#{cfg_name}.xcconfig")
+          next if not File.exist?(cfg_path)
+          cfg = Xcodeproj::Config.new(cfg_path)
+          fsp_str = cfg.attributes["FRAMEWORK_SEARCH_PATHS"] || "$(inherited)"
+          fsp = fsp_str.split(" ")
+
+          # 源码的 prefix
+          source_prefix = "\"${PODS_CONFIGURATION_BUILD_DIR}/"
+          # 二进制包的 prefix
+          binary_prefix = "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/"
+
+          fsp.map! { |path|
+            if path.start_with?(source_prefix)
+              pod_name = path[source_prefix.length, path.length].delete_suffix("\"")
+              sm = @@submodules[pod_name]
+              if !sm.nil? && sm[:binary]
+                path = path.gsub("PODS_CONFIGURATION_BUILD_DIR", "PODS_XCFRAMEWORKS_BUILD_DIR")
+              end
+            elsif path.start_with?(binary_prefix)
+              pod_name = path[binary_prefix.length, path.length].delete_suffix("\"")
+              sm = @@submodules[pod_name]
+              if !sm.nil? && !sm[:binary]
+                path = path.gsub("PODS_XCFRAMEWORKS_BUILD_DIR", "PODS_CONFIGURATION_BUILD_DIR")
+              end
+            end
+            path
+          }
+          cfg.attributes["FRAMEWORK_SEARCH_PATHS"] = fsp.flatten.uniq.join(" ")
+          cfg.save_as(cfg_path)
+        }
+      end
+
+      # 处理集成对象的 xcconfig（项目的 xcconfig）
+      def process_aggregate_target_xcconfig(aggregate_target_name)
+        # 处理 Pods/Target Support Files/Pods-项目名/Pods-项目名.debug(release).xcconfig
+        # 所有被二进制化的 pod，增加 "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{pod_name}"
+        ["debug", "release"].each { |cfg_name|
+          cfg_path = Pathname("./Pods/Target Support Files/#{aggregate_target_name}/#{aggregate_target_name}.#{cfg_name}.xcconfig")
+          next if not File.exist?(cfg_path)
+          cfg = Xcodeproj::Config.new(cfg_path)
+          fsp = cfg.attributes["FRAMEWORK_SEARCH_PATHS"].split(" ") || ["$(inherited)"]
+          @@submodules.each { |k, v|
+            path = "\"${PODS_XCFRAMEWORKS_BUILD_DIR}/#{k}\""
+            if v[:binary] == true
+              fsp << path if not fsp.include?(path)
+            else
+              fsp.delete_if { |x| x == path }
+            end
+          }
+          cfg.attributes["FRAMEWORK_SEARCH_PATHS"] = fsp.flatten.uniq.join(" ")
+          cfg.save_as(cfg_path)
+        }
+      end
+
+      def add_binary_target(proj, name)
+        source_target = proj.target_by_name(name)
+        bin_target = proj.new_aggregate_target("#{name}-Binary", [], :ios, '10.0')
+        
+        # 处理 xcconfig 引用
+        cfg_list0 = source_target.build_configuration_list
+        cfg_list1 = bin_target.build_configuration_list
+        cfg_list1["Debug"].base_configuration_reference ||= cfg_list0["Debug"].base_configuration_reference
+        cfg_list1["Release"].base_configuration_reference ||= cfg_list0["Release"].base_configuration_reference
+
+        # 处理 Build Phases
+        phase = bin_target.new_shell_script_build_phase("[CP] Copy XCFrameworks")
+        phase.shell_script = "\"${PODS_ROOT}/Target Support Files/#{name}/#{name}-xcframeworks.sh\""
+
+        # 添加依赖
+        bin_target.dependencies.replace(source_target.dependencies)
+        return bin_target
+      end
+
+      def replace_target_dependency(target, from_dep_target, to_dep_target)
+        dep_names = target.dependencies.map(&:name)
+        index = dep_names.index(from_dep_target.name)
+        return false if !index
+        target.dependencies.delete_at(index)
+        target.add_dependency(to_dep_target)
+        return true
+      end
+
+      # 下载 framework 到 Pods/_Frameworks 目录下
+      def download_frameworks
+        framework_root = File.join(@@ctx.sandbox_root, "_Frameworks")
+        cache_root = File.join(framework_root, "Caches")
+        FileUtils.mkdir_p(cache_root) unless File.exist?(cache_root)
+
+        @@submodules.each { |k, v|
+          if !v[:binary] || !v[:sha]
+            puts "#{k} 未发现二进制版本" if @@enabled && !v[:ignored]
+            next
+          end
+
+          module_cache_dir = File.join(cache_root, k)
+          FileUtils.mkdir_p(module_cache_dir) unless File.exist?(module_cache_dir)
+
+          filename = "#{v[:sha]}.zip"
+          binary_dir = File.join(module_cache_dir, v[:sha])
+          if not File.exist?(binary_dir)
+            # 目录不存在，下载 zip 包并解压
+            binary_zip_path = File.join(module_cache_dir, filename)
+            puts "Downloading #{k} (#{v[:sha]})"
+            url = URI::join(@@server_host, "binary/#{k}/#{filename}")
+            Down.download(url, destination: binary_zip_path)
+            Archive::Zip.extract(binary_zip_path, binary_dir)
+            FileUtils.rm_f(binary_zip_path)
+          end
+          target = File.expand_path(File.join(binary_dir, "#{k}.xcframework"))
+          FileUtils.ln_s(target, framework_root, force: true)
+        }
+      end
+
+      def process_binary_group(proj, name)
+        cfg = @@pod_cfg[name]
+        binary_group = proj.groups.find { |g| g.name == "Binary" }
+        if cfg[:binary] == true
+          if binary_group == nil
+            binary_group = proj.new_group("Binary")
+            binary_group.new_reference("_Frameworks/#{name}.xcframework")
+            proj.sort
+          end
+        else
+          if binary_group != nil
+            binary_group.remove_from_project
+          end
+        end
+      end
+
+      def process_xcframeworks_shell(name)
+        cfg = @@pod_cfg[name]
+        return if cfg[:binary] != true
+        script_path = File.join(@@ctx.sandbox_root, "Target Support Files", name, "#{name}-xcframeworks.sh")
+        File.open(script_path, 'w') do |f|
+          f.write(xcframeworks_shell(name))
+        end
+        FileUtils.chmod('a+x', script_path)
+      end
+
+      # 获取当前 Wi-Fi 的 SSID
+      def get_wifi_ssid
+        lines = `/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport -I`.split("\n").map { |line| line.strip }
+        target = lines.find { |x| x.start_with?("SSID: ") }
+        target.nil? ? "" : target.delete_prefix("SSID: ")
+      end
+    end
+  end
+end
+
+module Dongjia
+  class Binarization
+    def self.xcframeworks_shell(pod_name)
+      <<-DESC
+#!/bin/sh
+set -e
+set -u
+set -o pipefail
+
+function on_error {
+  echo "$(realpath -mq "${0}"):$1: error: Unexpected failure"
+}
+trap 'on_error $LINENO' ERR
+
+
+# This protects against multiple targets copying the same framework dependency at the same time. The solution
+# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
+RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
+
+
+copy_dir()
+{
+  local source="$1"
+  local destination="$2"
+
+  # Use filter instead of exclude so missing patterns don't throw errors.
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}\\" \\"${destination}\\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}" "${destination}"
+}
+
+SELECT_SLICE_RETVAL=""
+
+select_slice() {
+  local paths=("$@")
+  # Locate the correct slice of the .xcframework for the current architectures
+  local target_path=""
+
+  # Split archs on space so we can find a slice that has all the needed archs
+  local target_archs=$(echo $ARCHS | tr " " "\\n")
+
+  local target_variant=""
+  if [[ "$PLATFORM_NAME" == *"simulator" ]]; then
+    target_variant="simulator"
+  fi
+  if [[ ! -z ${EFFECTIVE_PLATFORM_NAME+x} && "$EFFECTIVE_PLATFORM_NAME" == *"maccatalyst" ]]; then
+    target_variant="maccatalyst"
+  fi
+  for i in ${!paths[@]}; do
+    local matched_all_archs="1"
+    for target_arch in $target_archs
+    do
+      if ! [[ "${paths[$i]}" == *"$target_variant"* ]]; then
+        matched_all_archs="0"
+        break
+      fi
+
+      # Verifies that the path contains the variant string (simulator or maccatalyst) if the variant is set.
+      if [[ -z "$target_variant" && ("${paths[$i]}" == *"simulator"* || "${paths[$i]}" == *"maccatalyst"*) ]]; then
+        matched_all_archs="0"
+        break
+      fi
+
+      # This regex matches all possible variants of the arch in the folder name:
+      # Let's say the folder name is: ios-armv7_armv7s_arm64_arm64e/CoconutLib.framework
+      # We match the following: -armv7_, _armv7s_, _arm64_ and _arm64e/.
+      # If we have a specific variant: ios-i386_x86_64-simulator/CoconutLib.framework
+      # We match the following: -i386_ and _x86_64-
+      # When the .xcframework wraps a static library, the folder name does not include
+      # any .framework. In that case, the folder name can be: ios-arm64_armv7
+      # We also match _armv7$ to handle that case.
+      local target_arch_regex="[_\\-]${target_arch}([\\/_\\-]|$)"
+      if ! [[ "${paths[$i]}" =~ $target_arch_regex ]]; then
+        matched_all_archs="0"
+        break
+      fi
+    done
+
+    if [[ "$matched_all_archs" == "1" ]]; then
+      # Found a matching slice
+      echo "Selected xcframework slice ${paths[$i]}"
+      SELECT_SLICE_RETVAL=${paths[$i]}
+      break
+    fi
+  done
+}
+
+install_library() {
+  local source="$1"
+  local name="$2"
+  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
+
+  # Libraries can contain headers, module maps, and a binary, so we'll copy everything in the folder over
+
+  local source="$binary"
+  echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" \\"${source}/*\\" \\"${destination}\\""
+  rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" "${source}/*" "${destination}"
+}
+
+# Copies a framework to derived data for use in later build phases
+install_framework()
+{
+  local source="$1"
+  local name="$2"
+  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
+
+  if [ ! -d "$destination" ]; then
+    mkdir -p "$destination"
+  fi
+
+  copy_dir "$source" "$destination"
+  echo "Copied $source to $destination"
+}
+
+install_xcframework_library() {
+  local basepath="$1"
+  local name="$2"
+  local paths=("$@")
+
+  # Locate the correct slice of the .xcframework for the current architectures
+  select_slice "${paths[@]}"
+  local target_path="$SELECT_SLICE_RETVAL"
+  if [[ -z "$target_path" ]]; then
+    echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
+    return
+  fi
+
+  install_framework "$basepath/$target_path" "$name"
+}
+
+install_xcframework() {
+  local basepath="$1"
+  local name="$2"
+  local package_type="$3"
+  local paths=("$@")
+
+  # Locate the correct slice of the .xcframework for the current architectures
+  select_slice "${paths[@]}"
+  local target_path="$SELECT_SLICE_RETVAL"
+  if [[ -z "$target_path" ]]; then
+    echo "warning: [CP] Unable to find matching .xcframework slice in '${paths[@]}' for the current build architectures ($ARCHS)."
+    return
+  fi
+  local source="$basepath/$target_path"
+
+  local destination="${PODS_XCFRAMEWORKS_BUILD_DIR}/${name}"
+
+  if [ ! -d "$destination" ]; then
+    mkdir -p "$destination"
+  fi
+
+  copy_dir "$source/" "$destination"
+
+  echo "Copied $source to $destination"
+}
+
+install_xcframework "${PODS_ROOT}/_Frameworks/#{pod_name}.xcframework" "#{pod_name}" "framework" "ios-arm64_armv7" "ios-x86_64-simulator"
+DESC
+    end
+  end
+end
+
+module Xcodeproj
+  class Project
+    def target_by_name(name)
+      targets.find { |t| t.name == name }
+    end
+
+    def group_by_name(name)
+      groups.find { |g| g.name == name }
+    end
+
+    module Object
+      class PBXGroup
+        def group_by_name(name)
+          groups.find { |g| g.name == name }
+        end
+      end
+    end
+  end
+end

data/lib/dongjia_pods_iterator.rb

@@ -4,38 +4,62 @@ module Dongjia
 
   class PodsIterator
 
+    def self.update_build_setting(config, key, value)
+      if config.build_settings[key] != value
+        config.build_settings[key] = value
+        return true
+      else
+        return false
+      end
+    end
+
     # 关闭警告
     def self.disable_warnings(config, target_name)
+      changed = false
+
       # 禁用非 DJ 开头 Pod 的警告
-      config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = "YES" unless target_name.start_with?('DJ')
-                    
+      changed ||= update_build_setting(config, 'GCC_WARN_INHIBIT_ALL_WARNINGS', 'YES') unless target_name.start_with?('DJ')
+
       # 不检测 block 中的隐式 self 调用
-      config.build_settings['CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF'] = "NO"
+      changed ||= update_build_setting(config, 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF', "NO")
 
       # 不检测已废弃的方法
-      config.build_settings['GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS'] = "NO"
-
-      # 允许 objc_msgSend
-      config.build_settings['ENABLE_STRICT_OBJC_MSGSEND'] = "NO"
+      changed ||= update_build_setting(config, 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS', "NO")
 
       # 不检测注释
-      config.build_settings['CLANG_WARN_DOCUMENTATION_COMMENTS'] = "NO"
+      changed ||= update_build_setting(config, 'CLANG_WARN_DOCUMENTATION_COMMENTS', "NO")
 
-      # 不严格的原型校验
-      config.build_settings['CLANG_WARN_STRICT_PROTOTYPES'] = "NO"
-
-      # 强制设置 deployment 版本为 8.0
-      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+      # 强制设置 deployment 版本为 9.0
+      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+        changed ||= update_build_setting(config, 'IPHONEOS_DEPLOYMENT_TARGET', "9.0")
       end
 
       # 关闭 bitcode
-      config.build_settings['ENABLE_BITCODE'] = "NO"
+      changed ||= update_build_setting(config, 'ENABLE_BITCODE', "NO")
+
+      changed
     end
 
     # 打开 LTO
     def self.enable_lto(config)
-      config.build_settings['LLVM_LTO'] = 'YES_THIN' if config.name == 'Release'
+      changed = false
+      # changed ||= update_build_setting(config, 'LLVM_LTO', 'YES_THIN') if config.name == 'Release'
+      changed
+    end
+
+    # 将 umbrella 导出的头文件改为尖括号形式
+    def self.convert_umbrella_header_import(pod_name)
+      umbrella_path = "./Pods/Target Support Files/#{pod_name}/#{pod_name}-umbrella.h"
+      return unless File.exist?(umbrella_path)
+      contents = File.read(umbrella_path)
+      return unless contents.include?("#import \"")
+      File.open(umbrella_path, 'r+') do |f|
+        x = f.read
+        begin x.gsub!("#import \"#{pod_name}/", "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        begin x.gsub!('#import "', "#import <#{pod_name}/").gsub!('.h"', '.h>') rescue nil end
+        f.rewind
+        f.write(x)
+      end
     end
 
     # 遍历所有 Pod 工程配置
@@ -50,23 +74,27 @@ module Dongjia
 
         if name != 'Pods.xcodeproj'
           proj.build_configurations.each do | config |
-            # 强制设置 deployment 版本为 8.0
-            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 8.0
-              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "8.0"
+            # 强制设置 deployment 版本为 9.0
+            if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 9.0
+              config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "9.0"
             end
           end
         end
   
         # project 的每个 target 配置
+        changed = false
         proj.targets.select {|t| !t.name.start_with?('Pods')}.each do | target |
           next if target.name.start_with?('Pods')
           target.build_configurations.each do | config |
-            disable_warnings(config, target.name) if turn_off_warnings
-            enable_lto(config) if lto_enabled
+            changed ||= disable_warnings(config, target.name) if turn_off_warnings
+            changed ||= enable_lto(config) if lto_enabled
+            convert_umbrella_header_import(target.name)
           end
         end
   
-        proj.save
+        if changed
+          proj.save
+        end
   
       end
 

data/lib/dongjia_router.rb

@@ -14,6 +14,8 @@ module Dongjia
 
   注意：此处的实现仅供查看，如需修改，请点击对应的 _redirect{type} 方法跳转至对应的实现
 
+  跳转定义文档：https://cf.idongjia.cn/pages/viewpage.action?pageId=57351032
+  
 */
 
 
@@ -39,7 +41,10 @@ EOS
       end
       
       if @prefix != nil
-        @redirect_type = @defining_line[prefix_len, @defining_line.index(',') - prefix_len]
+        end_index = @defining_line.index(',') || @defining_line.index(')')
+        if !end_index.nil?
+          @redirect_type = @defining_line[prefix_len, end_index - prefix_len]
+        end
       end
     end
 

data/lib/helper/Core/podfile/dsl.rb

@@ -0,0 +1,16 @@
+module Pod
+  class Podfile
+    module DSL
+      # Hook Podfile 中的 install: 方法，将当前版本 Cocoapods 不支持的 option 剔除
+      original_install = instance_method(:install!)
+      define_method(:install!) do |installation_method, options = {}|
+        all_options = Installer::InstallationOptions::all_options
+        valid_options = {}
+        options.each do |k, v|
+          valid_options.merge!({k => v}) if all_options.include?(k.to_s)
+        end
+        original_install.bind(self).(installation_method, valid_options)
+      end
+    end
+  end
+end

data/lib/helper/{podfile_warnings.rb → installer.rb}

@@ -1,11 +1,11 @@
 require_relative 'dongjia_version_checker'
+require_relative '../dongjia_binarization'
 
 module Pod
 
   class Installer
 
     class PodSourceInstaller
-
       # 关闭自己仓库中 pod 的安全警告
       old_method = instance_method(:verify_source_is_secure)
       define_method(:verify_source_is_secure) do |root_spec|
@@ -14,15 +14,29 @@ module Pod
           old_method.bind(self).(root_spec)
         end
       end
-      
     end
 
+    # Hook post_installer
     origin_perform_post_install_actions = instance_method(:perform_post_install_actions)
     define_method :perform_post_install_actions do
       origin_perform_post_install_actions.bind(self).()
       Dongjia::DongjiaVersionChecker.check_version
     end
 
-  end
+    # Hook Pods.xcodeproj 尚未写入
+    origin_run_podfile_post_install_hooks = instance_method(:run_podfile_post_install_hooks)
+    define_method :run_podfile_post_install_hooks do
+      origin_run_podfile_post_install_hooks.bind(self).()
+      # 处理二进制化
+      # Dongjia::Binarization.process(self)
+    end
 
+    # Hook Pods.xcodeproj 已生成完毕
+    origin_generate_pods_project = instance_method(:generate_pods_project)
+    define_method :generate_pods_project do
+      origin_generate_pods_project.bind(self).()
+      # 处理二进制化
+      Dongjia::Binarization.process(self)
+    end
+  end
 end

data/lib/helper/podfile.rb

@@ -0,0 +1,60 @@
+require_relative 'pod'
+
+module Pod
+
+  class LocalSpec
+    @@local_spec_importing = false
+    @@local_spec_path = nil
+    def self.import_local_pod(path)
+      @@local_spec_importing = true
+      @@local_spec_path = path
+      yield if block_given?
+      @@local_spec_path = nil
+      @@local_spec_importing = false
+    end
+    def self.local_spec_importing?
+      @@local_spec_importing
+    end
+    def self.local_spec_path
+      @@local_spec_path
+    end
+  end
+
+  class Podfile
+
+    # 只在 debug 模式下集成的组件，默认为空
+    @@debug_only_pods = []
+
+    # 导入工程目录下相对位置的 pod
+    def import_relative_in(path = './')
+      LocalSpec.import_local_pod(path) do
+        yield if block_given?
+      end
+    end
+    
+    original_pod = instance_method(:pod)
+    define_method(:pod) do |name = nil, *requirements|
+
+      if Pod::Podfile::is_release_mode?
+        realname = name.split('/').first
+        if @@debug_only_pods.include?(realname)
+          puts "#{realname} is only for debug, it will be removed."
+          next
+        end
+      end
+
+      if LocalSpec.local_spec_importing?
+        path_cfg = { :path => "#{LocalSpec.local_spec_path}/#{Pod::repo_name(name)}" }
+        if requirements.length == 0
+          requirements = [path_cfg]
+        else
+          cfg = requirements.first
+          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
+        end
+      end
+      original_pod.bind(self).(name, *requirements)
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - jiangzhuoyi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: down
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description: A short description of cocoapods-dongjia.
 email:
 - jiangzhuoyi@idongjia.cn
@@ -79,28 +107,32 @@ files:
 - lib/cocoapods-dongjia/command/install.rb
 - lib/cocoapods-dongjia/command/open.rb
 - lib/cocoapods-dongjia/command/reinstall.rb
+- lib/cocoapods-dongjia/command/release.rb
 - lib/cocoapods-dongjia/command/strip.rb
 - lib/cocoapods-dongjia/gem_version.rb
 - lib/cocoapods_plugin.rb
+- lib/dongjia_binarization.rb
 - lib/dongjia_branch_inspector.rb
 - lib/dongjia_config.rb
 - lib/dongjia_enterprise_inspector.rb
 - lib/dongjia_pods_iterator.rb
 - lib/dongjia_router.rb
-- lib/dongjia_scheme_manager.rb
 - lib/dongjia_source.rb
+- lib/helper/Core/podfile/dsl.rb
 - lib/helper/dongjia_version_checker.rb
+- lib/helper/installer.rb
 - lib/helper/pod.rb
-- lib/helper/podfile_local_importer.rb
+- lib/helper/podfile.rb
 - lib/helper/podfile_options.rb
-- lib/helper/podfile_warnings.rb
 - lib/helper/project.rb
 homepage: https://github.com/EXAMPLE/cocoapods-dongjia
 licenses:
 - MIT
 metadata:
-  update_desc: "  - 修复依赖\n"
-post_install_message: 
+  update_desc: |2
+      - 支持集成二进制版本的 Pod
+      - 优化 reinstall 命令
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-dongjia.
 test_files: []

data/lib/dongjia_scheme_manager.rb

@@ -1,58 +0,0 @@
-require 'helper/project'
-
-module Dongjia
-
-  class SchemeManager
-
-    # 获取主工程的 development team
-    def self.development_team(ctx)
-      team = nil
-      project = ctx.umbrella_targets.first.user_project
-      return team unless project.is_a?(Xcodeproj::Project)
-
-      target = project.targets.find { |t|
-        !t.name.include?('企业版') && !t.name.end_with?('Extension')
-      }
-      return team unless target.is_a?(Xcodeproj::Project::PBXNativeTarget)
-
-      build_cfg = target.build_configurations.find { |c| c.name == 'Debug' }
-      return team unless build_cfg.is_a?(Xcodeproj::Project::XCBuildConfiguration)
-
-      team = build_cfg.build_settings['DEVELOPMENT_TEAM']
-    end
-
-    def self.setup(ctx, params)
-      visibled_appspecs = params[:visibled_appspecs]
-      # return if !visibled_appspecs || visibled_appspecs.empty?
-      sandbox_root = ctx.sandbox_root
-      
-      team = development_team(ctx)
-      
-      Dir.foreach(sandbox_root).select{|f| f.end_with?('xcodeproj')}.each do |name|
-        proj = Xcodeproj::Project.open(File.join(sandbox_root, name))
-        proj.targets.each do | target |
-          # 确保是 appspec
-          next unless target.name.include?('-')
-          # 确保是可执行程序
-          next unless target.product_type == 'com.apple.product-type.application'
-
-          # 设置签名信息
-          if team.is_a?(String)
-            target.build_configurations.first.build_settings['DEVELOPMENT_TEAM'] = team
-            target.build_configurations.each { |cfg|
-              cfg.build_settings['DEVELOPMENT_TEAM'] = team
-            }
-          end
-
-          if visibled_appspecs.include?(target.name.split('-').first)
-            # 将 visibled_appspecs 中指定的 target 设为可见状态
-            proj.set_target_scheme_visible(target, true)
-          end
-        end
-        proj.save if team.is_a?(String)
-      end
-    end
-
-  end
-
-end

data/lib/helper/podfile_local_importer.rb

@@ -1,34 +0,0 @@
-require_relative 'pod'
-
-module Pod
-
-  class Podfile
-
-    # 导入工程目录下相对位置的 pod
-    @local_spec_importing = false
-    @local_spec_path = nil
-    def import_relative_in(path = './')
-      @local_spec_importing = true
-      @local_spec_path = path
-      yield if block_given?
-      @local_spec_path = nil
-      @local_spec_importing = false
-    end
-    
-    original_pod = instance_method(:pod)
-    define_method(:pod) do |name = nil, *requirements|
-      if @local_spec_importing
-        path_cfg = { :path => "#{@local_spec_path}/#{Pod::repo_name(name)}" }
-        if requirements.length == 0
-          requirements = [path_cfg]
-        else
-          cfg = requirements.first
-          cfg.merge!(path_cfg) unless cfg.has_key?(:path)
-        end
-      end
-      original_pod.bind(self).(name, *requirements)
-    end
-
-  end
-
-end