cocoapods-meitu-bin 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e39980aef9bdfc449829f36825d3e494276a9c40dfeacc6315567c61aa54da
-  data.tar.gz: aee80d60a26a5938112fd2e26982d0ed5efa7d811c38bea89b06f3820c75165e
+  metadata.gz: 159c257b8856aad76bd63ed408f8693d644a4798f040b68471e0591bbeb5d80b
+  data.tar.gz: 999806ccf28ed97b0e2e9180a372e668a026657e4e59c8ba89bad59e97b468cd
 SHA512:
-  metadata.gz: 4520ca7be915df41b5918edcfacf04231d6962c20d9186925f382c45968f98af2c023d92d15d35f5d40c67ec5a3e3d1e88033c14415975f5383274e56a5fd14a
-  data.tar.gz: d00fab77b0354c225e06c425d90e6b7601a99c4e7c315c498f5ff28484ea882cc54b085ac3382ec2bca87cae9d4184c97de0c7ef2655cc4bdc39705a7a2af6ee
+  metadata.gz: ffd23b947bb5f41b041d867727fe88c519b8fd4b8b6b996fa5acce3a0daff88d527b30010159d3b622786c3e0f18d4dd639c01dbcdbd4f838c049d6f6b01cb25
+  data.tar.gz: 3780e408c04ef40e5f7dd4f46bd1bff10b2ffa5c47354b7a763229eb5aed4d15536cf5c4025dd1dc03b87ca2aec890a4b77a3968bb7d5087c69e9e6508a4fd4b

data/lib/cocoapods-meitu-bin/command/bin/build_all.rb

@@ -250,25 +250,25 @@ module Pod
                 end
                 # 构建产物
                 builder = Builder.new(pod_target, @sandbox.checkout_sources, @skip_simulator, @configuration)
-                result = builder.build
-                fail_pods << pod_target.pod_name unless result
-                next unless result
+                # result = builder.build
+                # fail_pods << pod_target.pod_name unless result
+                # next unless result
                 builder.create_binary
                 # 压缩并上传zip
                 zip_helper = ZipFileHelper.new(pod_target, version, builder.product_dir, builder.build_as_framework?, @configuration)
                 result = zip_helper.zip_lib
                 fail_pods << pod_target.pod_name unless result
                 next unless result
-                result = zip_helper.upload_zip_lib
-                fail_pods << pod_target.pod_name unless result
-                next unless result
+                # result = zip_helper.upload_zip_lib
+                # fail_pods << pod_target.pod_name unless result
+                # next unless result
                 # 生成二进制podspec并上传
                 podspec_creator = PodspecUtil.new(pod_target, version, builder.build_as_framework?, @configuration)
                 bin_spec = podspec_creator.create_binary_podspec
                 bin_spec_file = podspec_creator.write_binary_podspec(bin_spec)
-                result = podspec_creator.push_binary_podspec(bin_spec_file)
-                fail_pods << pod_target.pod_name unless result
-                success_pods << pod_target.pod_name if result
+                # result = podspec_creator.push_binary_podspec(bin_spec_file)
+                # fail_pods << pod_target.pod_name unless result
+                # success_pods << pod_target.pod_name if result
               rescue Pod::StandardError => e
                 UI.info "`#{pod_target}`编译失败，原因：#{e}".red
                 fail_pods << pod_target.pod_name

data/lib/cocoapods-meitu-bin/command/bin/get_checksum.rb

@@ -25,7 +25,22 @@ module Pod
         # 计算checksum值
         def calculate_checksum(file_path)
           return "" unless File.exist?(file_path)
-          content = File.read(file_path)
+          content = ""
+          lines = []
+          #过滤出实际使用pod
+          File.open(file_path, 'r') do |file|
+            file.each_line do |line|
+              new_line = line.strip
+              if new_line.start_with?("pod")
+                lines << new_line
+              end
+            end
+          end
+          #给获取的pod list 排序，排除因组件顺序调整导致获取SHA1值不一样
+          lines = lines.sort
+          lines.each do |line|
+            content << line
+          end
           checksum = Digest::SHA1.hexdigest(content)
           checksum = checksum.encode('UTF-8') if checksum.respond_to?(:encode)
           return checksum

data/lib/cocoapods-meitu-bin/config/config.rb

@@ -153,15 +153,38 @@ class PodUpdateConfig
   @@lockfile = nil
   @@repo_update = true
   @@prepare_time = 0
+  @@checksum = nil
+  @@large_pod_hash = {}
+  @@is_mtxx = false
+
   def self.add_value(value)
     @@pods << value
   end
+  def self.set_is_mtxx(value)
+    @@is_mtxx = value
+  end
+  def self.is_mtxx()
+    @@is_mtxx
+  end
   def self.set_lockfile(path)
     @@lockfile = Pod::Lockfile.from_file(path) if path
   end
   def self.lockfile()
     @@lockfile
   end
+  def self.set_checksum(checksum)
+    @@checksum = checksum
+  end
+  def self.checksum
+    @@checksum
+  end
+  def self.add_pod_hash(name,size)
+    @@large_pod_hash[name]=size
+  end
+  def self.large_pod_hash
+    @@large_pod_hash
+  end
+
   # 一个类方法，用于显示数组中的值
   def self.repo_update
     @@repo_update

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
 
 module Pod

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

@@ -10,7 +10,7 @@ module CBin
         @skip_simulator = skip_simulator
         @configuration = configuration
         @file_accessors = pod_target.file_accessors unless pod_target.nil?
-        @base_dir = "#{Pathname.pwd}/build_pods"
+        @base_dir = "#{Pathname.pwd}/all_build/Build"
       end
 
       # 构建
@@ -92,7 +92,7 @@ module CBin
 
       # xxx.framework 所在目录
       def product_dir
-        @product_dir = "#{@base_dir}/#{@pod_target}/Products"
+        @product_dir = "#{@base_dir}/Products"
         @product_dir
       end
 

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

@@ -48,7 +48,7 @@ module CBin
       # podspec写入文件
       def write_binary_podspec(spec)
         UI.info "写入podspec：`#{@pod_target}`".yellow
-        podspec_dir = "#{Pathname.pwd}/build_pods/#{@pod_target}/Products/podspec"
+        podspec_dir = "#{Pathname.pwd}/all_build/Build/Products/podspec"
         FileUtils.mkdir(podspec_dir) unless File.exist?(podspec_dir)
         file = "#{podspec_dir}/#{@pod_target.pod_name}.podspec.json"
         FileUtils.rm_rf(file) if File.exist?(file)

data/lib/cocoapods-meitu-bin/helpers/pod_size_helper.rb

@@ -1,3 +1,4 @@
+require 'cocoapods-meitu-bin/config/config'
 module CBin
   class PodSize
     include Pod
@@ -15,6 +16,9 @@ module CBin
         return
       end
       @@lock.synchronize do
+        size = pod[:size].to_i
+        size = ('%.0f' % (size / 1024)).to_f
+        PodUpdateConfig.add_pod_hash(pod[:name],size)
         File.open(@@tmp_file_path, "a") do |f|
           f.write(format_pod_size(pod))
         end

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

@@ -2,6 +2,9 @@ require 'cocoapods/installer/project_cache/target_metadata.rb'
 require 'parallel'
 require 'cocoapods'
 require 'xcodeproj'
+require 'json'
+require 'timeout'
+require 'net/http'
 require 'cocoapods-meitu-bin/native/pod_source_installer'
 require 'cocoapods-meitu-bin/helpers/pod_size_helper'
 require 'cocoapods-meitu-bin/config/config'
@@ -114,17 +117,6 @@ module Pod
     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_source_bin_statistics
-      # 打印耗时
-      print_cost_time
-      # 打印大小大于阈值的库
-      CBin::PodSize.print_pods
-    end
-
-    # 打印有多少个源码库，多少二进制库
-    def print_source_bin_statistics
       source_pods = []
       bin_pods = []
       @pod_targets.map do |target|
@@ -134,16 +126,85 @@ module Pod
           bin_pods << target
         end
       end
-      UI.puts "\n总共有 #{@pod_targets.size} 个Pod库，二进制有 #{bin_pods.size} 个，源码有 #{source_pods.size} 个".green
+      cost_time_hash['perform_post_install_actions'] = Time.now - start_time
+
+      # 打印有多少个源码库，多少二进制库
+      print_source_bin_statistics(source_pods,bin_pods)
+      # 打印耗时
+      print_cost_time
+      # 打印大小大于阈值的库
+      CBin::PodSize.print_pods
+      if PodUpdateConfig.is_mtxx
+        begin
+          data = {
+            "meitu_bin_version" => CBin::VERSION,
+            "large_pod_hash" => PodUpdateConfig.large_pod_hash
+          }
+          all_time = 0
+          cost_time_hash.each do |key, value|
+            time = ('%.1f' % value).to_f
+            data[key] = time
+            all_time = all_time + time
+          end
+          data["pod_time"] = all_time
+          binary_rate = bin_pods.size.to_f / @pod_targets.size.to_f
+          data["binary_rate"] = ('%.2f' % binary_rate).to_f
+          data["source_count"] = source_pods.size
+          data["binary_count"] = bin_pods.size
+          data["targets_count"] = @pod_targets.size
+          source = "unknown user"
+          if ENV['NODE_NAME']
+            source = ENV['NODE_NAME']
+          else
+            source = `git config user.email`
+            source = source.gsub("\n", "")
+          end
+          data_json = {
+            "subject" => "MTXX pod time profiler",
+            "type" => "pod_time_profiler",
+            "source" => source,
+            "data" => data
+          }
+          begin
+            timeout(3) do
+              json_data = [data_json].to_json
+              api_url = "http://event-adapter-internal.prism.cloud.meitu-int.com/api/v1/http/send/batch"
+              headers = { "Content-Type" => "application/json" }
+              uri = URI(api_url)
+              http = Net::HTTP.new(uri.host, uri.port)
+              request = Net::HTTP::Post.new(uri.path, headers)
+              request.body = json_data
+              response = http.request(request)
+              if ENV['MEITU_USE_POD_SOURCE'] == '1'
+                puts "pod_time_profiler: Response code: #{response.code}"
+                puts "pod_time_profiler: data_json: #{data_json}"
+              end
+            end
+          rescue Timeout::Error
+            puts "pod_time_profiler: 上报pod操作操作已超时"
+          end
+        rescue => error
+          puts "pod_time_profiler: 上报pod 耗时统计失败，失败原因：#{error}"
+        end
+      end
+
+    end
+
+    # 打印有多少个源码库，多少二进制库
+    def print_source_bin_statistics(source_pods,bin_pods)
+
+      UI.puts "\npod_time_profiler: 总共有 #{@pod_targets.size} 个Pod库，二进制有 #{bin_pods.size} 个，源码有 #{source_pods.size} 个".green
       # 打印二进制库
       if ENV['statistics_bin'] == '1'
         UI.puts "二进制库：".green
         UI.puts bin_pods
       end
       # 打印源码库
-      if ENV['statistics_source'] == '1'
+      if ENV['MEITU_USE_POD_SOURCE'] == '1'
         UI.puts "源码库：".green
-        UI.puts source_pods
+        source_pods.each do |pod|
+          UI.puts "pod_time_profiler: #{pod.name}"
+        end
       end
     end
 

data/lib/cocoapods-meitu-bin/source_provider_hook.rb

