cocoapods-mtxx-bin 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00c25aad1e1bb13ef8c88e50faf60801931532128a902ab72d40415c6f74809f
-  data.tar.gz: 59e39e2c15ea57d12940f89dc13760155a663aeb22ed7077bb6bcc8e0d4c7e43
+  metadata.gz: 2c59fa44939d32b5a5422f0646ea4729c41891e6acf7915cae4d944285c4d897
+  data.tar.gz: e76cb2fbf759274440591980a15935bb450992b0ab62b931413fabb937c1876b
 SHA512:
-  metadata.gz: b6f9e5f92d9a260f67fe3f94ecd695314fcb523defdb9d407a5398be6984c2d1d672cc7a54e47c0d031ee158d91075c8da5a6cc27a9d53c1588fc1cc5a6f639d
-  data.tar.gz: 3c678a0494d56ac065707adb58470f33ac94590087b9b2957fd901e23dfd1bcd589214ef42ce5df285ed2511d11af1481202f211faffa4628ac5a39f5a42a072
+  metadata.gz: e9f522fc8a561fe0cd06b287b30c456579fe20eb7ad576a91a1abb5a727a96ad44a994cfcab3330771c15c88eef6a1be554edae02b288f03aeee9136ae711dea
+  data.tar.gz: 15a88b10bb581930ce29bd61a2a49b75fcda4e8f9e6e76eec0a715618e1c53ed461b0dbb92efae72cfd5867801ba87b58a0779ce89ba9e2adb372e38113bc925

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

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

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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel