podfileDep 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50e737e2140890e04f3c8d4761e5fe9a95d8744f070fae28c1adb241099f3e9d
-  data.tar.gz: b5e4cb2736576920794a0278fc745c909ec615783fed0eadc0474094d130f1ca
+  metadata.gz: 98e0473afab8ed38d19dd5fe2f1483ba2d8bb592d364b9c29bceda3314c65d46
+  data.tar.gz: 37f8f5306318c471f98052415912563c397515f573aa4cde506343959bc0ee57
 SHA512:
-  metadata.gz: ad13070d408d863fd0eb1585e7f80323ed284d72af1fdb01b54619c1aab61b7642acf18fc8d48d855e2bb50dbfd8f1f5d52297b4231fddc75440131ed5290fd8
-  data.tar.gz: e9b622927e64d40733416304d3a96c1afca6e7d34735bc7f153a4916b003f43394657066144649a6c10c5ab526ffee59e7c85bbabd9b2763e902342e1c593faf
+  metadata.gz: 27250cce3354cc8af046c4a3c410ad6ef9e9b181973d8a6a00ed780af64871a710df85231e6ec1f3fafbbfc7c75663a67a55e890ed28cca25244aad4172775ed
+  data.tar.gz: 6cc16f12cd5690f8508f6b4949e6c45d272d7965a69927fcabda0dc65fa75a542d5a3504a2d395f38a88737c8860f8fb97291e34d1f7b4ab9144f8e9d9d42ec7

data/CHANGELOG.md

@@ -32,4 +32,16 @@
 
 ## [2.0.1] - 2023-6-19
 
-- 打印间接依赖
+- 打印间接依赖
+
+## [2.1.0] - 2023-6-19
+
+- QUICKBUILD字段支持移除不被引用的依赖
+- 
+## [2.1.1] - 2023-6-19
+
+- 移除不被引用的依赖在pod install时加速
+
+## [2.1.2] - 2023-6-19
+
+- 被local文件引用的依赖 不移除

data/lib/podfileDep/reference/uninstall.rb

@@ -3,59 +3,61 @@ module Pod
   # 移除未使用的组件
   class Uninstall
 
-    def uninstall(module_name)
-      puts "移除：#{module_name}"
+    def uninstall(uninstall_list)
       project_manager = XCProject::XcodeprojManager.share_manager
 
       # 删除引用
       pods_project = project_manager.get_pods_project
-      uninstall_from_project(module_name, pods_project)
+      uninstall_from_project(uninstall_list, pods_project)
       pods_project.save
 
       # 删除资源文件等
-      uninstall_from_frameworks(module_name, project_manager)
-
+      uninstall_from_frameworks(uninstall_list, project_manager)
 
     end
 
-    def uninstall_from_frameworks(module_name, project_manager)
+    def uninstall_from_frameworks(module_list, project_manager)
       targets = project_manager.get_shell_targets
       targets.each do |target_name|
 
         target_supporting = "Pods-#{target_name}"
         resource_shell = "Pods-#{target_name}-resources.sh"
         resource_shell_path = "#{Dir.pwd}/Pods/Target Support Files/#{target_supporting}/#{resource_shell}"
-        uninstall_from_file(resource_shell_path, module_name, "install_resource")
+        uninstall_from_file(resource_shell_path, module_list, "install_resource")
 
         # 删除frameworks
         frameworks_shell = "Pods-#{target_name}-frameworks.sh"
         frameworks_shell_path = "#{Dir.pwd}/Pods/Target Support Files/#{target_supporting}/#{frameworks_shell}"
-        uninstall_from_file(frameworks_shell_path, module_name, "install_framework")
+        uninstall_from_file(frameworks_shell_path, module_list, "install_framework")
 
         # 删除配置
         # 根据通配符找到真实路径
         config_patton = "Pods-#{target_name}.*.xcconfig"
         config_patton_path = "#{Dir.pwd}/Pods/Target Support Files/#{target_supporting}/#{config_patton}"
         Dir[config_patton_path].select{|config_real_path|
-          module_name = module_name.gsub("+", "_")
-          module_name = module_name.gsub("-", "_")
-          uninstall_for_config(config_real_path, module_name)
+          uninstall_for_config(config_real_path, module_list)
         }
       end
 
     end
