cocoapods-dongjia 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dca107525ae9be1b7ed4f8bd40b5247cbcc5258035b9a0cc33ad4e4a96def6f3
-  data.tar.gz: c0d15ab36c6ad63daf5c82cffd1cbd8d41fc30d3a5ba1c1ddab2e3a468d2a36d
+  metadata.gz: abe6387bbccd1ac19c893b9c384025c976cf5a8975668725670aac190b750abb
+  data.tar.gz: 125582ad4f0aa628467990eb2b43e32007f43043044a4a57a17331a1893bd734
 SHA512:
-  metadata.gz: 43b4aa9ab668b94cfca481ab715c5de4f338f4ba22bfdc13c2c0cdbd673ed69aac48668fbe794f56c4a2babed20e527fc5e3c246ec485436b070b3dce02290f2
-  data.tar.gz: 364c8b20c8dd4c8c1e1255abeaf69049f57c656bb6690cbaea4153278a108d8f84d892505d63c21048cfedac2f55fae29c8fcc775f50c1d32829d67165ea1d55
+  metadata.gz: ce36c1a22df3189675dec1775e998fbfdf2a6e413c730db99ea6abfdf90bbf8cb6af04df6d00a90b9b8ce1e7c0c65ee5e4bf1274c2290880b87a03f4b0e44fe6
+  data.tar.gz: d9a8b6d5b4496424efb19e4499edacaabf232cdf3069f7ec10cc554de5b2771fe2d63c2596e1e21a5055e3f3197ff3fa7227b9d54b0c31a594e43e852759f93f

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

@@ -1,11 +1,8 @@
 require 'cocoapods'
 
 module Pod
-
   class Command
-
     class Install < Command
-
       alias_method :run_retryable, :run
       def run
         begin
@@ -18,9 +15,6 @@ module Pod
           end
         end
       end
-
     end
-
   end
-
 end

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

@@ -1,11 +1,8 @@
 require 'cocoapods'
 
 module Pod
-
   class Command
-
     class Open < Command
-
       self.summary = '快速打开项目的 .xcworkspace'
 
       self.description = <<-DESC
@@ -24,9 +21,6 @@ module Pod
       def run
         `open #{@workspace_path}`
       end
-
     end
-
   end
-
 end

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

@@ -178,9 +178,6 @@ module Pod
           end
         end
       end
-
     end
-
   end
-
 end

data/lib/cocoapods-dongjia/gem_version.rb

@@ -1,7 +1,7 @@
 module CocoapodsDongjia
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
   UPDATE_DESC = <<-EOS
-  - 支持集成二进制版本的 Pod
-  - 优化 reinstall 命令
+  - 修复源码和二进制切换后的集成依赖问题
+  - 修复一些导致 crash 的问题
 EOS
 end

data/lib/cocoapods_plugin.rb

@@ -1,6 +1,5 @@
 require 'cocoapods-dongjia/command'
 require_relative 'dongjia_source'
-require_relative 'dongjia_branch_inspector'
 require_relative 'dongjia_enterprise_inspector'
 require_relative 'dongjia_pods_iterator'
 require_relative 'dongjia_router'
@@ -15,9 +14,17 @@ module Dongjia
 
   Pod::HooksManager.register('cocoapods-dongjia', :pre_install) do |ctx, params|
 
-    Binarization.load_private_config(ctx)
-
-    Binarization.remove_dirty_pod_projects()
+    private_config_path = ctx.podfile.defined_in_file.dirname.join("PrivateConfig.yml")
+    if private_config_path.exist?
+      private_config = YAML.load(File.read(private_config_path))
+      if private_config.is_a?(Hash)
+        binary = private_config["binary"]
+        if binary.is_a?(Hash)
+          Binarization.load_private_config(ctx, binary)
+          Binarization.remove_dirty_pod_projects()
+        end
+      end
+    end
 
     podfile = ctx.podfile
 

data/lib/dongjia_binarization.rb

@@ -14,16 +14,16 @@ module Dongjia
     @@ctx = nil
     @@pod_cfg = {}
     @@enabled = false
-    @@target_name = ""
     @@submodules = {}
     @@server_host = ""
 
-    # 配置文件 PrivateConfig.yml 是否存在，如果不存在，不做任何额外处理
-    @@config_file_exist = false
+    @@target_name = "dongjia"   # 项目的 target 名
+    @@pods_proj = nil           # Pods.xcodeproj
+    @@pods_target = nil         # Pods.xcodeproj 中的 target 对象
 
     class << self
       # 加载配置
-      def load_private_config(ctx)
+      def load_private_config(ctx, binary)
         @@ctx = ctx
 
         submodule_info = load_submodules_info
@@ -34,107 +34,81 @@ module Dongjia
           ]
         }
         
-        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
+        @@enabled ||= binary["enabled"]
+        @@server_host = binary["server_host"]
+        @@target_name = (binary["target_name"] || "").strip
+        ignores = binary["ignores"] || []
+
+        if @@enabled
+          @@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
+          }
         end
+      rescue => e
+        puts "Binarization error: #{e}"
       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)
+        if @@enabled
+          @@submodules
+            .filter { |k,v| !v[:binary] }
+            .map { |k,v| k }
+            .each { |name|
+              path = File.join(@@ctx.sandbox_root, "#{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
+            }
+        else
+          # 不启用，清除所有包含 -Binary 的工程
+          removing_paths = []
+          Dir.foreach(@@ctx.sandbox_root) { |filename|
+            next if File.extname(filename) != '.xcodeproj'
+            pod_name = filename.delete_suffix('.xcodeproj')
+            next if pod_name == "Pods"
+            process_pod_xcconfig(pod_name)
+            path = File.join(@@ctx.sandbox_root, filename)
             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,
+            included_binary_target = proj.targets.map(&:name).any? { |target_name| 
+              target_name.end_with?("-Binary") 
             }
+            removing_paths << path if included_binary_target
           }
+          removing_paths.each { |path| FileUtils.rm_rf(path) }
+        end
       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
+        path = File.join(@@ctx.sandbox_root, "Pods.xcodeproj")
+        @@pods_proj = Xcodeproj::Project.open(path) if File.exist?(path)
+        @@pods_target = (@@target_name.empty?) ? @@pods_proj.targets.first : @@pods_proj.target_by_name("Pods-#{@@target_name}")
+        if @@pods_target.nil?
+          Pod::UI.warn("[Binarization] 未完成二进制转换，target_name 配置错误")
+          return
         end
 
+        setup_pod_cfg(installer)
+        
         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)
+        each_pod_proj do |name, cfg|
+          process_pods_project_dependencies(name)
 
           # 处理 Binary Group
-          process_binary_group(proj, name)
+          process_binary_group(name)
 
           # 处理 XXX-xcframeworks.sh 脚本
           process_xcframeworks_shell(name)
@@ -143,38 +117,68 @@ module Dongjia
         end
 
         # 更新依赖关系
-        each_pod_proj do |name|
-          cfg = @@pod_cfg[name]
-          proj = cfg[:project]
+        each_pod_proj do |name, cfg|
           target = cfg[:target]
           next if target.nil?
           delete_list = []
+          add_list = []
           target.dependencies.each { |dep|
-            dep_cfg = @@pod_cfg[dep.name]
+            dep_pod_name = real_name(dep.name)
+            dep_cfg = @@pod_cfg[dep_pod_name]
             next if dep_cfg.nil?
-            if dep_cfg[:binary]
-              target.add_dependency(dep_cfg[:target])
+            if dep_cfg[:target].name != dep.name
+              add_list << dep_cfg[:target]
               delete_list << dep
             end
           }
           target.dependencies.delete_if { |dep| delete_list.include?(dep) }
-          cfg[:save] ||= !delete_list.empty?
+          add_list.each { |t| target.add_dependency(t) }
+          cfg[:save] ||= !delete_list.empty? || !add_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
+        save_projects
 
         process_aggregate_target_xcconfig(installer.aggregate_targets.first.name)
       end
 
       private
 
+      # 加载配置
+      def setup_pod_cfg(installer)
+        installer.analysis_result.podfile_dependency_cache.podfile_dependencies.each { |dep|
+          name = dep.name.split('/').first
+          cfg = @@submodules[name] || {}
+          cfg[:binary] = false unless cfg[:binary]
+          cfg[:save] = false unless cfg[:save]
+          cfg[:project] = Xcodeproj::Project.open(File.join(@@ctx.sandbox_root, "#{name}.xcodeproj"))
+          @@pod_cfg[name] = cfg
+        }
+      end
+
+      # 获取实际的 pod 名，如果有 -Binary 后缀，则去除后缀
+      def real_name(name)
+        name = name.delete_suffix("-Binary") if name.end_with?("-Binary")
+        return name
+      end
+
+      def save_projects
+        if Pod::Config.instance.verbose == true
+          pods_should_save = @@pod_cfg.filter { |k, v| v[:save] }.keys
+          Pod::UI.notice "Saving Pods project" unless pods_should_save.empty?
+          pods_should_save.each { |name|
+            puts "  #{name}"
+          }
+        end
+        
+        should_save = false
+        each_pod_proj do |name, cfg|
+          cfg[:project].save if cfg[:save]
+          should_save ||= cfg[:save]
+        end
+        @@pods_proj.save if !@@pods_proj.nil? && should_save
+      end
+
       # 遍历 Pods 目录下的 xcodeproj
       def each_pod_proj
         Dir.foreach(@@ctx.sandbox_root) do |filename|
@@ -184,13 +188,15 @@ module Dongjia
           next if name == 'Pods'
 
           cfg = @@pod_cfg[name]
+          next if cfg.nil?
 
-          yield(name) if block_given?
+          yield(name, cfg) if block_given?
         end
       end
 
       # 向服务器查询哪些 Pod 需要打包
       def query_components_existing(components)
+        return components unless @@enabled
         result = components
         begin
           uri = URI.parse(URI::join(@@server_host, 'api/binary/checkup').to_s)
@@ -204,49 +210,94 @@ module Dongjia
           end
           result = JSON.parse(resp.body).dig('res', 'components')
         rescue => e
-          puts "Error: #{e}"
+          puts "Binarization error: #{e}"
         end
         return result
       end
 
-      def process_target_and_dependencies(proj, name, pods_target, cfg)
+      # 加载子模块信息
+      def load_submodules_info
+        return [] unless File.exist?("./componentsOnRemote")
+
+        # 获取子模块的哈希值
+        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]
+            head_path = File.join(git_dir, head_file)
+            if File.exist?(head_path)
+              git_sha = File.read(head_path).strip
+            else
+              git_sha = nil
+            end
+          end
+          git_sha
+        end
+
+        Dir.foreach("./componentsOnRemote").to_a
+          .delete_if { |x| x.start_with?('.') }
+          .delete_if { |x|
+            # 如果子模块初始化错误，会导致目录下没有内容，需要排除掉
+            Dir.foreach("./componentsOnRemote/#{x}").to_a.all? { |f| f.start_with?(".") }
+          }
+          .map { |comp|
+            {
+              name: comp,
+              sha: git_sha_value(comp),
+              binary: false,
+            }
+          }
+      end
+
+      # 处理 Pods.xcodeproj 的依赖
+      def process_pods_project_dependencies(name)
+        cfg = @@pod_cfg[name]
+        proj = cfg[:project]
         changed = false
-        source_target = proj.target_by_name(name)
-        binary_target = proj.target_by_name("#{name}-Binary")
+
+        latest_target = nil
+        removing_target_name = nil
 
         if cfg[:binary] == true
