cocoapods-jxedt 0.0.9 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38c0828fdaf7acdd4f9aea09b68194af1d2e9e6117ca1c6156618e7b1bc8cd6
-  data.tar.gz: 4d19e409eefaa4a2eac16c7c72e6874a2a626c49bf1a20cd216a7d5ef842395c
+  metadata.gz: ad01cd6bd2da4418b03764271caab2236a186ea81f3c9f77a885910d12263d78
+  data.tar.gz: aa9f410bbbea81420a9d04f01c379428aece86e8449c9ec10a461a79d03825fe
 SHA512:
-  metadata.gz: 6587bbe4ed16a1a0f354b8bb07008399c2031ccf28544e4c75b8180005c5653670fa8d86c8868275fd389b700f8e6d8d18c4fea9c3061742f44e751f47fdcce3
-  data.tar.gz: 3968415ded4a515d99569a2f060ae732055233c4c8703048346eaf52a2e0665dd659af92889b11cf959ce78f69d8b92719f68247fc4231133a04501d0ea7b933
+  metadata.gz: a0a5d962b702c2fde4f3ac10a81e027ba555f72310b31fee0530e94587eb7e56019ddf0d5e64951dd8f3c0e50626afbf286aa3c15b31a678bbb99413dcc5e8d1
+  data.tar.gz: 60e70a3f5be60178cf721b4d69b113d065275eb415f70655feb718279b9b2ad9de3bfb8a9ce0a01050b2972a7c2346ef7bbcd723849054d40bf79dc7b84db124

data/lib/cocoapods-jxedt/binary/config.rb

@@ -11,6 +11,7 @@ module Jxedt
             :binary_dir => "framework的保存路径，相对于'Pods/Pods.xcodeproj'的相对路径。默认为'../_Prebuild'",
             :binary_switch => "二进制开关，关闭则不hook pre_install过程。默认为true",
             :prebuild_job => "开启编译任务，设置为false则不触发编译。默认为true",
+            :keep_source_project => "保留源码的pods工程，默认保留，方便查看源码",
             :dev_pods_enabled => "Development Pods是否支持binary。默认为false",
             :excluded_pods => "排除binary的pods",
             :xcconfig_configuration_alias => "xcconfig文件中configuration的别名，configurations设置为多个值的时候会用到，用于搜索替换。一般不需要设置，有默认值为'cocoapods-jxedt-binary'",
@@ -59,6 +60,10 @@ module Jxedt
             @dsl_config[:prebuild_job] || @dsl_config[:prebuild_job].nil?
         end
 
+        def keep_source_project?
+            @dsl_config[:keep_source_project] || false
+        end
+
         def dev_pods_enabled?
             @dsl_config[:dev_pods_enabled] || false
         end

data/lib/cocoapods-jxedt/binary/helper/prebuild_sandbox.rb

@@ -1,4 +1,46 @@
 module Pod
+  # The sandbox provides support for the directory that CocoaPods uses for an
+  # installation. In this directory the Pods projects, the support files and
+  # the sources of the Pods are stored.
+  #
+  # CocoaPods assumes to have control of the sandbox.
+  #
+  # Once completed the sandbox will have the following file structure:
+  #
+  #     Pods
+  #     |
+  #     +-- Headers
+  #     |   +-- Private
+  #     |   |   +-- [Pod Name]
+  #     |   +-- Public
+  #     |       +-- [Pod Name]
+  #     |
+  #     +-- Local Podspecs
+  #     |   +-- External Sources
+  #     |   +-- Normal Sources
+  #     |
+  #     +-- Target Support Files
+  #     |   +-- [Target Name]
+  #     |       +-- Pods-acknowledgements.markdown
+  #     |       +-- Pods-acknowledgements.plist
+  #     |       +-- Pods-dummy.m
+  #     |       +-- Pods-prefix.pch
+  #     |       +-- Pods.xcconfig
+  #     |
+  #     +-- [Pod Name]
+  #     |
+  #     +-- Manifest.lock
+  #     |
+  #     +-- Pods.xcodeproj
+  #  (if installation option 'generate_multiple_pod_projects' is enabled)
+  #     |
+  #     +-- PodTarget1.xcodeproj
+  #     |
+  #    ...
+  #     |
+  #     +-- PodTargetN.xcodeproj
+  #
+  #
   class PrebuildSandbox < Sandbox
     # [String] standard_sandbox_path
     def self.from_standard_sandbox_path(path)
@@ -10,9 +52,77 @@ module Pod
       from_standard_sandbox_path(sandbox.root)
     end
 
+    def make_source_link(source, target)
+      source = Pathname.new(source)
+      target = Pathname.new(target)
+      target.parent.mkpath unless target.parent.exist?
+      target.rmtree if target.exist?
+      relative_source = source.relative_path_from(target.parent)
+      FileUtils.ln_sf(relative_source, target)
+    end
+
+    def source_path
+      '../Pods-Source'
+    end
+
+    def headers_root
+      root + source_path + 'Headers'
+    end
+
     def project_path
-        super
-        # root + 'Pods.xcodeproj'
+      root + source_path + 'Pods-Source.xcodeproj'
+    end
+
+    def specifications_root
+      # root + source_path + 'Local Podspecs'
+      super
+    end
+
+    def target_support_files_root
+      root + source_path + 'Target Support Files'
+    end
+
+    def link_source_project!
+      root.children.each do |child|
+        next if ['Headers', 'Local Podspecs', 'Target Support Files'].include? child.basename.to_s
+        next if ['.lock', '.xcodeproj'].include? child.extname.to_s
+        make_source_link(child, root + source_path + child.basename)
+      end 
+    end
+
+    def clean_source_project!
+      return if Jxedt.config.keep_source_project?
+
+      source_project_path = root + source_path
+      source_project_path.rmtree if source_project_path.exist?
+    end
+  end
+end
+
+module Pod
+  class Installer
+    # The {UserProjectIntegrator} integrates the libraries generated by
+    # TargetDefinitions of the {Podfile} with their correspondent user
+    # projects.
+    #
+    class UserProjectIntegrator
+      alias_method :old_create_workspace, :create_workspace
+      def create_workspace
+        old_create_workspace unless sandbox.is_a?(Pod::PrebuildSandbox)
+      end
+    end
+  end
+end
+
+module Pod
+  class Installer
+    # Cleans up the sandbox directory by removing stale target support files and headers.
+    #
+    class SandboxDirCleaner
+      alias_method :old_clean!, :clean!
+      def clean!
+        old_clean! unless @sandbox.is_a?(Pod::PrebuildSandbox)
+      end
     end
   end
 end

data/lib/cocoapods-jxedt/binary/hooks/pre_install.rb

@@ -44,8 +44,12 @@ module Jxedt
             require_relative '../prebuild'
 
             # prebuild_job
-            log_section "🚀  Prebuild frameworks" if Jxedt.config.prebuild_job?
-            Jxedt::Prebuild.new(source_installer).build if Jxedt.config.prebuild_job?
+            sandbox.link_source_project!
+            if Jxedt.config.prebuild_job?
+                log_section "🚀  Prebuild frameworks"
+                Jxedt::Prebuild.new(source_installer).build 
+            end
+            sandbox.clean_source_project!
 
             log_section "🤖  Resume pod installation"
             require_relative '../targets/pod_target'

data/lib/cocoapods-jxedt/binary/targets/pod_target.rb

@@ -1,4 +1,54 @@
 module Pod
+    class PodTarget < Target
+        alias_method :old_resource_paths, :resource_paths
+        def resource_paths
+            resource_paths = old_resource_paths
+            # 没有使用二进制不处理
+            return resource_paths unless self.use_binary
+
+            # 遍历所有的resources
+            resource_paths.each do |name, resources|
+                resources.map! {|resource_file|
+                    resource_extname = Pathname.new(resource_file).basename.extname
+                    # 如果文件不需要编译，跳过
+                    next resource_file unless self.class.resource_extension_compilable?(resource_extname)
+                    
+                    # 确定编译后的文件名称
+                    output_extname = self.class.output_extension_for_resource(resource_extname)
+                    output_file_name = "#{Pathname.new(resource_file).basename.sub_ext('')}#{output_extname}"
+                    # 从framework中查找编译后的文件
+                    file_accessors.each do |file_accessor|
+                        file_accessor.vendored_frameworks.each do |framework_file|
+                            framework_name = Pathname.new(framework_file).basename.sub_ext('').to_s
+                            # 只处理和当前target module_name相同的framework，否则跳过
+                            next if self.product_module_name != framework_name
+                            
+                            # xcframework和framework文件分别处理，而且只查找.framework根目录下的文件
+                            if '.xcframework' == Pathname.new(framework_file).basename.extname
+                                files = Dir.glob("#{framework_file}/**/#{framework_name}.framework/#{output_file_name}")
+                                next if files.size == 0 # 没有查找到文件跳过
+
+                                if Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
+                                    resource_file = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{self.name}/#{framework_name}.framework/#{output_file_name}"
+                                else
+                                    resource_file = "${PODS_CONFIGURATION_BUILD_DIR}/#{framework_name}.framework/#{output_file_name}"
+                                end
+                            else
+                                files = Dir.glob("#{framework_file}/#{output_file_name}")
+                                next if files.size == 0 # 没有查找到文件跳过
+
+                                resource_path = Pathname.new("#{framework_file}/#{output_file_name}") # 真实路径
+                                resource_file = "${PODS_ROOT}/#{resource_path.relative_path_from(self.sandbox.root)}"
+                            end
+                        end
+                    end
+                    resource_file
+                }.reject!(&:nil?)
+            end
+            resource_paths
+        end
+    end
+    
     class Target
       # @since 1.5.0
       class BuildSettings