@@ -5,26 +5,39 @@ require 'cocoapods/user_interface'
 require 'digest'
 require 'yaml'
 require 'cocoapods'
-
+require 'json'
+require 'net/http'
 #获取服务端podfile.lock文件
 def get_podfile_lock
   begin
     # 默认是获取要获取服务端podfile.lock文件
     is_load_podfile_lock = true
+    #目前只支持MTXX target "MTXX" 项目 #想要支持其他项目可以添加对应 target "xxx"
+    content = File.read(Pod::Config.instance.podfile_path)
+    if content
+      if content.include?("target \"MTXX\"")
+        is_load_podfile_lock = true
+        PodUpdateConfig.set_is_mtxx(true)
+      else
+        is_load_podfile_lock = false
+        PodUpdateConfig.set_is_mtxx(false)
+      end
+    end
     # MEITU_LOAD_CACHE_PODFILE_LOCK 为false时不获取服务端podfile.lock文件
     if ENV['MEITU_LOAD_CACHE_PODFILE_LOCK'] && ENV['MEITU_LOAD_CACHE_PODFILE_LOCK'] == 'false'
       is_load_podfile_lock = false
     end
     # 判断是否有update参数 时不获取服务端podfile.lock文件
     ARGV.each do |arg|
-      if arg == 'update'
+      if arg == 'update' || arg == '--no-cloud'
         is_load_podfile_lock = false
       end
     end
     # podfile.lock文件下载和使用逻辑
     if is_load_podfile_lock
       #获取 PODFILE CHECKSUM 用来判断服务端是否存在该podfile.lock
-      checksum = Pod::Config.instance.podfile.checksum
+      checksum = get_checksum(Pod::Config.instance.podfile_path)
+      PodUpdateConfig.set_checksum(checksum)
       Pod::UI.puts "当前podfile文件的checksum:#{checksum}".green
       # zip下载地址
       curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.zip"
@@ -159,10 +172,25 @@ def get_branch_name
   branch_value = branch_value.gsub("\n", "")
   branch_value
 end
-
+#过滤出来podfile中实际有效每行内容，拼接成字符串在SHA1 后UTF-8编码下 用来当做依赖缓存文件的key
 def get_checksum(file_path)
   return nil unless File.exist?(file_path)
-  content = File.read(file_path)
+  content = ""
+  lines = []
+  #过滤出实际使用pod
+  File.open(file_path, 'r') do |file|
+    file.each_line do |line|
+      new_line = line.strip
+      if new_line.start_with?("pod")
+        lines << new_line
+      end
+    end
+  end
+  #给获取的pod list 排序，排除因组件顺序调整导致获取SHA1值不一样
+  lines = lines.sort
+  lines.each do |line|
+    content << line
+  end
   checksum = Digest::SHA1.hexdigest(content)
   checksum = checksum.encode('UTF-8') if checksum.respond_to?(:encode)
   return checksum
@@ -217,19 +245,13 @@ end
 # 注册 pod install 钩子
 Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
   #基于podfile的checksum上报云端podfile.lock文件
-  podfile_path = Pod::Config.instance.installation_root + 'podfile'
-  # puts "#{podfile_path}".green
-  checksum = get_checksum(podfile_path)
-  # puts "#{checksum}".green
-  if checksum
-    upload_podfile_lock(checksum)
-  end
-  #判断是否在 mbox 工作目录执行pod install
-  if system("mbox status > /dev/null 2>&1")
-    upload_mbox_podfile_lock
+  if PodUpdateConfig.is_mtxx
+    if PodUpdateConfig.checksum
+      upload_podfile_lock(PodUpdateConfig.checksum)
+    end
+    upload_branch_podfile_lock
   end
-  #基于分支，上报podfile.lock文件
-  upload_branch_podfile_lock
+
 end
 
 Pod::HooksManager.register('cocoapods-meitu-bin', :source_provider) do |context, _|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel