cocoapods-mtxx-bin 0.0.9.1 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c65c28411ebe84f39594b4edc5a6c83729b48faf97715af4439f9df0b5c61553
-  data.tar.gz: 3fd4c776db20bdfa9c3284a50b4d4d55f50f7cb1a5ce024719a998e616b8b802
+  metadata.gz: 40602fdc840e2eb27939c1f3eaffb2d008c35ac79834e9388a254b5663138510
+  data.tar.gz: bde311b8c960a178b1c033715d60e22281b97a90143602649ed4edff83d5ac51
 SHA512:
-  metadata.gz: cd94102dd7f8d97eb32155f7090d6cdde300ee7f159872658e35ad2338380f43f28d8f7be04725f11d185166e0f05b5130e4694b5ad53375cb3bfc16b954493d
-  data.tar.gz: 676ebc6e13e65715e86464b783f7c157506915985664a609ba697cb0db1853ec806a347327c4e66b3c624c2b8a6d7204c12b7757b5a7527a9bec731277abac11
+  metadata.gz: 6061d7be0b25cf7270f789cac3fa6984029a47ff4856c769615a96777a9b968b7de071d6eeb857729f15a18126293ff24571722b811e8ef807ac75116cf9a336
+  data.tar.gz: 8c1d5822f00a15c3613b4b9bb1a2b23c92e95e478c5e98fee6b92746d3d126c18351f6c64ea11895735995b6843f08b5196ab2e13ffb8a07f0c0a29c3c0cd420

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

@@ -35,6 +35,7 @@ module Pod
           @repo_update = argv.flag?('repo-update', false)
           @full_build = argv.flag?('full-build', false)
           @base_dir = "#{Pathname.pwd}/build_pods"
+          @version_helper = BinHelper.new
           super
         end
 
@@ -187,7 +188,7 @@ module Pod
             created_pods = []
             pod_targets.map do |pod_target|
               begin
-                version = BinHelper.version(pod_target.pod_name, pod_target.root_spec.version.to_s, @analyze_result.specifications)
+                version = @version_helper.version(pod_target.pod_name, pod_target.root_spec.version.to_s, @analyze_result.specifications)
                 # 全量
                 if @full_build
                   # 黑名单

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

@@ -1,4 +1,5 @@
 require 'json'
+require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
 
 module Pod
   class Command
@@ -38,6 +39,7 @@ pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
           @file = argv.shift_argument
           @repo = argv.shift_argument
           @spec = argv.option('spec', nil)
+          @xcode_version = BinHelper.xcode_version
           super
         end
 
@@ -125,7 +127,7 @@ pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
         end
 
         def source
-          url = "#{CBin.config.binary_download_url_str}/#{@name}/#{@version}/#{zip_file_name}"
+          url = "#{CBin.config.binary_download_url_str}/#{@xcode_version}/#{@name}/#{@version}/#{zip_file_name}"
           { http: url, type: 'zip' }
         end
 

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

@@ -2,7 +2,7 @@
 require 'cocoapods-mtxx-bin/command/bin/init'
 require 'cocoapods-mtxx-bin/command/bin/archive'
 require 'cocoapods-mtxx-bin/command/bin/auto'
-require 'cocoapods-mtxx-bin/command/bin/code'
+# require 'cocoapods-mtxx-bin/command/bin/code'
 require 'cocoapods-mtxx-bin/command/bin/update'
 require 'cocoapods-mtxx-bin/command/bin/install'
 # require 'cocoapods-mtxx-bin/command/bin/imy'

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.9.1"
+  VERSION = "0.0.10"
 end
 
 module Pod

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

@@ -5,15 +5,37 @@ module CBin
     class BinHelper
       include Pod
 
+      def initialize
+        super
+        @specs_str_md5_hash = Hash.new
+      end
+
       # 二进制版本号（x.y.z.bin[md5前6位]）
-      def self.version(pod_name, original_version, specifications)
-        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]}"
+      def version(pod_name, original_version, specifications)
+        # 有缓存从缓存中取，没有则新建
+        if @specs_str_md5_hash[pod_name].nil?
+          specs = specifications.map(&:name).select { |spec|
+            spec.include?(pod_name) && !spec.include?('/Binary')
+          }.sort!
+          specs << xcode_version
+          specs_str = specs.join('')
+          specs_str_md5 = Digest::MD5.hexdigest(specs_str)[0,6]
+          @specs_str_md5_hash[pod_name] = specs_str_md5
+        else
+          specs_str_md5 = @specs_str_md5_hash[pod_name]
+        end
+        "#{original_version}.bin#{specs_str_md5}"
+      end
+
+      def xcode_version
+        @xcode_version ||= begin
+                             `xcodebuild -version`.split(' ').join('')
+                           end
+      end
+      
+      def self.xcode_version
+          xcode_version = `xcodebuild -version`.split(' ').join('')
+          xcode_version
       end
 
     end

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

@@ -140,9 +140,13 @@ clean build \
         BUILD
         UI.info "#{command}"
         output = `#{command}`
-        puts output
+        # puts output
         if $CHILD_STATUS.exitstatus != 0
           UI.info "#{@pod_target}(#{sdk}) 编译失败！".red
+          error_log_file = "#{temp_dir}/#{@pod_target}_error.log"
+          File.open(error_log_file, "w+") do |f|
+            f.write(output)
+          end
           return false
         end
         return true

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

@@ -119,7 +119,7 @@ module CBin
 
       def source
         # url = "http://localhost:8080/frameworks/#{@pod_target.root_spec.module_name}/#{version}/zip"
-        url = "#{CBin.config.binary_download_url_str}/#{@pod_target.root_spec.module_name}/#{version}/#{@pod_target.root_spec.module_name}.framework_#{version}.zip"
+        url = "#{CBin.config.binary_download_url_str}/#{BinHelper.xcode_version}/#{@pod_target.root_spec.module_name}/#{version}/#{@pod_target.root_spec.module_name}.framework_#{version}.zip"
         { http: url, type: 'zip' }
       end
 

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

@@ -1,4 +1,5 @@
 require 'json'
+require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
 
 module CBin
   module BuildAll
@@ -22,8 +23,9 @@ module CBin
           end
           UI.info "Uploading binary zip file #{@pod_target.root_spec.name} (#{@version || @pod_target.root_spec.version})".yellow do
             upload_url = CBin.config.binary_upload_url_str
-            # upload_url = "http://localhost:8080/frameworks"
-            command = "curl -F \"name=#{@pod_target.product_module_name}\" -F \"version=#{@version || @pod_target.root_spec.version}\" -F \"file=@#{zip_file}\" #{upload_url}"
+            # upload_url = "http://localhost:8080/frameworks" xcode_version
+            xcode_version = BinHelper.xcode_version
+            command = "curl -F \"name=#{@pod_target.product_module_name}\" -F \"version=#{@version || @pod_target.root_spec.version}\" -F \"xcode_version=#{xcode_version}\" -F \"file=@#{zip_file}\" #{upload_url}"
             UI.info "#{command}"
             json = `#{command}`
             UI.info json

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

@@ -16,7 +16,7 @@ module Pod
       env_option :warn_for_unsecure_source, false
 
       # 是否多线程执行 install_pod_sources
-      env_option :install_with_multi_threads, false
+      env_option :install_with_multi_threads, true
 
       # 是否多进程执行 update_repositories
       env_option :update_source_with_multi_threads, false

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

@@ -6,6 +6,86 @@ require 'cocoapods-mtxx-bin/native/pod_source_installer'
 
 module Pod
   class Installer
+
+    def cost_time_hash
+      @cost_time_hash ||= begin
+                            Hash.new
+                          end
+    end
+
+    # TODO: 不知道为啥无法hook
+    # 准备
+    alias old_prepare prepare
+    def prepare
+      start_time = Time.now
+      old_prepare
+      cost_time_hash['prepare'] = Time.now - start_time
+    end
+
+    # 依赖分析
+    alias old_resolve_dependencies resolve_dependencies
+    def resolve_dependencies
+      start_time = Time.now
+      analyzer = old_resolve_dependencies
+      cost_time_hash['resolve_dependencies'] = Time.now - start_time
+      analyzer
+    end
+
+    # 依赖下载
+    alias old_download_dependencies download_dependencies
+    def download_dependencies
+      start_time = Time.now
+      old_download_dependencies
+      cost_time_hash['download_dependencies'] = Time.now - start_time
+    end
+
+    # 验证target
+    alias old_validate_targets validate_targets
+    def validate_targets
+      start_time = Time.now
+      old_validate_targets
+      cost_time_hash['validate_targets'] = Time.now - start_time
+    end
+
+    # 集成
+    alias old_integrate integrate
+    def integrate
+      start_time = Time.now
+      old_integrate
+      cost_time_hash['integrate'] = Time.now - start_time
+    end
+
+    # 写入lock文件
+    alias old_write_lockfiles write_lockfiles
+    def write_lockfiles
+      start_time = Time.now
+      old_write_lockfiles
+      cost_time_hash['write_lockfiles'] = Time.now - start_time
+    end
+
+    # 执行post install
+    alias old_perform_post_install_actions perform_post_install_actions
+    def perform_post_install_actions
+      start_time = Time.now
+      old_perform_post_install_actions
+      cost_time_hash['perform_post_install_actions'] = Time.now - start_time
+      # 打印耗时
+      print_cost_time
+    end
+
+    # 打印耗时
+    def print_cost_time
+      UI.title '执行耗时：'.green do
+        UI.info '———————————————————————————————————————————————'.green
+        UI.info "|#{'Stage'.center(30)}|#{'Time(s)'.center(15)}|".green
+        UI.info '———————————————————————————————————————————————'.green
+        cost_time_hash.each do |key, value|
+          UI.info "|#{key.center(30)}|#{value.to_s.center(15)}|".green
+        end
+        UI.info '———————————————————————————————————————————————'.green
+      end
+    end
+
     alias old_create_pod_installer create_pod_installer
     def create_pod_installer(pod_name)
       installer = old_create_pod_installer(pod_name)

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