data/lib/cocoapods-jxedt/command/header/header.rb

@@ -2,9 +2,9 @@ module Pod
     class Command
         class JxedtCommand < Command
             class Header < JxedtCommand
-                self.summary = 'header fix'
+                self.summary = '修改头文件引用问题'
                 self.description = <<-DESC
-                修改头文件引用问题。\n
+                修改头文件引用问题\n
                 例如修改#import "AFNetworking.h"或#import <AFNetworking.h>这种头文件引用方式为#import <AFNetworking/AFNetworking.h>\n
                 使用方式：\n
                 到Podfile文件所在目录执行以下命令\n
@@ -23,6 +23,8 @@ module Pod
                         ['--write', '修改命中的头文件引用，不写入则直接输出需要修改的文件和修改内容。默认false'],
                         ['--suffix', '处理的文件后缀，默认处理\'h,m,mm,pch\'后缀的文件'],
                         ['--header-regulation', 'header name的正则，默认为\'[\w+-]*\.h\'，如果不满足也可以自定义'],
+                        ['--verbose', '在屏幕上输出修改文件的详情'],
+                        ['--log-path', '需要修改文件内容导出路径']
                     ]
                 end
                 def initialize(argv)
@@ -31,6 +33,8 @@ module Pod
                     @suffix = argv.option('suffix', 'h,m,mm,pch')
                     @force_write = argv.flag?('write', false)
                     @header_regulation = argv.option('header-regulation')
+                    @verbose_flag = argv.flag?('verbose', false)
+                    @log_path = argv.option('log-path')
                     super
                 end
       
@@ -65,7 +69,7 @@ module Pod
                     }
 
                     # 遍历需要处理的文件
-                    record = []
+                    files, failed, record = [], [], []
                     process_target_files.each {|file_path|
                         changed = false
                         lines = File.readlines(file_path)
@@ -77,16 +81,36 @@ module Pod
                             header_name = line.match(/(?<=")#{header_name_regulation}(?=")/) || line.match(/(?<=<)#{header_name_regulation}(?=>)/)
                             next unless public_header_mapping.include?("#{header_name}")
 
+                            changed = true # 文件需要修改
                             project_module_name = public_header_mapping["#{header_name}"]
                             replace_line = "#import " << "<#{project_module_name}/#{header_name}>\n"
                             lines[num] = replace_line
-                            changed = true
                             record << "#{file_path} 第#{num}行，#{line} => #{replace_line}"
                         }
-                        File.open(file_path, 'w') { |f| f.write(lines.join) } if changed && @force_write
+                        files << file_path if changed
+                        begin
+                            File.open(file_path, 'w') { |f| f.write(lines.join) } if changed && @force_write
+                        rescue
+                            failed << file_path
+                        ensure
+                            help! "因权限问题文件修改失败：\n#{file_path}" if failed.size > 0
+                        end
                     }
-                    puts "需要修改的地方共有：#{record.size} 处"
-                    puts JSON.pretty_generate(record) if record.size > 0
+                    puts "需要修改文件共有：#{files.size} 个，需要修改的头文件的地方共有：#{record.size} 处"
+                    puts "已修改完成" if files.size > 0 && @force_write
+
+                    if files.size > 0
+                        logs = <<~LOGS
+                            需要修改的文件：
+                            #{JSON.pretty_generate(files)}
+
+                            文件修改详情：
+                            #{JSON.pretty_generate(record)}
+                        LOGS
+                        logs.gsub!('\\"', '"').gsub!('\\n', '') # 去除转义字符
+                        puts logs if @verbose_flag
+                        File.open(log_file_path, 'w') { |file| file.write("#{logs}") } unless log_file_path.nil?
+                    end
                 end
 
                 def installer_for_config
@@ -151,6 +175,13 @@ module Pod
                     end
                     dependent_targets
                 end
+
+                def log_file_path
+                    log_path = @log_path
+                    log_path << "/headerfix_output.txt" if log_path && File.directory?(log_path)
+                    return if log_path && (!File.exist?(File.dirname(log_path)))
+                    log_path
+                end
             end
         end
     end

data/lib/cocoapods-jxedt/command/jxedt.rb

@@ -1,5 +1,6 @@
 require_relative 'options/options'
 require_relative 'header/header'
+require_relative 'statistics/statistics'
 
 module Pod
   class Command

data/lib/cocoapods-jxedt/command/statistics/statistics.rb

@@ -0,0 +1,98 @@
+module Pod
+    class Command
+        class JxedtCommand < Command
+            class Statistics < JxedtCommand
+                self.summary = '统计二进制使用情况'
+                self.description = <<-DESC
+                统计二进制使用详情
+                DESC
+                self.command = 'statistics'
+                self.arguments = [
+                ]
+                def self.options
+                    [
+                        ['--failed', '统计校验失败的二进制'],
+                    ]
+                end
+                def initialize(argv)
+                    @check_failed = argv.flag?('failed')
+                    super
+                end
+      
+                def validate!
+                    super
+                end
+      
+                def run
+                    podfile = Pod::Config.instance.podfile
+                    lockfile = Pod::Config.instance.lockfile
+                    help! '请检查命令执行路径，需要在Podfile文件所在目录执行' if podfile.nil? || lockfile.nil?
+
+                    require 'cocoapods-jxedt/binary/config'
+                    require 'cocoapods-jxedt/binary/helper/podfile_options'
+
+                    pods_root = Pathname.new(File.dirname(podfile.defined_in_file)) + "Pods"
+                    binary_dir = pods_root + Jxedt.config.binary_dir
+
+                    used_binary = []
+                    Dir.glob("#{pods_root}/*/_Prebuild") do |file_path|
+                        next unless File.directory?(file_path)
+                        dir_name = File.dirname(file_path)
+                        name = File.basename(dir_name).to_s
+                        target_path = binary_dir + name
+                        next unless target_path.exist? # 路径不存在，跳过
+
+                        new_hash = {}
+                        # name
+                        new_hash[:name] = name
+
+                        # multiple_configuration
+                        configuration_enable = target_path.children().select { |path| "#{path.basename}" == 'Debug' || "#{path.basename}" == 'Release' }.count == 2
+                        new_hash[:multiple_configuration] = configuration_enable
+                        
+                        # checksum validation
+                        checksum_file = target_path.children().select { |path| path.extname == '.checksum' }.first
+                        new_hash[:checksum] = checksum_file.basename.to_s.gsub('.checksum', '') unless checksum_file.nil?
+
+                        used_binary << new_hash
+                    end
+                    
+                    # print
+                    index, failed = 0, []
+                    used_binary.sort_by {|hash| hash[:name].capitalize }.each do |hash|
+                        name = hash[:name]
+
+                        checksum = lockfile.spec_checksums_hash_key(name)
+                        validation_passed = checksum && checksum == hash[:checksum]
+                        failed << name unless validation_passed
+
+                        # 校验和是否用的 git commitid
+                        checkout_options = lockfile.internal_data["CHECKOUT OPTIONS"] || {}
+                        is_git_commitid = checkout_options[name] && checkout_options[name][:commit]
+                        
+                        if validation_passed
+                            next if @check_failed
+                            index += 1
+                            log = <<~LOG
+                            #{index}). #{name}:
+                                    multiple configuration: #{hash[:multiple_configuration]}
+                                    checksum#{"（git commitid）" if is_git_commitid}: #{hash[:checksum]}
+                            LOG
+                            Pod::UI.puts log
+                        else
+                            index += 1
+                            log = <<~LOG
+                            #{index}). #{name}:
+                                    multiple configuration: #{hash[:multiple_configuration]}
+                                    checksum: #{hash[:checksum]}
+                                    checksum in lockfile#{"（git commitid）" if is_git_commitid}: #{checksum}
+                            LOG
+                            Pod::UI.puts log.red
+                        end
+                    end
+                    Pod::UI.puts "checksum校验失败的组件: #{failed}".red if failed.size > 0
+                end
+            end
+        end
+    end
+end

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.9"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.12
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -90,6 +90,7 @@ files:
 - lib/cocoapods-jxedt/command/header/header.rb
 - lib/cocoapods-jxedt/command/jxedt.rb
 - lib/cocoapods-jxedt/command/options/options.rb
+- lib/cocoapods-jxedt/command/statistics/statistics.rb
 - lib/cocoapods-jxedt/gem_version.rb
 - lib/cocoapods-jxedt/tool.rb
 - lib/cocoapods_plugin.rb