cocoapods-meitu-bin 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fe8864cb3d9496d9c5920bc907be66aa5232cc9e5990a077ecb05394434f9b
-  data.tar.gz: b9f6a4336698f14e91501324dc6deeecccfde310cdb3e588af0c421e7d9861e7
+  metadata.gz: 56df1ca5fc20d16f6cdbc2aaada6d1118af7b0cb95867057da93ef80af119c85
+  data.tar.gz: d0bd9f61753c5131fbb49ab175295b7de30fc88a568827199cda409fa4105ed6
 SHA512:
-  metadata.gz: 4bbd6f7a386174614d960d826752381ed6d86cea458e2bb8d9c397a5e90b45abd3326da89be1420f9fe310b8749dc6954f02088533c1abd5911c3fdd1a560ded
-  data.tar.gz: 5054ae8df4e179f558a9ebc3da56643c32e390a1f07b1c6fea015ad60db308df2d3e4b25dd9677314755d660a64a90a0a2dde4733be643012c399b91d45bc968
+  metadata.gz: 3b9c119faaf7a735b139d8bf84f277d603e035456e9e8bf0c437a331c8ce27c7685e4d7b10181170ec4e44692c01e77e033401673681098f1bd38fad5b8d70bf
+  data.tar.gz: 7eea023f3c6fc7dbf97968fb08d7d8234d3acfb49e989cf722bc57cc851035868da1dda2f066ae56e61c252a82c3501a31322fe09ee13159da19cd463b800d09

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

@@ -2,7 +2,7 @@ require 'yaml'
 require 'cocoapods-meitu-bin/native/podfile'
 require 'cocoapods-meitu-bin/native/podfile_env'
 require 'cocoapods/generate'
-
+require 'cocoapods'
 module CBin
   class Config
     def config_file
@@ -147,3 +147,25 @@ module CBin
     @config ||= Config.new
   end
 end
+
+class PodUpdateConfig
+  @@pods = []
+  @@lockfile = nil
+  def self.add_value(value)
+    @@pods << value
+  end
+  def self.set_lockfile(path)
+    @@lockfile = Pod::Lockfile.from_file(path) if path
+  end
+  def self.lockfile()
+    @@lockfile
+  end
+  # 一个类方法，用于显示数组中的值
+  def self.pods
+    @@pods
+  end
+  def self.clear
+    @@pods = []
+    @@lockfile = nil
+  end
+end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end
 
 module Pod

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

@@ -26,7 +26,8 @@ module CBin
         spec['private_header_files'] = "#{root_dir}/PrivateHeaders/*.h"
         # 处理vendored_libraries和vendored_frameworks
         spec['vendored_libraries'] = "#{root_dir}/libs/*.a"
-        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework]
+        #兼容.xcframework
+        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework #{root_dir}/fwks/*.xcframework]
         # 处理资源
         resources = %W[#{root_dir}/*.{#{special_resource_exts.join(',')}} #{root_dir}/resources/*]
         spec['resources'] = resources

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

@@ -4,6 +4,7 @@ require 'cocoapods'
 require 'xcodeproj'
 require 'cocoapods-meitu-bin/native/pod_source_installer'
 require 'cocoapods-meitu-bin/helpers/pod_size_helper'
+require 'cocoapods-meitu-bin/config/config'
 
 module Pod
   class Installer
@@ -34,6 +35,14 @@ module Pod
     # 依赖分析
     alias old_resolve_dependencies resolve_dependencies
     def resolve_dependencies
+      list =  PodUpdateConfig.pods
+      # 判断  PodUpdateConfig.pods 是否为空，且数组大于0
+      if list && !list.empty?
+        self.update = { :pods => list  }
+      end
+      if PodUpdateConfig.lockfile
+        self.instance_variable_set("@lockfile",PodUpdateConfig.lockfile)
+      end
       start_time = Time.now
       analyzer = old_resolve_dependencies
       cost_time_hash['resolve_dependencies'] = Time.now - start_time

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

@@ -3,13 +3,116 @@ require 'cocoapods-meitu-bin/command/bin/repo/update'
 require 'cocoapods-meitu-bin/config/config'
 require 'cocoapods/user_interface'
 require 'yaml'
+require 'cocoapods'
 
-Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context, _|
+#获取服务端podfile.lock文件
+def get_podfile_lock
+  begin
+    # 默认是获取要获取服务端podfile.lock文件
+    is_load_podfile_lock = true
+    # 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|
+      puts "pod 执行 #{arg}"
+      if arg == 'update'
+        is_load_podfile_lock = false
+      end
+    end
+    # podfile.lock文件下载和使用逻辑
+    if is_load_podfile_lock
+      #获取 PODFILE CHECKSUM 用来判断服务端是否存在该podfile.lock
+      checksum = Pod::Config.instance.podfile.checksum
+      puts checksum
+      # zip下载地址
+      curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.zip"
+      # 判断zip文件是否存在 存在下载并解压
+      if system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200  > /dev/null 2>&1")
+        puts "获取服务端存储的podfile.lcok文件".green
+        #下载并解压的podfile.zip文件
+        if system("curl -O #{curl} > /dev/null 2>&1") && system("unzip -o podfile.lock.zip  > /dev/null 2>&1")
+          Pod::UI.puts "下载并解压podfile.lcok文件成功".green
+          `rm -rf podfile.lock.zip`
+          # 设置获取到的podfile.lock对象
+          PodUpdateConfig.set_lockfile(Pod::Config.instance.installation_root + 'Podfile.lock')
+          #获取analyzer
+          Pod::UI.puts "提前根据checksum命中podfile.lcok进行依赖分析".green
+          analyzer = Pod::Installer::Analyzer.new(
+            Pod::Config.instance.sandbox,
+            Pod::Config.instance.podfile,
+            PodUpdateConfig.lockfile
+          )
+          analyzer.analyze(true)
+
+          #获取analyzer中所有git 且branch 指向的pod
+          Pod::Config.instance.podfile.dependencies.map do |dependency|
+            if dependency.external_source && dependency.external_source[:git] && (dependency.external_source[:branch] || (dependency.external_source.size == 1))
+              #brash 指定的组件添加到全局PodUpdateConfig配置中，执行pod install 需要更新的分支最新提交
+              PodUpdateConfig.add_value(dependency.name)
+            end
+          end
+        else
+          puts "获取podfile.lcok文件失败"
+          `rm -rf podfile.lock.zip`
+        end
+      end
+    end
+  rescue => error
+    puts "podfile.lcok相关处理发生异常，报错原因：#{error}"
+    PodUpdateConfig.clear
+    `rm -rf podfile.lock.zip`
+    `rm -rf podfile.lock`
+  end
+end
+
+
+# 上传podfile.lock文件到服务端
+def upload_podfile_lock(checksum,upload = false)
+  begin
+    curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.zip"
+    # 服务端不存在该podfiel.lock文件才上传，避免频繁上报同一个文件
+    if  upload || !system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200 > /dev/null 2>&1")
+      Pod::UI.puts "上报podfile.lcok文件到服务端".green
+      puts Pod::Config.instance.podfile.checksum
+      if upload
+        puts "mbox podfile.checksum = #{checksum}"
+      end
+      if system("zip  podfile.lock.zip Podfile.lock > /dev/null 2>&1") && system("curl -F \"name=MTXX\" -F \"version=#{checksum}\" -F \"file=@#{Pathname.pwd}/podfile.lock.zip\" http://nezha.community.cloud.meitu.com/file/upload.json > /dev/null 2>&1")
+        Pod::UI.puts "上报podfile.lcok文件到服务端成功".green
+        `rm -rf podfile.lock.zip`
+      else
+        Pod::UI.puts "上报podfile.lcok文件到服务端失败".red
+        `rm -rf podfile.lock.zip`
+      end
+    end
+  rescue => error
+     puts "上传podfile.lcok文件失败，失败原因：#{error}"
+    `rm -rf podfile.zip`
+  end
+end
+def upload_mbox_podfile_lock
+  begin
+    podfile_path = Pod::Config.instance.installation_root + 'mtxx/MTXX' + 'Podfile'
+    podfile = Pod::Podfile.from_file(podfile_path) if podfile_path
+    if podfile
+      upload_podfile_lock(podfile.checksum,true )
+    end
+  rescue => error
+    puts "mbox podfile.lcok文件兼容处理失败,失败原因：#{error}"
+  end
+end
+Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
   require 'cocoapods-meitu-bin/native'
   require 'cocoapods-meitu-bin/helpers/buildAll/bin_helper'
 
   Pod::UI.puts "当前configuration: `#{ENV['configuration'] || Pod::Config.instance.podfile.configuration}`".green
-
+  # checksum = Pod::Config.instance.podfile.checksum
+  # puts Pod::Config.instance
+  # installer =  Installer.new(config.sandbox, config.podfile, config.lockfile)
+  # puts checksum
+  get_podfile_lock
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new($ARGV)).run
 
@@ -23,6 +126,7 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context, _|
                   $ARGV[1] != 'archive'
       _context.podfile.set_use_source_pods d.name
     end
+
   end
 
   # 同步 BinPodfile 文件
@@ -43,6 +147,16 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context, _|
   end
 end
 
+# 注册 pod install 钩子
+Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
+  # p "hello world!  post_install"
+  upload_podfile_lock(Pod::Config.instance.podfile.checksum)
+  #判断是否在 mbox 工作目录执行pod install
+  if system("mbox status > /dev/null 2>&1")
+    upload_mbox_podfile_lock
+  end
+end
+
 Pod::HooksManager.register('cocoapods-meitu-bin', :source_provider) do |context, _|
   sources_manager = Pod::Config.instance.sources_manager
   podfile = Pod::Config.instance.podfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: cocoapods-meitu-bin is a plugin which helps develpers switching pods between