@@ -0,0 +1,46 @@
+module Pod
+  class Lockfile
+    def detect_changes_with_podfile(podfile)
+      result = {}
+      [:added, :changed, :removed, :unchanged].each { |k| result[k] = [] }
+
+      installed_deps = {}
+      dependencies.each do |dep|
+        name = dep.root_name
+        installed_deps[name] ||= dependencies_to_lock_pod_named(name)
+      end
+
+      installed_deps = installed_deps.values.flatten(1).group_by(&:name)
+
+      podfile_dependencies = podfile.dependencies
+      podfile_dependencies_by_name = podfile_dependencies.group_by(&:name)
+
+      all_dep_names = (dependencies + podfile_dependencies).map(&:name).uniq
+      all_dep_names.each do |name|
+        installed_dep   = installed_deps[name]
+        installed_dep &&= installed_dep.first
+
+        # 需要将二进制版本的 specific_version 最后一位去掉，否则二进制下依赖解析很慢
+        unless installed_dep.nil?
+          installed_dep_version = installed_dep.specific_version.to_s
+          if installed_dep_version.include?('bin')
+            req_arr = installed_dep_version.split('.').delete_if { |r| r.include?('bin') }
+            installed_dep_version = req_arr.join('.')
+            installed_dep.specific_version = Pod::Version.create(installed_dep_version)
+          end
+        end
+
+        podfile_dep     = podfile_dependencies_by_name[name]
+        podfile_dep   &&= podfile_dep.first
+
+        if installed_dep.nil?  then key = :added
+        elsif podfile_dep.nil? then key = :removed
+        elsif podfile_dep.compatible?(installed_dep) then key = :unchanged
+        else key = :changed
+        end
+        result[key] << name
+      end
+      result
+    end
+  end
+end

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

@@ -131,7 +131,9 @@ module Pod
           value.payload = dep
         end
 
+        start_time = Time.now
         @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
+        UI.puts "Molinillo resolve耗时:#{Time.now - start_time}".green
         resolver_specs_by_target
       rescue Molinillo::ResolverError => e
         handle_resolver_error(e)
@@ -177,7 +179,7 @@ module Pod
             use_binary = use_binary_rspecs.include?(rspec)
             if use_binary
               source = sources_manager.binary_source
-              spec_version = CBin::BuildAll::BinHelper.version(rspec.root.name, rspec.spec.version, specifications)
+              spec_version = version_helper.version(rspec.root.name, rspec.spec.version, specifications)
             else
               # 获取podfile中的source
               podfile_sources = podfile.sources.uniq.map { |source| sources_manager.source_with_name_or_url(source) }
@@ -263,6 +265,12 @@ module Pod
         specs_by_target
       end
     end
+
+    def version_helper
+      @version_helper ||= begin
+                            CBin::BuildAll::BinHelper.new
+                          end
+    end
   end
 
   if Pod.match_version?('~> 1.4.0')

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

@@ -21,5 +21,6 @@ if Pod.match_version?('~> 1.4')
   require 'cocoapods-mtxx-bin/native/pod_target_installer'
   require 'cocoapods-mtxx-bin/native/target_validator'
   require 'cocoapods-mtxx-bin/native/gen'
+  require 'cocoapods-mtxx-bin/native/lockfile'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.9.1
+  version: 0.0.10
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -148,6 +148,7 @@ files:
 - lib/cocoapods-mtxx-bin/native/installation_options.rb
 - lib/cocoapods-mtxx-bin/native/installer.rb
 - lib/cocoapods-mtxx-bin/native/linter.rb
+- lib/cocoapods-mtxx-bin/native/lockfile.rb
 - lib/cocoapods-mtxx-bin/native/path_source.rb
 - lib/cocoapods-mtxx-bin/native/pod_source_installer.rb
 - lib/cocoapods-mtxx-bin/native/pod_target_installer.rb