-          # 使用 Binary 版本的 target
+          # 使用 Binary 版本的 target，如果不存在则创建一个
+          binary_target = proj.target_by_name("#{name}-Binary")
           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
+          latest_target = binary_target
+          removing_target_name = name
         else
-          @@pod_cfg[name][:target] = source_target
           # 使用源码版本的 target
+          source_target = proj.target_by_name(name)
           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
           }
+
+          latest_target = source_target
+          removing_target_name = "#{name}-Binary"
         end
-        changed
+
+        cfg[:target] = latest_target
+
+        # 更新依赖
+        changed = update_pods_target_dependency(removing_target_name, latest_target) || changed
+        changed = proj.targets.map(&:name).include?(removing_target_name) || changed
+        proj.targets.delete_if { |t| t.name == removing_target_name }
+
+        cfg[:save] = changed
       end
 
-      # 处理对应 pod 的 xcconfig
+      # 处理组件 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")
+          cfg_path = Pathname(File.join(@@ctx.sandbox_root, "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)"
@@ -283,7 +334,7 @@ module Dongjia
         # 处理 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")
+          cfg_path = Pathname(File.join(@@ctx.sandbox_root, "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)"]
@@ -316,20 +367,33 @@ module Dongjia
 
         # 添加依赖
         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
+      # 更新 Pods.xcodeproj 中 target 的依赖关系
+      def update_pods_target_dependency(removing_target_name, new_target)
+        dep_names = @@pods_target.dependencies.map(&:name)
+        changed = false
+
+        index = dep_names.index(removing_target_name)
+        if index
+          @@pods_target.dependencies.delete_at(index)
+          changed = true
+        end
+
+        index = dep_names.index(new_target.name)
+        unless index
+          @@pods_target.add_dependency(new_target)
+          changed = true
+        end
+
+        return changed
       end
 
       # 下载 framework 到 Pods/_Frameworks 目录下
       def download_frameworks
+        return unless @@enabled
         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)
@@ -359,8 +423,9 @@ module Dongjia
         }
       end
 
-      def process_binary_group(proj, name)
+      def process_binary_group(name)
         cfg = @@pod_cfg[name]
+        proj = cfg[:project]
         binary_group = proj.groups.find { |g| g.name == "Binary" }
         if cfg[:binary] == true
           if binary_group == nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-dongjia
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - jiangzhuoyi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,6 @@ files:
 - 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
@@ -130,8 +129,8 @@ licenses:
 - MIT
 metadata:
   update_desc: |2
-      - 支持集成二进制版本的 Pod
-      - 优化 reinstall 命令
+      - 修复源码和二进制切换后的集成依赖问题
+      - 修复一些导致 crash 的问题
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/dongjia_branch_inspector.rb

@@ -1,43 +0,0 @@
-require 'cocoapods'
-
-module Pod
-  
-  class Podfile
-
-    gitdir = File.join(Dir.pwd, '.git')
-    if File.exist?(gitdir)
-
-      # 获取当前分支，仅对 dev 和 master 进行校验
-      branch = `git symbolic-ref --short -q HEAD`.strip
-      if branch == 'dev' or branch == 'master'
-
-        # Hook pod 方法
-        alias_method :pod_alias_by_inspector, :pod
-        
-        def pod(name = nil, *requirements, &block)
-          
-          if name.start_with?('DJ') && requirements.count > 0
-            req = requirements.first
-            if req[:branch] && req[:branch] != 'master'
-              UI.warn "检测到 #{name} 指向了分支 #{req[:branch]}\n"
-              exit -1
-            elsif req[:tag]
-              UI.warn "检测到 #{name} 指向了标签 #{req[:tag]}\n"
-              exit -1
-            elsif req[:commit]
-              UI.warn "检测到 #{name} 指向了节点 #{req[:commit]}\n"
-              exit -1
-            end
-          end
-          
-          pod_alias_by_inspector(name, *requirements, &block)
-        end
-        
-      end
-
-    end
-
-  end
-
-end
-