-    def uninstall_for_config(file_path, module_name)
+    def uninstall_for_config(file_path, module_list)
       find_array = []
-      find_array << " -framework \"#{module_name}\""
-      find_array << " \"${PODS_CONFIGURATION_BUILD_DIR}/#{module_name}/#{module_name}.framework/Headers\""
-      find_array << " \"${PODS_CONFIGURATION_BUILD_DIR}/#{module_name}\""
-      find_array << " \"${PODS_ROOT}/#{module_name}\""
-      find_array << " \"${PODS_XCFRAMEWORKS_BUILD_DIR}/#{module_name}\""
+      module_list.each do |module_name|
+        module_name = module_name.gsub("+", "_")
+        module_name = module_name.gsub("-", "_")
+
+        find_array << " -framework \"#{module_name}\""
+        find_array << " \"${PODS_CONFIGURATION_BUILD_DIR}/#{module_name}/#{module_name}.framework/Headers\""
+        find_array << " \"${PODS_CONFIGURATION_BUILD_DIR}/#{module_name}\""
+        find_array << " \"${PODS_ROOT}/#{module_name}\""
+        find_array << " \"${PODS_XCFRAMEWORKS_BUILD_DIR}/#{module_name}\""
+
+      end
 
       replace = ""
       replace_str(file_path, find_array, replace)
     end
-    def uninstall_from_file(file_path, module_name , keyword)
+    def uninstall_from_file(file_path, module_list , keyword)
       unless File.exist?(file_path)
         return
       end
@@ -64,9 +66,19 @@ module Pod
       content = ""
       line_array = IO.readlines(file_path)
       line_array.each_with_index { |line, index|
-        if line.include?(keyword) and line.include?("/#{module_name}/")
-          content += "  echo 'remove #{module_name}'\n"
-          next
+        if line.include?(keyword)
+          contain = false
+          module_list.each{|module_name|
+            if line.include?("/#{module_name}/")
+              contain = true
+            end
+          }
+
+          if contain
+            content += "  echo ''\n"
+            next
+          end
+
         end
         content += line
       }
@@ -77,13 +89,13 @@ module Pod
       }
     end
 
-    def uninstall_from_project(module_name, pods_project)
+    def uninstall_from_project(module_list, pods_project)
       pods_project.main_group.children.each {|child|
         if child.display_name != "Pods" and child.display_name != "Development Pods"
           next
         end
         child.children.reject! {|sun|
-          sun.display_name == module_name
+          module_list.include?(sun.display_name)
         }
       }
 
@@ -92,7 +104,7 @@ module Pod
       end
 
       pods_project.targets.reject! do |child|
-        child.name == module_name
+        module_list.include?(child.display_name)
       end
     end
 

data/lib/podfileDep/reference/unused.rb

@@ -27,12 +27,13 @@ module Unused
       end
 
       # 是否需要快速编译
-      quick_build = Pod::YamlRelies.quick_build
+      quick_build = Pod::YamlManager.share_manager.quick_build
 
       uninstaller = Pod::Uninstall.new
 
       # 未使用的列表
       unused_list = []
+      uninstall_list = []
       installed_modules.each do |module_item|
 
         module_name = module_item.keys[0]
@@ -45,8 +46,9 @@ module Unused
         end
 
         if not used and not unused_list.include?(real_module_name)
-          if quick_build
-            uninstaller.uninstall(real_module_name)
+          local_contain = Pod::YamlManager.share_manager.local_yaml_contain(real_module_name)
+          if quick_build and not local_contain
+            uninstall_list << real_module_name
           else
             unused_list << real_module_name
           end
@@ -54,8 +56,14 @@ module Unused
       end
 
       if unused_list.size >0
-        puts unused_list
-        puts "以上组件未被任何地方引用"
+        # puts unused_list
+        puts "未被任何地方引用的组件:#{unused_list}"
+      end
+
+      if uninstall_list.size > 0
+        # puts uninstall_list
+        puts "被移除组件:#{uninstall_list}"
+        uninstaller.uninstall(uninstall_list)
       end
 
       duration = ((Time.now.to_f * 1000).to_i - start)*0.001

data/lib/podfileDep/version.rb

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

data/lib/podfileDep/yaml/yaml_dep.rb

@@ -42,9 +42,25 @@ module Pod
     end
 
   end
-  class YamlRelies
+  class YamlManager
 
-    def self.analysis_yaml(podfile, old)
+    attr_accessor :local_yaml_deps
+
+    def initialize
+      @local_yaml_deps = []
+    end
+
+    # 单例方法
+    @@instance = YamlManager.new
+
+    # 获取单例
+    def self.share_manager
+      @@instance
+    end
+
+    private_class_method :new
+
+    def analysis_yaml(podfile, old)
 
       # 获取targets列表
       project_manager = XCProject::XcodeprojManager.share_manager
@@ -56,25 +72,25 @@ module Pod
       podfile_third_party_yaml = Constants::PODFILE_THIRD_PARTY_YAML
 
       # 检查参数
-      self.check_param(targets)
+      check_param(targets)
 
       # 生成YAML文件
-      self.generate_local_yaml(podfile_local_yaml)
-      self.generate_module_yaml(podfile_module_yaml, "# 企业内部组件")
-      self.generate_module_yaml(podfile_third_party_yaml, "# 第三方维护组件")
+      generate_local_yaml(podfile_local_yaml)
+      generate_module_yaml(podfile_module_yaml, "# 企业内部组件")
+      generate_module_yaml(podfile_third_party_yaml, "# 第三方维护组件")
 
       # 读取yaml依赖
       yaml_dependencies = {}
-      self.read_yaml_dependencies(podfile_third_party_yaml,false ,yaml_dependencies)
-      self.read_yaml_dependencies(podfile_module_yaml,false ,yaml_dependencies)
-      self.read_yaml_dependencies(podfile_local_yaml,true ,yaml_dependencies)
+      read_yaml_dependencies(podfile_third_party_yaml,false ,yaml_dependencies)
+      read_yaml_dependencies(podfile_module_yaml,false ,yaml_dependencies)
+      read_yaml_dependencies(podfile_local_yaml,true ,yaml_dependencies)
 
       # 打印依赖
-      self.print_dependencies(yaml_dependencies)
+      print_dependencies(yaml_dependencies)
 
       # 为所有target生成依赖
       targets_dependencies = {}
-      self.update_target_dependencies(targets, yaml_dependencies, targets_dependencies)
+      update_target_dependencies(targets, yaml_dependencies, targets_dependencies)
 
       # 兼容老方式
       if old
@@ -82,11 +98,11 @@ module Pod
       end
 
       # 存储所有依赖
-      self.store_dependencies(targets_dependencies, podfile)
+      store_dependencies(targets_dependencies, podfile)
 
     end
 
-    def self.store_dependencies(targets, podfile)
+    def store_dependencies(targets, podfile)
       # 存储所有的依赖
       targets.each { |name, dependencies|
         podfile.target name do
@@ -104,7 +120,7 @@ module Pod
     end
 
     # 检查方法调用的参数
-    def self.check_param(targets)
+    def check_param(targets)
       msg = "❌ 参数需要填写target名字, 参数类型是字符串格式的数组。例如[\"test1\", \"test2\"]"
       unless targets.class == Array
         puts msg
@@ -120,7 +136,7 @@ module Pod
     end
 
     # 校验yaml文件写法是否正确
-    def self.yaml_content(yaml_name)
+    def yaml_content(yaml_name)
       unless File.exist?(yaml_name)
         puts "文件不存在:"+yaml_name
         return nil
@@ -166,10 +182,10 @@ module Pod
     end
 
     # 读取yaml依赖
-    def self.read_yaml_dependencies(yaml_name, can_cover, yaml_dependencies)
+    def read_yaml_dependencies(yaml_name, can_cover, yaml_dependencies)
 
       # 检查写法
-      yaml_content = self.yaml_content(yaml_name)
+      yaml_content = yaml_content(yaml_name)
 
       unless yaml_content
         return
@@ -202,7 +218,7 @@ module Pod
         dependency.each_key { |key|
           unless available_keys.include?(key)
             gem_name = "yaml_relies"
-            puts "❌ #{yaml_name}: 当前#{gem_name}版本(#{Yaml_relies::VERSION})不支持字段#{key}"
+            puts "❌ #{yaml_name}: 当前#{gem_name}版本(#{PodfileDep::VERSION})不支持字段#{key}"
             puts "请检查对应字段或尝试执行如下命令升级"
             puts "gem uninstall #{gem_name} && gem install #{gem_name}"
             exit!
@@ -277,6 +293,11 @@ module Pod
         binary = dependency['binary'] ? !!dependency['binary'] : true
         version = (dependency['path'] or dependency['podspec']) ? nil :dependency['version']
 
+        # 记录
+        if yaml_name == Constants::PODFILE_LOCAL_YAML
+          self.local_yaml_deps << dependency['pod']
+        end
+
         # 生成依赖对象
         dependency = YamlRely.new(module_name = dependency['module'],
                                   pod = dependency['pod'],
@@ -297,7 +318,7 @@ module Pod
     end
 
     # 生成传进来的target的依赖库列表
-    def self.update_target_dependencies(targets, yaml_dependencies, targets_dependencies)
+    def update_target_dependencies(targets, yaml_dependencies, targets_dependencies)
       temp_array = []
       yaml_dependencies.each_value { |value|
         temp_array << value
@@ -308,7 +329,7 @@ module Pod
       }
     end
 
-    def self.print_dependencies(yaml_dependencies)
+    def print_dependencies(yaml_dependencies)
       puts "➡️  解析依赖总数共计:#{yaml_dependencies.size}个\n\n"
       puts '⬇️  打印依赖'
       yaml_dependencies.each_value { |dependency|
@@ -347,8 +368,12 @@ module Pod
       puts "⬆️  打印完毕"
     end
 
+    def local_yaml_contain(module_name)
+      local_yaml_deps.include?(module_name)
+    end
+
     # 是否需要快速编译
-    def self.quick_build
+    def quick_build
 
       podfile_local_yaml = Constants::PODFILE_LOCAL_YAML
 
@@ -368,7 +393,7 @@ module Pod
     end
 
     # 生成local文件
-    def self.generate_local_yaml(podfile_local_yaml)
+    def generate_local_yaml(podfile_local_yaml)
       if File.exist?(podfile_local_yaml)
         return
       end
@@ -404,7 +429,7 @@ module Pod
     end
 
     # 生成其他的yaml文件
-    def self.generate_module_yaml(yaml_name, prefix)
+    def generate_module_yaml(yaml_name, prefix)
       if File.exist?(yaml_name)
         return
       end

data/lib/podfileDep.rb

@@ -9,7 +9,7 @@ module Pod
       plugin("podfileDep")
 
       # 解析依赖
-      Pod::YamlRelies.analysis_yaml(self, false)
+      Pod::YamlManager.share_manager.analysis_yaml(self, false)
 
     end
   end
@@ -18,7 +18,7 @@ end
 # 兼容旧的方式
 module PodfileDep
   def PodfileDep.setup(targets)
-    res = Pod::YamlRelies.analysis_yaml(nil, true)
+    res = Pod::YamlManager.share_manager.analysis_yaml(nil, true)
     warn "\n⚠️ [PodfileDep.setup方法已过期]，请使用新的方式, 参考：https://gitee.com/sourceiOS/podfileDepDemo/blob/master/Podfile\n"
     res
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - 王帅朋