cocoapods-mtxx-bin 0.0.6 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 689e939141bc2513daab20d64c674a0b30494d9d1112119bd7314c295cd3111c
-  data.tar.gz: 9985c74c4ee328babe08b8071053bd60726ed5e8a591a070c6c513e4e5beb444
+  metadata.gz: 2c59fa44939d32b5a5422f0646ea4729c41891e6acf7915cae4d944285c4d897
+  data.tar.gz: e76cb2fbf759274440591980a15935bb450992b0ab62b931413fabb937c1876b
 SHA512:
-  metadata.gz: 2303bcbeb7703f42dcd5fefe29e74f3bc5a289e3a0568dbfa47386a54675d80f4ac78675dd317b277b73a14a48d50a5580b598afb02da6442017f7f4de266b9a
-  data.tar.gz: cbc7e1a3fefdfc9a2c02c3230b5c773c9045d99f67a3282bd6190a8439fe6d853a77fa8db04cd73c7a9680967e4f06d77dc8fc97a892defdd38880dda78cbdcd
+  metadata.gz: e9f522fc8a561fe0cd06b287b30c456579fe20eb7ad576a91a1abb5a727a96ad44a994cfcab3330771c15c88eef6a1be554edae02b288f03aeee9136ae711dea
+  data.tar.gz: 15a88b10bb581930ce29bd61a2a49b75fcda4e8f9e6e76eec0a715618e1c53ed461b0dbb92efae72cfd5867801ba87b58a0779ce89ba9e2adb372e38113bc925

data/lib/cocoapods-mtxx-bin/command/bin/buildAll.rb

@@ -19,7 +19,7 @@ module Pod
 
         self.summary = '根据壳工程打包所有依赖组件为静态库（static framework）'
         self.description = <<-DESC
-          #{self.summary}
+          #{summary}
         DESC
 
         def self.options
@@ -31,9 +31,9 @@ module Pod
         end
 
         def initialize(argv)
-          @clean = argv.flag?('clean', false )
-          @repo_update = argv.flag?('repo-update', false )
-          @full_build = argv.flag?('full-build', false )
+          @clean = argv.flag?('clean', false)
+          @repo_update = argv.flag?('repo-update', false)
+          @full_build = argv.flag?('full-build', false)
           @base_dir = "#{Pathname.pwd}/build_pods"
           super
         end
@@ -71,10 +71,10 @@ module Pod
 
         # 读取配置文件
         def read_config
-          UI.title "Read config from file `BinConfig.yaml`".green do
+          UI.title 'Read config from file `BinConfig.yaml`'.green do
             config_file = File.join(CBin.config.binary_dir, 'BinConfig.yaml')
             return unless File.exist?(config_file)
-            config = YAML.load(File.open(config_file))
+            config = YAML.safe_load(File.open(config_file))
             return if config.nil?
             build_config = config['build_config']
             return if build_config.nil?
@@ -87,38 +87,44 @@ module Pod
 
         # 更新repo仓库
         def repo_update
-          UI.title "Repo update".green do
-            return if podfile.nil?
-            sources_manager = Pod::Config.instance.sources_manager
-            podfile.sources.uniq.map { |src|
-              # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
-              next unless src.include?(MT_REPO)
-              UI.message "Update repo: #{src}"
-              source = sources_manager.source_with_name_or_url(src)
-              source.update(false )
-            }
-          end if @repo_update
+          if @repo_update
+            UI.title 'Repo update'.green do
+              return if podfile.nil?
+              sources_manager = Pod::Config.instance.sources_manager
+              podfile.sources.uniq.map do |src|
+                # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
+                next unless src.include?(MT_REPO)
+                UI.message "Update repo: #{src}"
+                source = sources_manager.source_with_name_or_url(src)
+                source.update(false)
+              end
+            end
+          end
         end
 
         # 执行pre build
         def pre_build
-          UI.title "Execute the command of pre build".green do
-            system(@pre_build)
-          end if @pre_build
+          if @pre_build
+            UI.title 'Execute the command of pre build'.green do
+              system(@pre_build)
+            end
+          end
         end
 
         # 执行post build
-        def post_build(results)
-          UI.title "Execute the command of post build".green do
-            system(@post_build)
-          end if @post_build
+        def post_build(_results)
+          if @post_build
+            UI.title 'Execute the command of post build'.green do
+              system(@post_build)
+            end
+          end
         end
 
         # 获取 podfile
         def podfile
           @podfile ||= begin
-                         podfile_path = File.join(Pathname.pwd,"Podfile")
-                         raise "Podfile不存在" unless File.exist?(podfile_path)
+                         podfile_path = File.join(Pathname.pwd, 'Podfile')
+                         raise 'Podfile不存在' unless File.exist?(podfile_path)
                          sources_manager = Pod::Config.instance.sources_manager
                          podfile = Podfile.from_file(Pathname.new(podfile_path))
                          podfile_hash = podfile.to_hash
@@ -132,8 +138,8 @@ module Pod
         # 获取 podfile.lock
         def lockfile
           @lockfile ||= begin
-                          lock_path = File.join(Pathname.pwd,"Podfile.lock")
-                          raise "Podfile.lock不存在，请执行pod install" unless File.exist?(lock_path)
+                          lock_path = File.join(Pathname.pwd, 'Podfile.lock')
+                          raise 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
                           Lockfile.from_file(Pathname.new(lock_path))
                         end
         end
@@ -141,30 +147,30 @@ module Pod
         # 获取 sandbox
         def sandbox
           @sandbox ||= begin
-                         sandbox_path = File.join(Pathname.pwd, "Pods")
-                         raise "Pods文件夹不存在，请执行pod install" unless File.exist?(sandbox_path)
+                         sandbox_path = File.join(Pathname.pwd, 'Pods')
+                         raise 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
                          Pod::Sandbox.new(sandbox_path)
                        end
         end
 
         # 根据podfile和podfile.lock分析依赖
         def analyse
-          UI.title "Analyze dependencies".green do
+          UI.title 'Analyze dependencies'.green do
             analyzer = Pod::Installer::Analyzer.new(
               sandbox,
               podfile,
               lockfile
             )
-            analyzer.analyze(true )
+            analyzer.analyze(true)
           end
         end
 
         # 删除编译产物
         def clean_build_pods
-          UI.title "Clean build pods".green do
-            build_path = Dir.pwd + "/build"
+          UI.title 'Clean build pods'.green do
+            build_path = Dir.pwd + '/build'
             FileUtils.rm_rf(build_path) if File.exist?(build_path)
-            build_pods_path = Dir.pwd + "/build_pods"
+            build_pods_path = Dir.pwd + '/build_pods'
             FileUtils.rm_rf(build_pods_path) if File.exist?(build_pods_path)
           end
         end
@@ -269,14 +275,14 @@ module Pod
 
         # 展示结果
         def show_results(results)
-          UI.title "打包结果：".green do
-            UI.info "——————————————————————————————————".green
-            UI.info "|#{"Type".center(20)}|#{"Count".center(11)}|".green
-            UI.info "——————————————————————————————————".green
+          UI.title '打包结果：'.green do
+            UI.info '——————————————————————————————————'.green
+            UI.info "|#{'Type'.center(20)}|#{'Count'.center(11)}|".green
+            UI.info '——————————————————————————————————'.green
             results.each do |key, value|
               UI.info "|#{key.center(20)}|#{value.size.to_s.center(11)}|".green
             end
-            UI.info "——————————————————————————————————".green
+            UI.info '——————————————————————————————————'.green
 
             # 打印出失败的 target
             unless results['Fail'].empty?
@@ -304,7 +310,6 @@ module Pod
           end
           result
         end
-
       end
     end
   end

data/lib/cocoapods-mtxx-bin/command/bin/outputSource.rb

@@ -0,0 +1,141 @@
+require 'cocoapods-mtxx-bin/helpers/buildAll/builder'
+require 'cocoapods-mtxx-bin/helpers/buildAll/podspec_util'
+require 'cocoapods-mtxx-bin/helpers/buildAll/zip_file_helper'
+require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
+require 'yaml'
+require 'digest'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OutputSource < Bin
+        self.summary = '输出各个组件的source源，默认输出全部组件的source'
+        self.description = <<-DESC
+          #{summary}
+        DESC
+
+        def self.options
+          [
+            %w[--error-source 过滤异常的source，比如http的，CI打包只支持SSH认证]
+          ].concat(super).uniq
+        end
+
+        def initialize(argv)
+          @error_source = argv.flag?('error-source', false)
+          super
+        end
+
+        def run
+          # 开始时间
+          @start_time = Time.now.to_i
+          # 更新repo仓库
+          repo_update
+          # 分析依赖
+          @analyze_result = analyse
+          # 打印source
+          show_cost_source
+          # 计算耗时
+          show_cost_time
+        end
+
+        private
+
+        # 打印source
+        def show_cost_source
+          all_source_list = []
+          error_source_list = []
+          @analyze_result.specifications.each do |specification|
+            next if specification.subspec?
+            all_source_list << specification.source
+            if @error_source && verified_git_address(specification)
+              error_source_list << specification.name + '  ' + specification.source[:git] + + '  ' + specification.source[:tag]
+            end
+          end
+          if @error_source
+            UI.info '问题组件，source 为http CI打包不支持http认证，应修改为ssh'.red
+            UI.info error_source_list.to_s.red
+          else
+            UI.info '输出所有pod组件source'.green
+            UI.info error_source_list.to_s.green
+          end
+        end
+
+        # git clone 地址 是否非法
+        def verified_git_address(specification)
+          return false if specification.source[:git].nil?
+          git = specification.source[:git]
+          git.include?('http://techgit.meitu.com') || git.include?('https://techgit.meitu.com')
+        end
+
+        # 打印耗时
+        def show_cost_time
+          return if @start_time.nil?
+          UI.info "总耗时：#{Time.now.to_i - @start_time}s".green
+        end
+
+        # 更新repo仓库
+        def repo_update
+          if @repo_update
+            UI.title 'Repo update'.green do
+              return if podfile.nil?
+              sources_manager = Pod::Config.instance.sources_manager
+              podfile.sources.uniq.map do |src|
+                # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
+                next unless src.include?(MT_REPO)
+                UI.message "Update repo: #{src}"
+                source = sources_manager.source_with_name_or_url(src)
+                source.update(false)
+              end
+            end
+          end
+        end
+
+        # 获取 podfile
+        def podfile
+          @podfile ||= begin
+                         podfile_path = File.join(Pathname.pwd, 'Podfile')
+                         raise 'Podfile不存在' unless File.exist?(podfile_path)
+                         sources_manager = Pod::Config.instance.sources_manager
+                         podfile = Podfile.from_file(Pathname.new(podfile_path))
+                         podfile_hash = podfile.to_hash
+                         podfile_hash['sources'] = (podfile_hash['sources'] || []).concat(sources_manager.code_source_list.map(&:url))
+                         podfile_hash['sources'] << sources_manager.binary_source.url
+                         podfile_hash['sources'].uniq!
+                         Podfile.from_hash(podfile_hash)
+                       end
+        end
+
+        # 获取 podfile.lock
+        def lockfile
+          @lockfile ||= begin
+                          lock_path = File.join(Pathname.pwd, 'Podfile.lock')
+                          raise 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
+                          Lockfile.from_file(Pathname.new(lock_path))
+                        end
+        end
+
+        # 获取 sandbox
+        def sandbox
+          @sandbox ||= begin
+                         sandbox_path = File.join(Pathname.pwd, 'Pods')
+                         raise 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
+                         Pod::Sandbox.new(sandbox_path)
+                       end
+        end
+
+        # 根据podfile和podfile.lock分析依赖
+        def analyse
+          UI.title 'Analyze dependencies'.green do
+            analyzer = Pod::Installer::Analyzer.new(
+              sandbox,
+              podfile,
+              lockfile
+            )
+            analyzer.analyze(true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-mtxx-bin/command/bin/upload.rb

@@ -0,0 +1,173 @@
+require 'json'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Upload < Bin
+        include Pod
+
+        self.summary = "上传二进制文件及podspec"
+        self.description = <<-DESC
+#{self.summary}
+
+`NAME`: 库名【必填】\n
+`VERSION`: 版本号【必填】\n
+`FILE`: 需要压缩的二进制文件或目录【必填】\n
+`REPO`: 上传podspec的仓库，可以通过`pod repo list`查看【必填】\n
+
+e.g.:\n
+pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('NAME', true ),
+          CLAide::Argument.new('VERSION', true),
+          CLAide::Argument.new('FILE', true),
+          CLAide::Argument.new('REPO', true)
+        ]
+
+        def self.options
+          [
+            %w[--spec=SPEC 指定podspec文件路径，如果不指定，将在当前目录下查找]
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @version = argv.shift_argument
+          @file = argv.shift_argument
+          @repo = argv.shift_argument
+          @spec = argv.option('spec', nil)
+          super
+        end
+
+        def run
+          # 参数检查
+          argvsCheck
+          # 压缩文件
+          zip_file
+          # 上传文件
+          upload_zip_file
+          # 修改podspec
+          modify_spec
+          # 上传podspec
+          upload_spec
+        end
+
+        private
+
+        # 参数检查
+        def argvsCheck
+          raise Informative, "name不能为空" if @name.nil?
+          raise Informative, "version不能为空" if @version.nil?
+          raise Informative, "repo不能为空" if @repo.nil?
+          raise Informative, "未找到需要压缩的二进制文件" if @file.nil?
+          raise Informative, "未找到podspec文件" unless File.exist?(podspec)
+        end
+
+        # 压缩文件
+        def zip_file
+          UI.title "压缩二进制文件`#{zip_file_name}`".yellow do
+            output_zip_file = File.join(Dir.pwd, zip_file_name)
+            FileUtils.rm_f(output_zip_file) if File.exist?(output_zip_file)
+            command = "zip --symlinks -r #{zip_file_name} #{@file}"
+            UI.info "#{command}"
+            `#{command}`
+            raise Informative, "压缩二进制文件失败" unless File.exist?(output_zip_file)
+          end
+        end
+
+        # 压缩后的zip包名
+        def zip_file_name
+          @zip_file_name ||= begin
+                               "#{@name}_#{@version}.zip"
+                             end
+        end
+
+        # 上传文件
+        def upload_zip_file
+          UI.title "上传二进制文件`#{zip_file_name}`".yellow do
+            zip_file = File.join(Dir.pwd, zip_file_name)
+            raise Informative, "`#{@zip_file_name}`不存在" unless File.exist?(zip_file)
+            upload_url = CBin.config.binary_upload_url_str
+            command = "curl -F \"name=#{@name}\" -F \"version=#{@version}\" -F \"file=@#{zip_file}\" #{upload_url}"
+            UI.info "#{command}"
+            json = `#{command}`
+            UI.info json
+            begin
+              error_code = JSON.parse(json)["error_code"]
+              raise Informative, "`#{zip_file_name}`上传失败" unless error_code == 0
+              UI.info "`#{zip_file_name}`上传成功".green
+            rescue JSON::ParserError => e
+              raise Informative, "`#{zip_file_name}`上传失败\n#{e.to_s}"
+            end
+          end
+        end
+
+        # 修改podspec
+        def modify_spec
+          UI.title "修改podspec：`#{podspec}`".yellow do
+            spec = Specification.from_file(podspec)
+            spec_hash = spec.to_hash
+            spec_hash['version'] = @version
+            spec_hash['source'] = source
+            spec = Specification.from_hash(spec_hash)
+            write_podspec_json(spec)
+          end
+        end
+
+        # 写入podspec
+        def write_podspec_json(spec)
+          FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+          File.open(podspec_json_file, "w+") do |f|
+            f.write(spec.to_pretty_json)
+          end
+        end
+
+        def source
+          url = "#{CBin.config.binary_download_url_str}/#{@name}/#{@version}/#{zip_file_name}"
+          { http: url, type: 'zip' }
+        end
+
+        # 上传podspec
+        def upload_spec
+          UI.title "推送podspec：`#{podspec_json_file_name}`".yellow do
+            raise Informative, "`#{podspec_json_file_name}`不存在" unless File.exist?(podspec_json_file)
+            argvs = %W[#{@repo} #{podspec_json_file} --skip-import-validation --use-libraries --allow-warnings --verbose]
+
+            begin
+              push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+              push.validate!
+              push.run
+            rescue Pod::StandardError => e
+              raise Informative, "推送podspec：`#{podspec_json_file_name}失败\n#{e.to_s}"
+            end
+            # 上传完成后，清理工作目录
+            FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+            FileUtils.rm_r('binary') if File.exist?('binary')
+            FileUtils.rm_f(zip_file_name) if File.exist?(zip_file_name)
+          end
+        end
+
+        def binary_dir
+          File.join(Dir.pwd, 'binary')
+        end
+
+        def podspec_json_file_name
+          "#{@name}.podspec.json"
+        end
+
+        def podspec_json_file
+          File.join(Dir.pwd, podspec_json_file_name)
+        end
+
+        def podspec
+          @spec ||= begin
+                      "#{@name}.podspec"
+                    end
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-mtxx-bin/command/bin.rb

@@ -9,6 +9,8 @@ require 'cocoapods-mtxx-bin/command/bin/install'
 require 'cocoapods-mtxx-bin/command/bin/repo'
 require 'cocoapods-mtxx-bin/command/bin/spec'
 require 'cocoapods-mtxx-bin/command/bin/buildAll'
+require 'cocoapods-mtxx-bin/command/bin/outputSource'
+require 'cocoapods-mtxx-bin/command/bin/upload'
 require 'cocoapods-mtxx-bin/helpers'
 # require 'cocoapods-mtxx-bin/native'
 
@@ -41,7 +43,7 @@ module Pod
       self.summary = '组件二进制化插件'
       self.description = <<-DESC.strip_heredoc
         组件二进制化插件
-        
+
         利用源码私有源与二进制私有源实现对组件依赖类型的切换
       DESC
 

data/lib/cocoapods-mtxx-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.6"
+  VERSION = "0.0.9"
 end
 
 module Pod

data/lib/cocoapods-mtxx-bin/helpers/buildAll/bin_helper.rb

@@ -10,6 +10,8 @@ module CBin
         specs = specifications.map(&:name).select { |spec|
           spec.include?(pod_name) && !spec.include?('/Binary')
         }.sort!
+        xcode_version = `xcodebuild -version`.split(' ').join('')
+        specs << xcode_version
         specs_str = specs.join('')
         "#{original_version}.bin#{Digest::MD5.hexdigest(specs_str)[0,6]}"
       end

data/lib/cocoapods-mtxx-bin/helpers/buildAll/builder.rb

@@ -94,12 +94,16 @@ module CBin
         "#{@base_dir}/#{@pod_target}/Temp"
       end
 
+      def configuration
+        "Debug"
+      end
+
       def iphoneos
-        "Release-iphoneos"
+        "#{configuration}-iphoneos"
       end
 
       def iphonesimulator
-        "Release-iphonesimulator"
+        "#{configuration}-iphonesimulator"
       end
 
       # 需要排除的资源文件后缀
@@ -130,7 +134,7 @@ CONFIGURATION_TEMP_DIR=#{temp_dir} \
 BUILD_ROOT=#{product_dir} \
 BUILD_DIR=#{product_dir} \
 clean build \
--configuration Release \
+-configuration #{configuration} \
 -target #{@pod_target} \
 -project #{project}
         BUILD

data/lib/cocoapods-mtxx-bin/native/analyzer.rb

@@ -1,11 +1,30 @@
 
-
 require 'parallel'
 require 'cocoapods'
 
 module Pod
   class Installer
     class Analyzer
+      alias old_fetch_external_sources fetch_external_sources
+      def fetch_external_sources(podfile_state)
+        verify_no_pods_with_different_sources!
+        deps = dependencies_to_fetch(podfile_state)
+        pods = pods_to_fetch(podfile_state)
+        return if deps.empty?
+        UI.section 'Fetching external sources' do
+          if installation_options.install_with_multi_threads
+            thread_count = installation_options.multi_threads_count
+            Parallel.each(deps.sort, in_threads: thread_count) do |dependency|
+              fetch_external_source(dependency, !pods.include?(dependency.root_name))
+            end
+          else
+            deps.sort.each do |dependency|
+              fetch_external_source(dependency, !pods.include?(dependency.root_name))
+            end
+          end
+        end
+      end
+
       # > 1.6.0
       # all_specs[dep.name] 为 nil 会崩溃
       # 主要原因是 all_specs 分析错误
@@ -32,15 +51,16 @@ module Pod
       #
       alias old_update_repositories update_repositories
       def update_repositories
-        if installation_options.update_source_with_multi_processes
+        if installation_options.update_source_with_multi_threads
           # 并发更新私有源
           # 这里多线程会导致 pod update 额外输出 --verbose 的内容
           # 不知道为什么？
-          Parallel.each(sources.uniq(&:url), in_processes: 4) do |source|
-            if source.git?
-              config.sources_manager.update(source.name, true)
+          thread_count = installation_options.multi_threads_count
+          Parallel.each(sources.uniq(&:url), in_threads: thread_count) do |source|
+            if source.updateable?
+              sources_manager.update(source.name, true)
             else
-              UI.message "Skipping `#{source.name}` update because the repository is not a git source repository."
+              UI.message "Skipping `#{source.name}` update because the repository is not an updateable repository."
             end
           end
           @specs_updated = true

data/lib/cocoapods-mtxx-bin/native/installation_options.rb

@@ -19,7 +19,10 @@ module Pod
       env_option :install_with_multi_threads, false
 
       # 是否多进程执行 update_repositories
-      env_option :update_source_with_multi_processes, false
+      env_option :update_source_with_multi_threads, false
+
+      # 并发执行个数
+      option :multi_threads_count, 4
     end
   end
 end

data/lib/cocoapods-mtxx-bin/native/installer.rb

@@ -16,70 +16,32 @@ module Pod
     alias old_install_pod_sources install_pod_sources
     def install_pod_sources
       if installation_options.install_with_multi_threads
-        if Pod.match_version?('~> 1.4.0')
-          install_pod_sources_for_version_in_1_4_0
-        elsif Pod.match_version?('~> 1.5')
-          install_pod_sources_for_version_above_1_5_0
-        else
-          old_install_pod_sources
-        end
+        install_pod_sources_with_multiple_threads
       else
         old_install_pod_sources
       end
     end
 
-    # rewrite install_pod_sources
-    def install_pod_sources_for_version_in_1_4_0
-      @installed_specs = []
-      pods_to_install = sandbox_state.added | sandbox_state.changed
-      title_options = { verbose_prefix: '-> '.green }
-      Parallel.each(root_specs.sort_by(&:name), in_threads: 4) do |spec|
-        if pods_to_install.include?(spec.name)
-          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
-            previous = sandbox.manifest.version(spec.name)
-            title = "Installing #{spec.name} #{spec.version} (was #{previous})"
-          else
-            title = "Installing #{spec}"
-          end
-          UI.titled_section(title.green, title_options) do
-            install_source_of_pod(spec.name)
-          end
-        else
-          UI.titled_section("Using #{spec}", title_options) do
-            create_pod_installer(spec.name)
-          end
-        end
-      end
-    end
-
-    def install_pod_sources_for_version_above_1_5_0
+    # 多线程下载
+    def install_pod_sources_with_multiple_threads
       @installed_specs = []
       pods_to_install = sandbox_state.added | sandbox_state.changed
-      title_options = { verbose_prefix: '-> '.green }
-      # 多进程下载，多线程时 log 会显著交叉，多进程好点，但是多进程需要利用文件锁对 cache 进行保护
-      # in_processes: 10
-      Parallel.each(root_specs.sort_by(&:name), in_threads: 4) do |spec|
+      title_options = { :verbose_prefix => '-> '.green }
+      thread_count = installation_options.multi_threads_count
+      Parallel.each(root_specs.sort_by(&:name), in_threads: thread_count) do |spec|
         if pods_to_install.include?(spec.name)
           if sandbox_state.changed.include?(spec.name) && sandbox.manifest
             current_version = spec.version
             previous_version = sandbox.manifest.version(spec.name)
             has_changed_version = current_version != previous_version
-            current_repo = analysis_result.specs_by_source.detect do |key, values|
-              break key if values.map(&:name).include?(spec.name)
-            end
-            current_repo &&= current_repo.url || current_repo.name
+            current_repo = analysis_result.specs_by_source.detect { |key, values| break key if values.map(&:name).include?(spec.name) }
+            current_repo &&= (Pod::TrunkSource::TRUNK_REPO_NAME if current_repo.name == Pod::TrunkSource::TRUNK_REPO_NAME) || current_repo.url || current_repo.name
             previous_spec_repo = sandbox.manifest.spec_repo(spec.name)
-            has_changed_repo = !previous_spec_repo.nil? && current_repo && (current_repo != previous_spec_repo)
+            has_changed_repo = !previous_spec_repo.nil? && current_repo && !current_repo.casecmp(previous_spec_repo).zero?
             title = "Installing #{spec.name} #{spec.version}"
-            if has_changed_version && has_changed_repo
-              title += " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
-            end
-            if has_changed_version && !has_changed_repo
-              title += " (was #{previous_version})"
-            end
-            if !has_changed_version && has_changed_repo
-              title += " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)"
-            end
+            title << " (was #{previous_version} and source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if has_changed_version && has_changed_repo
+            title << " (was #{previous_version})" if has_changed_version && !has_changed_repo
+            title << " (source changed to `#{current_repo}` from `#{previous_spec_repo}`)" if !has_changed_version && has_changed_repo
           else
             title = "Installing #{spec}"
           end
@@ -87,7 +49,7 @@ module Pod
             install_source_of_pod(spec.name)
           end
         else
-          UI.titled_section("Using #{spec}", title_options) do
+          UI.section("Using #{spec}", title_options[:verbose_prefix]) do
             create_pod_installer(spec.name)
           end
         end
@@ -128,7 +90,15 @@ module Pod
       # old_ensure_matching_version 会移除不是同一个 CocoaPods 版本的组件缓存
       alias old_ensure_matching_version ensure_matching_version
       def ensure_matching_version
-        @@lock.synchronize { old_ensure_matching_version }
+        @@lock.synchronize do
+          version_file = root + 'VERSION'
+          # version = version_file.read.strip if version_file.file?
+
+          # root.rmtree if version != Pod::VERSION && root.exist?
+          root.mkpath
+
+          version_file.open('w') { |f| f << Pod::VERSION }
+        end
       end
     end
   end

data/lib/cocoapods-mtxx-bin/native/pod_target_installer.rb

@@ -22,10 +22,7 @@ module Pod
           alias old_add_swift_library_compatibility_header_phase add_swift_library_compatibility_header_phase
 
           def add_swift_library_compatibility_header_phase(native_target)
-            UI.puts "====== swift add_swift_library_compatibility_header_phase ======".yellow
             if $ARGV[1] == "auto"
-              UI.puts "====== auto swift add_swift_library_compatibility_header_phase ======".yellow
-
               if custom_module_map
                 raise Informative, 'Using Swift static libraries with custom module maps is currently not supported. ' \
                                  "Please build `#{target.label}` as a framework or remove the custom module map."
@@ -80,13 +77,9 @@ module Pod
               ${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h
             )
             else
-              UI.puts "====== null swift add_swift_library_compatibility_header_phase ======".yellow
               old_add_swift_library_compatibility_header_phase(native_target)
             end
-
           end
-
-          #-----------------------------------------------------------------------#
         end
       end
     end

data/lib/cocoapods-mtxx-bin/native/resolver.rb

@@ -189,8 +189,8 @@ module Pod
 
             raise Informative, "#{rspec.root.name}(#{spec_version})的podspec未找到，请执行 pod repo update 或添加相应的source源" unless source
 
-            UI.message "------------------- 分界线 -----------------------"
-            UI.message "- 开始处理 #{rspec.spec.name}(#{spec_version}) 组件（#{use_binary ? '二进制' : '源码'}）."
+            # UI.message "------------------- 分界线 -----------------------"
+            # UI.message "- 开始处理 #{rspec.spec.name}(#{spec_version}) 组件（#{use_binary ? '二进制' : '源码'}）."
 
             begin
               # 从新 source 中获取 spec,在bin archive中会异常，因为找不到
@@ -219,11 +219,11 @@ module Pod
                       else
                         ResolverSpecification.new(specification, used_by_only, source)
                       end
-              UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} (#{spec_version}) specification = #{specification} #{rspec} "
+              # UI.message "组装新的 rspec ，替换原 rspec #{rspec.root.name} (#{spec_version}) specification = #{specification} #{rspec} "
             rescue Pod::StandardError => e
               # 没有从新的 source 找到对应版本组件，直接返回原 rspec
               missing_binary_specs << rspec.spec if use_binary
-              UI.message "【#{rspec.spec.name} | #{rspec.spec.version}】组件无对应源码版本 , 将采用二进制版本依赖.".red unless use_binary
+              # UI.message "【#{rspec.spec.name} | #{rspec.spec.version}】组件无对应源码版本 , 将采用二进制版本依赖.".red unless use_binary
               rspec
             end
             rspec
@@ -232,7 +232,7 @@ module Pod
 
         if missing_binary_specs.any?
           missing_binary_specs.uniq.each do |spec|
-            UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
+            # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
           end
           # 下面的代码为了实现 auto 命令的 --all-make
           Pod::Command::Bin::Archive.missing_binary_specs(missing_binary_specs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -28,16 +28,22 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +108,7 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/initHotKey.rb
 - lib/cocoapods-mtxx-bin/command/bin/install.rb
 - lib/cocoapods-mtxx-bin/command/bin/lib/lint.rb
+- lib/cocoapods-mtxx-bin/command/bin/outputSource.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo/push.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo/update.rb
@@ -109,6 +116,7 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/spec/create.rb
 - lib/cocoapods-mtxx-bin/command/bin/spec/lint.rb
 - lib/cocoapods-mtxx-bin/command/bin/update.rb
+- lib/cocoapods-mtxx-bin/command/bin/upload.rb
 - lib/cocoapods-mtxx-bin/config/config.rb
 - lib/cocoapods-mtxx-bin/config/config_asker.rb
 - lib/cocoapods-mtxx-bin/config/config_builder.rb