podfileDep 2.7.7 → 3.0.0

data/lib/{podfileDep → core_blur}/yaml/yaml_dep.rb

@@ -1,34 +1,19 @@
 require_relative 'yaml_pod'
-require_relative '../version'
+require_relative '../../version'
 require_relative '../my_constants'
 require_relative '../check/xcodeproj'
 require_relative '../variable'
 require 'colored2'
 require 'yaml'
-
 module Pod
   class YamlDep
-
-    # 主工程target列表
-    # @return [String]
     attr_accessor :targets
-
-    # 主工程里所有yaml文件定义的依赖
-    # @return {String, {String, [Pod:YamlPod]}}
     attr_accessor :yaml_deps
-
-    # 解析后生成主工程里所有yaml文件定义的依赖
-    # @return {String, [Pod:YamlPod]}
     attr_accessor :all_deps
-
-    # 所有的targets对应的依赖库列表
-    # @return {String, [Pod:YamlPod]}
     attr_accessor :targets_dependencies
-
     attr_accessor :podfile_local_yaml
     attr_accessor :podfile_module_yaml
     attr_accessor :podfile_third_party_yaml
-
     def initialize
       super
       @targets = []
@@ -39,17 +24,13 @@ module Pod
       @podfile_module_yaml = MyConstants::PODFILE_MODULE_YAML
       @podfile_third_party_yaml = MyConstants::PODFILE_THIRD_PARTY_YAML
     end
-
     def install_yaml_dep(podfile)
       analysis_yaml_dep
-
       install_dependencies(targets_dependencies, podfile) do|name|
         yield(name) if block_given?
       end
     end
-
     def install_dependencies(targets_dependencies, podfile)
-      # 存储所有的依赖
       targets_dependencies.each { |target_obj, dependencies|
         target_name = target_obj.name
         podfile.target target_name do
@@ -65,9 +46,6 @@ module Pod
       }
       targets
     end
-
-    # 获取非扩展target定义在yaml文件的依赖
-    # @return targets_dependencies
     def analysis_yaml_dep
       init_main_targets
       generate_yaml
@@ -76,7 +54,6 @@ module Pod
       print_yaml_deps
       resolve_targets_deps
     end
-
     def resolve_targets_deps
       targets.each { |target|
         if target.product_type.end_with?(".application")
@@ -87,22 +64,17 @@ module Pod
       }
       targets_dependencies
     end
-
-    # 读取yaml文件的依赖
     def read_yaml_deps
       read_yaml_deps_file(podfile_third_party_yaml)
       read_yaml_deps_file(podfile_module_yaml)
       read_yaml_deps_file(podfile_local_yaml)
     end
-
-    # 解析所有的依赖
     def analyzing_yaml_deps
       yaml_deps.each do |yaml_name, deps|
         if yaml_name == podfile_local_yaml
           clean = false #记录只能清一次就够了
           deps.each { |name, dep|
             real_name = name.split("/")[0]
-            # 有子模块 把之前的全部清空
             if Array(dep.subspecs).size > 0 or Array(dep.configurations).size > 0
               unless clean
                 all_deps.delete_if{|pod_name|
@@ -115,29 +87,22 @@ module Pod
                 clean = true
               end
             end
-
             if all_deps.has_key?(name)
               puts "#{name} 被#{yaml_name}覆盖".green
             end
-
             all_deps[name] = dep
           }
         else
           @all_deps.merge!(deps)
         end
-
       end
       all_deps
     end
-
     def read_yaml_deps_file(yaml_name)
-
       yaml_content = read_yaml_content(yaml_name)
-
       unless yaml_content
         return
       end
-
       if yaml_name != podfile_local_yaml
         if not yaml_content["SOURCE"] or yaml_content["SOURCE"].class != String
           puts "#{yaml_name}的SOURCE字段必须是字符串且不为空"
@@ -148,45 +113,27 @@ module Pod
           exit!
         end
       end
-
       unless yaml_content["PODS"]
         puts "#{yaml_name}共0个依赖(文件内的key[PODS]不存在)"
         return
       end
-
       if yaml_content["PODS"].class != Array
         puts "#{yaml_name}共0个依赖(文件配置的依赖PODS项不是数组或数组为空)"
         return
       end
-
-      # 读取默认源码source
       default_source_source = yaml_content['SOURCE']
-
-      # 读取默认二进制source
       default_binary_source = yaml_content['BINARY_SOURCE']
-
-      # 依赖列表
       dependencies_pods = yaml_content['PODS']
-
-      # 当前yaml文件的组件名字 用来校验本文件内是否重复
       dependencies_name = []
-
       yaml_dependencies = {}
-
-      # 遍历依赖库列表
       dependencies_pods.each { |dependency|
-
         check_pod(dependency, yaml_name, dependencies_name)
-
-        # 默认值
         source = dependency['source']
         unless source
           source = dependency['binary'] ? default_binary_source : default_source_source
         end
         inhibit_warnings = dependency['inhibit_warnings'] ? !!dependency['inhibit_warnings'] : false
         binary = dependency['binary'] ? !!dependency['binary'] : true
-
-        # configurations和subspecs cocoapods不能同时支持，所以要展开
         if Array(dependency['subspecs']).size > 0 and Array(dependency['configurations']).size > 0
           dependency['subspecs'].each {|subspec|
             dep = YamlPod.new(pod = "#{dependency['pod']}/#{subspec}")
@@ -204,7 +151,6 @@ module Pod
             dep.binary = binary
             yaml_dependencies[dep.pod] = dep
           }
-
         else
           dep = YamlPod.new(pod = dependency['pod'])
           dep.module_name = dependency['module']
@@ -222,14 +168,10 @@ module Pod
           yaml_dependencies[dep.pod] = dep
         end
       }
-
       yaml_deps[yaml_name] = yaml_dependencies
-
       yaml_dependencies
     end
-
     def check_pod(dependency, yaml_name, dependencies_name)
-      # 不支持提醒
       available_keys = %w[module pod subspecs path podspec version git tag branch configurations inhibit_warnings source binary]
       dependency.each_key { |key|
         unless available_keys.include?(key)
@@ -240,25 +182,20 @@ module Pod
           exit!
         end
       }
-
-      # 校验字段
       unless dependency['pod']
         puts "#{yaml_name}: pod 字段(组件名字)必须存在,请检查:"
         exit!
       end
-
       current_type = nil
       current_type = check_only_one_dep(dependency, "path", current_type, yaml_name)
       current_type = check_only_one_dep(dependency, "podspec", current_type, yaml_name)
       current_type = check_only_one_dep(dependency, "version", current_type, yaml_name)
       current_type = check_only_one_dep(dependency, "tag", current_type, yaml_name)
       current_type = check_only_one_dep(dependency, "branch", current_type, yaml_name)
-
       unless current_type
         puts "#{yaml_name} - #{dependency['pod']}: path/podspec/version/git/tag/branch 字段请指定其中一个"
         exit!
       end
-
       unless dependency['git']
         if dependency['tag']
           puts "#{yaml_name} - #{dependency['pod']}: 你指定了tag，但未配置git地址，请为此组件配置git字段"
@@ -269,36 +206,27 @@ module Pod
           exit!
         end
       end
-
-      #  检查数据类型
       if dependency['configurations'] and dependency['configurations'].class != Array
         puts "#{yaml_name} - #{dependency['pod']} - #{dependency['configurations']}: configurations字段必须是数组，例如:['Debug','Release']"
         exit!
       end
-
       if dependency['subspecs'] and dependency['subspecs'].class != Array
         puts "#{yaml_name} - #{dependency['pod']} - #{dependency['subspecs']}: subspecs字段必须是数组，例如:['A','B','C']"
         exit!
       end
-
-      # 校验自身文件重复
       if dependencies_name.include?(dependency['pod'])
         puts "❌ 发现#{yaml_name}内重复组件:#{dependency['pod']},请检查并删除重复依赖:".red
         exit!
       else
         dependencies_name << dependency['pod']
       end
-
-      # 警告
       if dependency['path'] and yaml_name != podfile_local_yaml
         warn "⚠️  组件#{dependency['pod']}使用path依赖方式应该写在#{podfile_local_yaml}".yellow
       end
       if dependency['podspec'] and yaml_name != podfile_local_yaml
         warn "⚠️  组件#{dependency['pod']}使用podspec依赖方式应该写在#{podfile_local_yaml}".yellow
       end
-
     end
-
     def check_only_one_dep(dependency, key, current_type, yaml_name)
       if dependency[key]
         if current_type
@@ -310,13 +238,11 @@ module Pod
       end
       current_type
     end
-
     def read_yaml_content(yaml_name)
       unless File.exist?(yaml_name)
         puts "文件不存在:"+yaml_name
         return nil
       end
-
       begin
         yaml_content = YAML.load_file(yaml_name)
       rescue Exception => e
@@ -324,21 +250,17 @@ module Pod
         puts yaml_name+'文件解析异常, 请检查 ⬆️'
         exit!
       end
-
       unless yaml_content.class == Hash
         puts "#{yaml_name} => (文件不是keyValue形式)"
         return nil
       end
-
       yaml_content
     end
-
     def print_yaml_deps
       yaml_deps.each do |yaml_name, deps|
         puts "读取#{yaml_name} => #{deps.size}个"
       end
       puts "➡️  解析后依赖总数共计:#{all_deps.size}个\n"
-
       sort_deps = all_deps.sort do |arr1, arr2|
         dep1 = arr1[1]
         dep2 = arr2[1]
@@ -348,13 +270,11 @@ module Pod
           dep1.pod.downcase <=> dep2.pod.downcase
         end
       end
-
       puts '⬇️  打印依赖'
       current_dir = Dir.pwd
       sort_deps.each { |sort_dep|
         dependency = sort_dep[1]
         puts_result = "pod '#{dependency.pod}'"
-
         if dependency.path #路径引用
           puts_result += ", :path => '#{dependency.path}'"
         elsif dependency.podspec #podspec引用
@@ -369,7 +289,6 @@ module Pod
             puts_result += ", :branch => '#{dependency.branch}'"
           end
         end
-
         if dependency.configurations
           puts_result += ", :configurations => ['#{dependency.configurations.join("','")}']"
         end
@@ -382,71 +301,55 @@ module Pod
         if dependency.version and dependency.source
           puts_result += ", :source => '#{dependency.source}'"
         end
-
         if dependency.path
           branch = repo_branch(dependency.path)
           modify = repo_modify(dependency.path)
           puts puts_result.cyan + branch.magenta + modify.magenta
-
         elsif dependency.branch
           puts puts_result.yellow
         else
           puts puts_result
         end
-
       }
       Dir.chdir(current_dir)
       puts "⬆️  打印完毕"
     end
-
-    # 生成默认yaml文件
     def generate_yaml
       generate_local_yaml(podfile_local_yaml)
       generate_module_yaml(podfile_module_yaml, "# 企业内部组件")
       generate_module_yaml(podfile_third_party_yaml, "# 第三方维护组件")
     end
-
     def generate_local_yaml(podfile_local_yaml)
       if File.exist?(podfile_local_yaml)
         return
       end
       puts "生成#{podfile_local_yaml}文件"
-
       content = ""
       content = content + "# 1、本依赖配置文件优先级最高, 用来覆盖其他两个依赖的yaml文件中的组件。 尝试打开以下注释, 修改对应字段, 然后执行pod install\n"
       content = content + "# 2、PODS下边的配置是数组形式, 如果有多个就写多个(subspecs需要数组)\n"
       content = content + "# 3、本文件加入到忽略文件中\n\n"
-
       content = content + "# QUICK_BUILD字段如果为true, 则表示会自动解析所有组件的依赖, 并删除不被使用的依赖库, 以达到开发时快速编译的目的\n"
       content = content + "QUICK_BUILD: false\n\n"
-
       content = content + "PODS:\n"
-
       content = content + "\n"
-
       content = content + "# - module: Masonry\n"
       content = content + "#   pod: Masonry\n"
       content = content + "#   subspecs: null\n"
       content = content + "#   path: ~/MasonryCodePath\n"
-
       content = content + "\n"
-
       content = content + "# - module: MJExtension\n"
       content = content + "#   pod: MJExtension\n"
       content = content + "#   subspecs: null\n"
       content = content + "#   path: ~/MJExtensionCodePath\n"
-
       File.open(podfile_local_yaml, 'w') { |file|
         file.write(content)
       }
     end
-
     def generate_module_yaml(yaml_name, prefix)
       if File.exist?(yaml_name)
         return
       end
       puts "生成#{yaml_name}文件"
-
       content = ""
       content = content + prefix
       content = content + "\n"
@@ -475,13 +378,10 @@ module Pod
       content = content + "#   inhibit_warnings: true\n"
       content = content + "#   source: null\n"
       content = content + "#   binary: true\n"
-
       File.open(yaml_name, 'w') { |file|
         file.write(content)
       }
     end
-
-    # 获取某个目录下的当前分支
     def repo_branch(path)
       full_path = File.expand_path(path)
       git_path = "#{full_path}/.git"
@@ -492,44 +392,33 @@ module Pod
       unless File.exist?(head_path)
         return ""
       end
-
       content = File.read(head_path)
       content = content.gsub("\n", "")
-
       branch_key_word = "ref: refs/heads/"
       if content.include?(branch_key_word)
         branch = content.gsub(branch_key_word, "")
         return "(#{branch})"
       end
-
       if content.size >= 8
         short_sha = content.slice(0, 7)
         return "(#{short_sha})"
       end
-
       " #(#{content})"
     end
-
-    # 获取仓库状态是否有修改
     def repo_modify(path)
       full_path = File.expand_path(path)
       git_path = "#{full_path}/.git"
       unless Dir.exist?(git_path)
         return ""
       end
-
       Dir.chdir(full_path)
       status = %x(git status -suno)
       status.size > 0 ? "[modified]" : ""
     end
-
-    # 读取主工程target列表
     def init_main_targets
       project_manager = XCProject::XcodeprojManager.share_manager
       @targets = project_manager.get_app_targets
     end
-
-    #是否开启了编译优化开关
     def quick_build
       yaml_content = read_yaml_content(podfile_local_yaml)
       if $quick_build != nil
@@ -537,8 +426,6 @@ module Pod
       end
       yaml_content ? !!(yaml_content["QUICK_BUILD"]) : false
     end
-
-    #是否禁用检查podspec文件
     def disable_check_podspec
       yaml_content = read_yaml_content(podfile_local_yaml)
       disable_check_podspec = yaml_content ? !!(yaml_content["DISABLE_CHECK_PODSPEC"]) : false
@@ -547,6 +434,5 @@ module Pod
       end
       disable_check_podspec
     end
-
   end
-end
+end

data/lib/{podfileDep → core_blur}/yaml/yaml_pod.rb

@@ -1,10 +1,8 @@
 module Pod
   class YamlPod
-
     def initialize(pod)
       @pod = pod
     end
-
     attr_accessor :module_name
     attr_accessor :pod
     attr_accessor :subspecs
@@ -19,12 +17,10 @@ module Pod
     attr_accessor :source
     attr_accessor :binary
     attr_reader :type
-
     def option
       result = {:configurations => self.configurations,
                 :inhibit_warnings => self.inhibit_warnings,
                 :subspecs => self.subspecs}
-
       if self.path #路径依赖
         result[:path] = self.path
       elsif self.podspec #podspec引用
@@ -41,7 +37,6 @@ module Pod
       end
       result
     end
-
     def type
       if self.path
         0
@@ -58,4 +53,4 @@ module Pod
       end
     end
   end
-end
+end

data/lib/core_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Core
+  class CoreHelper
+    def self.core_path
+
+      origin_exist = Dir.exist?("#{__dir__}/core")
+      blur_exist = Dir.exist?("#{__dir__}/core_blur")
+      core_path = nil
+      if origin_exist
+        core_path = "core"
+      elsif blur_exist
+        core_path = "core_blur"
+      else
+        puts "❌ 引用错误， 请检查"
+      end
+      core_path
+    end
+  end
+end

data/lib/podfileDep.rb

@@ -1,22 +1,20 @@
-require_relative 'podfileDep/yaml/yaml_dep'
-require_relative 'podfileDep/version'
+# frozen_string_literal: true
 
-module Thin
+require_relative 'core_helper'
+require_relative 'version'
+core_path = Core::CoreHelper.core_path
 
-  yaml_dep = Pod::YamlDep.new
-
-  if yaml_dep.quick_build
-    require_relative 'podfileDep/thin/installer'
-  end
+require_relative "#{core_path}/yaml/yaml_dep"
 
+yaml_dep = Pod::YamlDep.new
+if yaml_dep.quick_build
+  require_relative "#{core_path}/thin/installer"
 end
 
-
 module Pod
   class Podfile
     def yaml_dep!
 
-      # 加入插件
       plugin("podfileDep")
 
       yam_dep = YamlDep.new
@@ -29,15 +27,4 @@ module Pod
   end
 end
 
-# 兼容旧的方式
-module PodfileDep
-  def PodfileDep.setup(targets)
-    yam_dep = Pod::YamlDep.new
-    res = yam_dep.analysis_yaml_dep
-    warn "\n⚠️ [PodfileDep.setup方法已过期]，请使用新的方式, 参考：https://gitee.com/sourceiOS/podfileDepDemo/blob/master/Podfile\n"
-    res
-  end
-
-end
-
 

data/lib/{podfileDep/version.rb → version.rb}

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podfileDep
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 3.0.0
 platform: ruby
 authors:
-- 王帅朋
-autorequire: 
+- wsp
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-29 00:00:00.000000000 Z
+date: 2025-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -65,48 +65,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- Gemfile
-- README.md
-- Rakefile
-- docs/Gemfile
-- docs/debug目录.png
-- docs/debug配置.png
+- bin/console
+- bin/setup
 - lib/cocoapods_plugin.rb
+- lib/core_blur/check/import.rb
+- lib/core_blur/check/item.rb
+- lib/core_blur/check/podspec.rb
+- lib/core_blur/check/project.rb
+- lib/core_blur/check/util.rb
+- lib/core_blur/check/xcodeproj.rb
+- lib/core_blur/command/all.rb
+- lib/core_blur/command/dep.rb
+- lib/core_blur/command/quick.rb
+- lib/core_blur/dep/find.rb
+- lib/core_blur/indirect/indirect.rb
+- lib/core_blur/modify/modify_code.rb
+- lib/core_blur/my_constants.rb
+- lib/core_blur/podfilelock.rb
+- lib/core_blur/reference/project.rb
+- lib/core_blur/reference/unused.rb
+- lib/core_blur/thin/installer.rb
+- lib/core_blur/thin/local.rb
+- lib/core_blur/thin/pod_target.rb
+- lib/core_blur/thin/shell.rb
+- lib/core_blur/variable.rb
+- lib/core_blur/yaml/yaml_dep.rb
+- lib/core_blur/yaml/yaml_pod.rb
+- lib/core_helper.rb
 - lib/podfileDep.rb
-- lib/podfileDep/check/import.rb
-- lib/podfileDep/check/item.rb
-- lib/podfileDep/check/podspec.rb
-- lib/podfileDep/check/project.rb
-- lib/podfileDep/check/util.rb
-- lib/podfileDep/check/xcodeproj.rb
-- lib/podfileDep/command/all.rb
-- lib/podfileDep/command/dep.rb
-- lib/podfileDep/command/quick.rb
-- lib/podfileDep/dep/find.rb
-- lib/podfileDep/indirect/indirect.rb
-- lib/podfileDep/modify/modify_code.rb
-- lib/podfileDep/my_constants.rb
-- lib/podfileDep/podfilelock.rb
-- lib/podfileDep/reference/project.rb
-- lib/podfileDep/reference/unused.rb
-- lib/podfileDep/thin/installer.rb
-- lib/podfileDep/thin/local.rb
-- lib/podfileDep/thin/pod_target.rb
-- lib/podfileDep/thin/shell.rb
-- lib/podfileDep/variable.rb
-- lib/podfileDep/version.rb
-- lib/podfileDep/yaml/yaml_dep.rb
-- lib/podfileDep/yaml/yaml_pod.rb
-- podfileDep.gemspec
-- release.sh
+- lib/version.rb
 homepage: https://gitee.com/sourceiOS/podfileDepDemo
 licenses: []
 metadata:
   homepage_uri: https://gitee.com/sourceiOS/podfileDepDemo
   source_code_uri: https://gitee.com/sourceiOS/podfileDep
   changelog_uri: https://gitee.com/sourceiOS/podfileDep
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: iOS端 依赖库使用yaml文件管理
 test_files: []