podfileDep 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae182c85c4ce457ae046b56fc60699e968fad5c57e5a2dd474b8d787c9596949
-  data.tar.gz: 17f2d948b7c25dbe09b59edca27a74ded52b7a104b32d6a9fb2114ce0057abc0
+  metadata.gz: 491f4a383b768a448297d15aa5fc6d1a20579e45ddf1deba7c1f692c72f6505a
+  data.tar.gz: a5c91fe5e5e5453905ea83ca0a8c51a510c81478f3386c93ee32c79c7a74a6f7
 SHA512:
-  metadata.gz: bedea715f329881ceda03f4d250811f7b563fb7b42174b697d6293f5b57839910f2b7b90b14977e44de21b8ddd8dc0c9d6762fe40b2481ba5124b19db5fda2a3
-  data.tar.gz: 32f5be40dcfb0ed36137be7236e114c3f5af816aa5a5c2e4b21a0d679f6e8cf5cc4aa31924a8f698d0b01c023cc00564079faba95192f6089838fde47679542f
+  metadata.gz: bb54718fa3fd8b876793a5e9c2d0b8638aaf8c7a7b4481357f9bd9d030732da9cb52947ac6a1128f8f4ad41d2d7c73efffe94553f53dcdf896379941eaf32a2c
+  data.tar.gz: 864acce6a07eda525076f9397d6ad815b337b435a91681e7efcee9c206379b85dcf8cf85b6b419c31cf27c8c759f1881f971963d0c0b20181d951331c8f538d8

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 ## [Released]
+
+### [2.3.3] - 2023-7-24
+- import规范检查逻辑优化
+
+### [2.3.2] - 2023-7-6
+- 修复编译优化引用计数导致的优化不彻底问题
+
 ### [2.3.1] - 2023-7-6
 - 打印版本号
-- 
+
 ### [2.3.0] - 2023-7-6
 - 去掉use_frameworks! 由外部自由实现
 

data/lib/cocoapods_plugin.rb

@@ -1,7 +1,7 @@
 require 'cocoapods'
 require_relative 'podfileDep/command/quick'
+require_relative 'podfileDep/check/project'
 require_relative 'podfileDep/check/dep'
-require_relative 'podfileDep/check/import'
 require_relative 'podfileDep/modify/modify_code'
 require_relative 'podfileDep/reference/project'
 require_relative 'podfileDep/indirect/indirect'
@@ -29,8 +29,10 @@ module CocoapodsPlugin
     # 检查依赖库
     # Dep::DepChecker.dep_check
 
+    project = Xcodeproj::XCodeProject.new
+
     # 检查import
-    Import::ImportManager.import_check
+    project.check_import
 
     # 代码文件处理
     ModifyCode::Modify.modify_fb
@@ -49,4 +51,8 @@ module CocoapodsPlugin
 
   end
 
+  # Pod::HooksManager.register('podfileDep', :post_integrate) do |context|
+  #   puts context
+  # end
+
 end

data/lib/podfileDep/check/import.rb

@@ -1,159 +1,159 @@
-require 'pathname'
-require 'yaml'
-require_relative '../constants'
-require_relative 'module'
-require_relative 'item'
-require_relative 'xcodeproj'
-
-module Import
-  class ImportManager
-
-    # 检查import规范
-    def self.import_check
-      puts "\nimport规范检查中..."
-      start = (Time.now.to_f * 1000).to_i
-
-      project_manager = XCProject::XcodeprojManager.share_manager
-
-      # 获取需要检查的模块名和路径
-      modules = project_manager.get_development_module
-
-      # 获取Pods和本地依赖库的 组件名和包含的头文件列表 map类型
-      module_headers = project_manager.get_installed_headers_module
-
-      # 计数
-      check_count = 0
-
-      # 遍历需要被检查的模块
-      modules.each_value { |module_item|
-
-        # 某个模块从代码文件里读取的双引号依赖库 #import "XX/XX.h"
-        import_item_map = {}
-
-        #头文件的文件名
-        header_file_names = []
-
-        module_item.source_files.each { |source_file|
-
-          header_file_name = File.basename(source_file)
-          if header_file_name.end_with?(".h") or header_file_name.end_with?(".hpp")  or header_file_name.end_with?(".pch")
-            header_file_names << header_file_name
-          end
-
-          self.update_import_dot_item_map(source_file, module_item, import_item_map)
-
-          check_count += 1
-        }
-
-        if import_item_map.size == 0 and header_file_names.size == 0
-          next
-        end
-
-        messages = []
-        import_item_map.each {|key, value| #key是 xxx.h value是{ImportItem:}
-
-          # 当前仓库的文件已包含
-          if header_file_names.include?(key)
-            next
-          end
-
-          # 是否是导入的系统lib
-          if self.check_sys_libary(key)
-            next
-          end
-
-          search_module_name = self.get_module_name(module_headers, key)
-
-          unless  search_module_name
-            next
-          end
-
-          messages << "#{value.file_name} 第#{value.line_index}行 #{value.import_name} => #import <#{search_module_name}/#{value.pod}>"
-
-        }
-
-        if messages.size >0
-          puts "⚠️  组件#{module_item.module_name}存在以下情况, 请检查:"
-          puts messages
-          puts "\n"
-        end
-
-      }
-
-      duration = ((Time.now.to_f * 1000).to_i - start)*0.001
-      puts "import规范检查完毕! 共检查#{modules.size.to_s}个组件(#{check_count}个文件) 耗时:#{duration.round(2)}秒"
-    end
-
-    # 获取某个文件内对应类型的import "XXX.h"
-    def self.update_import_dot_item_map(file_path, module_name, import_item_map)
-      if File.directory?(file_path)
-        return
-      end
-
-      line_array = IO.readlines(file_path)
-      line_array.each_with_index { |line, index|
-        line = line.gsub(" ", "")
-        unless line.start_with?("#import\"")
-          next
-        end
-
-        if line.start_with?("@implementation")
-          break
-        end
-
-        line_split_array = line.split("\"")
-        if line_split_array.size <= 1
-          next
-        end
-
-        import_name = "#{line_split_array[0]}\"#{line_split_array[1]}\"" # import"XXX.h" 或import"XXX.AAA.h" 防止后边有其他内容
-
-        # 特殊处理
-        if import_name == "#import\"NBSAppAgent.h\""
-          next
-        end
-
-        podfile = import_name
-        podfile = podfile.gsub("#import\"", "")
-        podfile = podfile.gsub("\"", "") # 变成 XX.h
-
-        # 已经包含
-        if import_item_map[podfile]
-          next
-        end
-        pre_index = index-1 < 0 ? 0 : index-1
-        pre_line = line_array[pre_index]
-        pre_line = pre_line.gsub(" ", "").gsub("\n", "")
-        if pre_line.start_with?("#if") or pre_line == "#else"
-          next
-        end
-
-        file_name = File.basename(file_path)
-        line_index = index+1
-
-        import_item_map[podfile] = ImportItem.new(import_name, module_name, file_name, line_index, podfile)
-
-      }
-    end
-
-    # 根据文件名反查出属于哪个组件
-    def self.get_module_name(module_headers, file_name)
-      module_headers.each do |module_name,module_item|
-        module_item.source_files.each {|source_file|
-          if source_file.basename.to_s == file_name
-            return module_name
-          end
-        }
-      end
-      return nil
-    end
-
-    # 获取某库是否是系统级的依赖库
-    def self.check_sys_libary(name)
-      name = name.gsub(".h", "")
-      libs = Constants::LIBLIBARYS
-      return libs.include?(name)
-    end
-
-  end
-end
+# require 'pathname'
+# require 'yaml'
+# require_relative '../constants'
+# require_relative 'module'
+# require_relative 'item'
+# require_relative 'xcodeproj'
+#
+# module Import
+#   class ImportManager
+#
+#     # 检查import规范
+#     def self.import_check
+#       puts "\nimport规范检查中..."
+#       start = (Time.now.to_f * 1000).to_i
+#
+#       project_manager = XCProject::XcodeprojManager.share_manager
+#
+#       # 获取需要检查的模块名和路径
+#       modules = project_manager.get_development_module
+#
+#       # 获取Pods和本地依赖库的 组件名和包含的头文件列表 map类型
+#       module_headers = project_manager.get_installed_headers_module
+#
+#       # 计数
+#       check_count = 0
+#
+#       # 遍历需要被检查的模块
+#       modules.each_value { |module_item|
+#
+#         # 某个模块从代码文件里读取的双引号依赖库 #import "XX/XX.h"
+#         import_item_map = {}
+#
+#         #头文件的文件名
+#         header_file_names = []
+#
+#         module_item.source_files.each { |source_file|
+#
+#           header_file_name = File.basename(source_file)
+#           if header_file_name.end_with?(".h") or header_file_name.end_with?(".hpp")  or header_file_name.end_with?(".pch")
+#             header_file_names << header_file_name
+#           end
+#
+#           self.update_import_dot_item_map(source_file, module_item, import_item_map)
+#
+#           check_count += 1
+#         }
+#
+#         if import_item_map.size == 0 and header_file_names.size == 0
+#           next
+#         end
+#
+#         messages = []
+#         import_item_map.each {|key, value| #key是 xxx.h value是{ImportItem:}
+#
+#           # 当前仓库的文件已包含
+#           if header_file_names.include?(key)
+#             next
+#           end
+#
+#           # 是否是导入的系统lib
+#           if self.check_sys_libary(key)
+#             next
+#           end
+#
+#           search_module_name = self.get_module_name(module_headers, key)
+#
+#           unless  search_module_name
+#             next
+#           end
+#
+#           messages << "#{value.file_name} 第#{value.line_index}行 #{value.import_name} => #import <#{search_module_name}/#{value.pod}>"
+#
+#         }
+#
+#         if messages.size >0
+#           puts "⚠️  组件#{module_item.module_name}存在以下情况, 请检查:"
+#           puts messages
+#           puts "\n"
+#         end
+#
+#       }
+#
+#       duration = ((Time.now.to_f * 1000).to_i - start)*0.001
+#       puts "import规范检查完毕! 共检查#{modules.size.to_s}个组件(#{check_count}个文件) 耗时:#{duration.round(2)}秒"
+#     end
+#
+#     # 获取某个文件内对应类型的import "XXX.h"
+#     def self.update_import_dot_item_map(file_path, module_name, import_item_map)
+#       if File.directory?(file_path)
+#         return
+#       end
+#
+#       line_array = IO.readlines(file_path)
+#       line_array.each_with_index { |line, index|
+#         line = line.gsub(" ", "")
+#         unless line.start_with?("#import\"")
+#           next
+#         end
+#
+#         if line.start_with?("@implementation")
+#           break
+#         end
+#
+#         line_split_array = line.split("\"")
+#         if line_split_array.size <= 1
+#           next
+#         end
+#
+#         import_name = "#{line_split_array[0]}\"#{line_split_array[1]}\"" # import"XXX.h" 或import"XXX.AAA.h" 防止后边有其他内容
+#
+#         # 特殊处理
+#         if import_name == "#import\"NBSAppAgent.h\""
+#           next
+#         end
+#
+#         podfile = import_name
+#         podfile = podfile.gsub("#import\"", "")
+#         podfile = podfile.gsub("\"", "") # 变成 XX.h
+#
+#         # 已经包含
+#         if import_item_map[podfile]
+#           next
+#         end
+#         pre_index = index-1 < 0 ? 0 : index-1
+#         pre_line = line_array[pre_index]
+#         pre_line = pre_line.gsub(" ", "").gsub("\n", "")
+#         if pre_line.start_with?("#if") or pre_line == "#else"
+#           next
+#         end
+#
+#         file_name = File.basename(file_path)
+#         line_index = index+1
+#
+#         import_item_map[podfile] = ImportItem.new(import_name, module_name, file_name, line_index, podfile)
+#
+#       }
+#     end
+#
+#     # 根据文件名反查出属于哪个组件
+#     def self.get_module_name(module_headers, file_name)
+#       module_headers.each do |module_name,module_item|
+#         module_item.source_files.each {|source_file|
+#           if source_file.basename.to_s == file_name
+#             return module_name
+#           end
+#         }
+#       end
+#       return nil
+#     end
+#
+#     # 获取某库是否是系统级的依赖库
+#     def self.check_sys_libary(name)
+#       name = name.gsub(".h", "")
+#       libs = Constants::LIBLIBARYS
+#       return libs.include?(name)
+#     end
+#
+#   end
+# end

data/lib/podfileDep/check/project.rb

@@ -0,0 +1,332 @@
+require 'pathname'
+require 'colored2'
+
+module Xcodeproj
+
+  class ImportItem
+    attr_accessor :import_name
+    attr_accessor :module_name
+    attr_accessor :file_path
+    attr_accessor :import_file_name
+    attr_accessor :line_index
+    def initialize
+      @import_name = nil
+      @module_name = nil
+      @file_path = nil
+      @import_file_name = nil
+      @line_index = nil
+    end
+
+  end
+
+  class ModuleItem
+
+    public
+    # 组名名
+    attr_accessor :module_name
+
+    # 组件路径
+    attr_accessor :module_path
+
+    # podspec路径
+    attr_accessor :podspec_path
+
+    # 组件目录的所有被引用的文件数组
+    attr_accessor :header_files
+
+    # 组件目录的所有被引用的文件数组
+    attr_accessor :source_files
+
+    # 是否是开发模块
+    attr_reader :is_development_module
+
+    # [Hash{String => ImportItem}]
+    attr_accessor :import_items
+
+    def initialize(module_name)
+      @module_name = module_name
+      @module_path = nil
+      @podspec_path = nil
+      @header_files = {}
+      @source_files = {}
+      @import_items = []
+    end
+
+    # 是否是开发模块
+    # @return bool
+    def is_development_module
+      !!(podspec_path)
+    end
+
+    # 生成 import "XXX.h"的信息
+    def init_import_info
+      source_files.each_value do |source_file_path|
+        if File.directory?(source_file_path)
+          next
+        end
+
+        line_array = IO.readlines(source_file_path)
+        line_array.each_with_index { |line, line_index|
+          line = line.gsub(" ", "")
+
+          unless line.start_with?("#import")
+            next
+          end
+
+          if line.start_with?("@implementation")
+            break
+          end
+
+          # 前一行的内容
+          pre_index = line_index-1 < 0 ? 0 : line_index-1
+          pre_line = line_array[pre_index]
+
+          if line.start_with?("#import\"") #本组件
+            import_item = own_module_import(line, source_file_path, line_index, @module_name, pre_line)
+            if import_item
+              import_items << import_item
+            end
+          elsif line.start_with?("#import<") #其他组件
+
+          end
+
+        }
+      end
+
+      import_items
+    end
+
+    private
+    # 生成自己模块的import item
+    # @param line 以 import" 开头
+    def own_module_import(line, file_path, line_index, module_name, pre_line)
+      line_split_array = line.split("\"")
+      if line_split_array.size <= 1
+        return nil
+      end
+
+      import_content = "#{line_split_array[0]}\"#{line_split_array[1]}\"" # import"XXX.h" 或import"XXX.AAA.h" 防止后边有其他内容
+
+      # 特殊处理
+      if import_content == "#import\"NBSAppAgent.h\""
+        return nil
+      end
+
+      pre_line = pre_line.gsub(" ", "").gsub("\n", "")
+      if pre_line.start_with?("#if") or pre_line == "#else"
+        return nil
+      end
+
+      import_file_name = import_content
+      import_file_name = import_file_name.gsub("#import\"", "")
+      import_file_name = import_file_name.gsub("\"", "") # 变成 XX.h
+
+
+      import_item = ImportItem.new # (import_name, module_name, file_name, line_index, podfile)
+      import_item.import_name = import_content.gsub("#import\"", "#import \"")
+      import_item.module_name = module_name
+      import_item.file_path = file_path
+      import_item.import_file_name = import_file_name
+      import_item.line_index = line_index + 1
+
+      import_item
+    end
+
+
+    def other_module_import(line)
+
+    end
+  end
+
+  class XCodeProject
+
+    # 壳工程xcodeproj对象
+    # @return Xcodeproj::Project
+    attr_accessor :shell_project
+
+    # Pods工程xcodeproj对象
+    # @return Xcodeproj::Project
+    attr_accessor :pod_project
+
+    # @return [Hash{String => ModuleItem}]
+    attr_accessor :module_items
+
+
+    def initialize
+      @shell_project = nil
+      @pod_project = nil
+      @module_items = {}
+      init_shell_project
+      init_pod_project
+      expand_module
+    end
+
+    def init_shell_project
+      xcodeproj_file = nil
+      Dir.foreach(Dir.pwd) do |file|
+        if file.end_with?(".xcodeproj")
+          xcodeproj_file = file
+          break
+        end
+      end
+
+      xcodeproj_path = "#{Dir.pwd}/#{xcodeproj_file}"
+      unless File.exist?(xcodeproj_path)
+        return nil
+      end
+
+      @shell_project = Xcodeproj::Project.open(xcodeproj_path)
+    end
+
+    def init_pod_project
+      xcodeproj_path = "#{Dir.pwd}/Pods/Pods.xcodeproj"
+      unless File.exist?(xcodeproj_path)
+        return nil
+      end
+
+      @pod_project = Xcodeproj::Project.open(xcodeproj_path)
+    end
+
+    # 展开模块
+    def expand_module
+      self.expand_with_module(pod_project.main_group, nil)
+    end
+
+    # 展开模块
+    def expand_with_module(group, module_name)
+
+      if group.class != Xcodeproj::Project::Object::PBXGroup
+        return
+      end
+
+      if not module_name and group.hierarchy_path
+        group_hierarchy_path_array = group.hierarchy_path.split("/")
+        module_name = group_hierarchy_path_array.size >= 3 ? group_hierarchy_path_array[2] : nil
+      end
+
+      # 创建 source_file_item
+      source_file_item = @module_items[module_name]
+      if module_name and not source_file_item
+        source_file_item = ModuleItem.new(module_name)
+        @module_items[module_name] = source_file_item
+      end
+
+      # 更新module_path
+      if source_file_item and not source_file_item.module_path and group.hierarchy_path
+        group_hierarchy_path_array = group.hierarchy_path.split("/")
+        if group_hierarchy_path_array.size == 3
+          source_file_item.module_path = group.real_path
+        end
+      end
+
+      # 文件引用
+      file_reference_class = Xcodeproj::Project::Object::PBXFileReference
+
+      not_child_names = ["Podfile","Frameworks", "Products","Targets Support Files","Support Files"]
+      source_file_extension = %w[.h .m .mm .pch .c .cc .cpp .hpp]
+      header_file_extension = %w[.h .hpp]
+
+      group.children.each {|child|
+
+        module_name = source_file_item ? source_file_item.module_name : nil
+
+        if not_child_names.include?(child.name)
+          # puts "不检查：#{child.name} #{child.real_path}"
+          next
+        end
+
+        if child.class != file_reference_class
+          # puts "不是文件引用：#{child.class}  #{child.real_path}"
+          self.expand_with_module(child, module_name)
+          next
+        end
+
+        hierarchy_path_array = child.hierarchy_path.split("/")
+        if hierarchy_path_array.size < 3
+          self.expand_with_module(child, module_name)
+          next
+        end
+
+        if source_file_item
+          extend_name = child.real_path.basename.extname
+          if extend_name == ".podspec" or extend_name == ".podspec.json"
+            source_file_item.podspec_path = child.real_path
+          elsif source_file_extension.include?(extend_name)
+            source_file_item.source_files[child.real_path.basename.to_s] = child.real_path
+            if header_file_extension.include?(extend_name)
+              source_file_item.header_files[child.real_path.basename.to_s] = child.real_path
+            end
+          else
+            # puts child.real_path
+          end
+        end
+
+        # 递归展开
+        self.expand_with_module(child, module_name)
+      }
+
+    end
+
+    # 检查import规范
+    def check_import
+      puts "import检查中..."
+      start = (Time.now.to_f * 1000).to_i
+      module_count = 0
+      file_count = 0
+
+      module_items.each do |module_name, module_item|
+        unless module_item.is_development_module
+          next
+        end
+        module_count += 1
+
+        messages = []
+
+        did_check_imports = {}
+        module_item.init_import_info
+
+        module_item.import_items.each do |import_item|
+          file_count += 1
+          did_check_import = did_check_imports[import_item.import_file_name]
+          if did_check_import
+            next
+          end
+          need_module_item = module_items[import_item.module_name]
+          real_path = need_module_item.header_files[import_item.import_file_name]
+          did_check_imports[import_item.import_file_name] = !!(real_path)
+          unless real_path
+            # 去查找所属模块
+            expect_module_name = find_module_with_header_file(import_item.import_file_name)
+            if expect_module_name
+              messages << "#{import_item.file_path.basename} 第#{import_item.line_index}行 #{import_item.import_name} => #import <#{expect_module_name}/#{import_item.import_file_name}>"
+            end
+          end
+        end
+
+        if messages.size >0
+          puts "组件#{module_item.module_name}存在以下情况, 请检查:".yellow
+          puts messages
+          puts "\n"
+        end
+
+      end
+
+      duration = ((Time.now.to_f * 1000).to_i - start)*0.001
+      puts "import检查完毕! 共检查#{module_count}个组件(#{file_count}个import) 耗时:#{duration.round(2)}秒"
+    end
+
+    private
+    # 根据头文件名查找所属组件
+    # @return [String, nil]
+    def find_module_with_header_file(header_file_name)
+      module_items.each do |module_name, module_item|
+        file_path =  module_item.header_files[header_file_name]
+        if file_path
+          return module_item.module_name
+        end
+      end
+      nil
+    end
+
+  end
+end

data/lib/podfileDep/thin/pod_target.rb

@@ -15,14 +15,9 @@ module Pod
 
     # 引用计数减1
     def reduce_reference_count
-      if self.reference_count > 0
-        self.reference_count -= 1
-      end
+      self.reference_count -= 1
 
       self.dependent_targets.each do |dep|
-        if dep.reference_count == 0
-          next
-        end
         dep.reduce_reference_count
       end
     end

data/lib/podfileDep/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PodfileDep
-  VERSION = "2.3.1"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors:
 - 王帅朋
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -69,6 +69,7 @@ files:
 - lib/podfileDep/check/import.rb
 - lib/podfileDep/check/item.rb
 - lib/podfileDep/check/module.rb
+- lib/podfileDep/check/project.rb
 - lib/podfileDep/check/xcodeproj.rb
 - lib/podfileDep/command/quick.rb
 - lib/podfileDep/constants.rb