cocoapods-meitu-bin 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ebf1cf1f2233bcb048f840eb09344b7f580085aa0b30ea8dcecd7826bb5e9a7
-  data.tar.gz: 067b9e8a1d16beb0877e5acdf79b0b903deedea1d602e7654973f7b96fe15dc4
+  metadata.gz: 56df1ca5fc20d16f6cdbc2aaada6d1118af7b0cb95867057da93ef80af119c85
+  data.tar.gz: d0bd9f61753c5131fbb49ab175295b7de30fc88a568827199cda409fa4105ed6
 SHA512:
-  metadata.gz: b2c49f8e4b10995521e874878cde1e85f364d59c3d1d0f2f674dbc66d02b408d3cdd67c58cef3c30fe9d1a4207df025c50752d2c81727689735a9174c443be96
-  data.tar.gz: b92afc764eae7cfa72ec010b92692fc946aa30ca95d1a944fef6f8b0dc8089da2a36972860910b49227607e3b3b8fff9005321faaa65bf659d5649f7f92867a0
+  metadata.gz: 3b9c119faaf7a735b139d8bf84f277d603e035456e9e8bf0c437a331c8ce27c7685e4d7b10181170ec4e44692c01e77e033401673681098f1bd38fad5b8d70bf
+  data.tar.gz: 7eea023f3c6fc7dbf97968fb08d7d8234d3acfb49e989cf722bc57cc851035868da1dda2f066ae56e61c252a82c3501a31322fe09ee13159da19cd463b800d09

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

@@ -155,7 +155,7 @@ class PodUpdateConfig
     @@pods << value
   end
   def self.set_lockfile(path)
-    @@lockfile =  Pod::Lockfile.from_file(path) if path
+    @@lockfile = Pod::Lockfile.from_file(path) if path
   end
   def self.lockfile()
     @@lockfile
@@ -164,4 +164,8 @@ class PodUpdateConfig
   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.2"
+  VERSION = "1.1.3"
 end
 
 module Pod

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

@@ -16,6 +16,7 @@ def get_podfile_lock
     end
     # 判断是否有update参数 时不获取服务端podfile.lock文件
     ARGV.each do |arg|
+      puts "pod 执行 #{arg}"
       if arg == 'update'
         is_load_podfile_lock = false
       end
@@ -28,15 +29,16 @@ def get_podfile_lock
       # 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")
+      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}") && system("unzip -o podfile.lock.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')
+          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,
@@ -58,23 +60,26 @@ def get_podfile_lock
       end
     end
   rescue => error
-    puts error
-    puts "podfile.lcok相关发生异常"
+    puts "podfile.lcok相关处理发生异常，报错原因：#{error}"
+    PodUpdateConfig.clear
     `rm -rf podfile.lock.zip`
     `rm -rf podfile.lock`
   end
 end
 
+
 # 上传podfile.lock文件到服务端
-def upload_podfile_lock
+def upload_podfile_lock(checksum,upload = false)
   begin
-    checksum = Pod::Config.instance.podfile.checksum
     curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.zip"
     # 服务端不存在该podfiel.lock文件才上传，避免频繁上报同一个文件
-    if !system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200")
+    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 checksum
-      if system("zip  podfile.lock.zip Podfile.lock") && system("curl -F \"name=MTXX\" -F \"version=#{checksum}\" -F \"file=@#{Pathname.pwd}/podfile.lock.zip\" http://nezha.community.cloud.meitu.com/file/upload.json")
+      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
@@ -82,13 +87,22 @@ def upload_podfile_lock
         `rm -rf podfile.lock.zip`
       end
     end
-
   rescue => error
-     puts "上传podfile.lcok文件失败".red
+     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'
@@ -99,12 +113,6 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
   # 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
 
@@ -142,8 +150,11 @@ end
 # 注册 pod install 钩子
 Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
   # p "hello world!  post_install"
-  upload_podfile_lock
-
+  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, _|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel