cocoapods-meitu-bin 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56df1ca5fc20d16f6cdbc2aaada6d1118af7b0cb95867057da93ef80af119c85
-  data.tar.gz: d0bd9f61753c5131fbb49ab175295b7de30fc88a568827199cda409fa4105ed6
+  metadata.gz: 466b8b10f18760c5cd7a468a4a4ee860bcec5650fc79be7622f4bd545eac6562
+  data.tar.gz: 140cfcba73e84f74f011a42d7d4e2f2a1c8366c5c74a3529d38da10b2c6b0f98
 SHA512:
-  metadata.gz: 3b9c119faaf7a735b139d8bf84f277d603e035456e9e8bf0c437a331c8ce27c7685e4d7b10181170ec4e44692c01e77e033401673681098f1bd38fad5b8d70bf
-  data.tar.gz: 7eea023f3c6fc7dbf97968fb08d7d8234d3acfb49e989cf722bc57cc851035868da1dda2f066ae56e61c252a82c3501a31322fe09ee13159da19cd463b800d09
+  metadata.gz: f5d00b8d229b43e33cd69997aa29f2856bde47fdd1701fc64ea9e0597bbd49e4758b1bd9b98de2f8fe2cf8d2e32af9e90fb083b2af134acdc5a39bfc440020c6
+  data.tar.gz: 8a0c5673d4ab1c328eba75fa07e9c48920e3d60571dca4214e32323defa762d139c94d298796d32e553eb7772685a485bc2a0df09fdc49f7fd3e6f84563a529c

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

@@ -151,6 +151,8 @@ end
 class PodUpdateConfig
   @@pods = []
   @@lockfile = nil
+  @@repo_update = true
+  @@prepare_time = 0
   def self.add_value(value)
     @@pods << value
   end
@@ -161,6 +163,19 @@ class PodUpdateConfig
     @@lockfile
   end
   # 一个类方法，用于显示数组中的值
+  def self.repo_update
+    @@repo_update
+  end
+  def self.set_repo_update
+    @@repo_update = false
+  end
+  def self.set_prepare_time(time)
+    @@prepare_time = time
+  end
+  def self.prepare_time
+    @@prepare_time
+  end
+
   def self.pods
     @@pods
   end

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

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

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

@@ -348,8 +348,22 @@ ibtool \
         fwks_dir = "#{result_product_dir}/fwks"
         FileUtils.mkdir(fwks_dir) unless File.exist?(fwks_dir)
         fwks.map do |fwk|
-          `rsync -av #{fwk} #{fwks_dir}`
+          new_fwk = get_XCFrameworkIntermediates_path(fwk)
+          if new_fwk && File.exist?(new_fwk)
+            `rsync -av #{new_fwk} #{fwks_dir}`
+          else
+            `rsync -av #{fwk} #{fwks_dir}`
+          end
+        end
+      end
+      def get_XCFrameworkIntermediates_path(path)
+        # 使用正则表达式匹配并提取 AdsFramework
+        match = path.to_s.match(/\/([^\/]+)\.xcframework/)
+        if match
+          framework_path = "#{product_dir}/#{iphoneos}/XCFrameworkIntermediates/#{match[1]}/#{match[1]}.framework"
+          return framework_path
         end
+        return  nil
       end
 
       # 拷贝 framework

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

@@ -27,7 +27,7 @@ module CBin
         # 处理vendored_libraries和vendored_frameworks
         spec['vendored_libraries'] = "#{root_dir}/libs/*.a"
         #兼容.xcframework
-        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework #{root_dir}/fwks/*.xcframework]
+        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework]
         # 处理资源
         resources = %W[#{root_dir}/*.{#{special_resource_exts.join(',')}} #{root_dir}/resources/*]
         spec['resources'] = resources
@@ -66,7 +66,6 @@ module CBin
         repo_name = Pod::Config.instance.sources_manager.binary_source.name
         # repo_name = 'example-private-spec-bin'
         argvs = %W[#{repo_name} #{binary_podsepc_json} --skip-import-validation --use-libraries --allow-warnings --verbose]
-
         begin
           push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
           push.validate!

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

@@ -35,6 +35,7 @@ module Pod
     # 依赖分析
     alias old_resolve_dependencies resolve_dependencies
     def resolve_dependencies
+      start_time = Time.now
       list =  PodUpdateConfig.pods
       # 判断  PodUpdateConfig.pods 是否为空，且数组大于0
       if list && !list.empty?
@@ -43,8 +44,24 @@ module Pod
       if PodUpdateConfig.lockfile
         self.instance_variable_set("@lockfile",PodUpdateConfig.lockfile)
       end
-      start_time = Time.now
-      analyzer = old_resolve_dependencies
+
+      plugin_sources = run_source_provider_hooks
+      analyzer = create_analyzer(plugin_sources)
+
+      UI.section 'Updating local specs repositories' do
+        analyzer.update_repositories
+      end if repo_update? && PodUpdateConfig.repo_update
+
+      UI.section 'Analyzing dependencies' do
+        analyze(analyzer)
+        validate_build_configurations
+      end
+
+      UI.section 'Verifying no changes' do
+        verify_no_podfile_changes!
+        verify_no_lockfile_changes!
+      end if deployment?
+      cost_time_hash['prepare'] = PodUpdateConfig.prepare_time
       cost_time_hash['resolve_dependencies'] = Time.now - start_time
       analyzer
     end

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

@@ -16,7 +16,6 @@ def get_podfile_lock
     end
     # 判断是否有update参数 时不获取服务端podfile.lock文件
     ARGV.each do |arg|
-      puts "pod 执行 #{arg}"
       if arg == 'update'
         is_load_podfile_lock = false
       end
@@ -25,11 +24,23 @@ def get_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文件是否存在 存在下载并解压
+
+      # 判断服务端是否存在该podfile.lock
+      is_load_podfile_lock = false
       if system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200  > /dev/null 2>&1")
+        is_load_podfile_lock = true
+      end
+      branch_value = ENV['branch']
+      if !is_load_podfile_lock && branch_value && branch_value == 'develop'
+        curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/develop/podfile.lock.zip"
+        if system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200  > /dev/null 2>&1")
+          is_load_podfile_lock = true
+        end
+      end
+      # 判断是否需要下载podfile.lock文件
+      if is_load_podfile_lock
         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")
@@ -44,8 +55,9 @@ def get_podfile_lock
             Pod::Config.instance.podfile,
             PodUpdateConfig.lockfile
           )
+          analyzer.update_repositories
+          PodUpdateConfig.set_repo_update
           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))
@@ -103,19 +115,37 @@ def upload_mbox_podfile_lock
     puts "mbox podfile.lcok文件兼容处理失败,失败原因：#{error}"
   end
 end
+def upload_develop_podfile_lock
+  begin
+    branch_value = ENV['branch']
+    if branch_value && branch_value == 'develop'
+      if system("zip  podfile.lock.zip Podfile.lock > /dev/null 2>&1") && system("curl -F \"name=MTXX\" -F \"version=develop\" -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
+
+  end
+end
+
 Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
+  start_time = Time.now
   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
 
+  get_podfile_lock
+
   # 有插件/本地库 且是dev环境下，默认进入源码白名单  过滤 archive命令
   if _context.podfile.plugins.keys.include?('cocoapods-meitu-bin') && _context.podfile.configuration_env == 'dev'
     dependencies = _context.podfile.dependencies
@@ -128,7 +158,7 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
     end
 
   end
-
+  PodUpdateConfig.set_prepare_time(Time.now - start_time)
   # 同步 BinPodfile 文件
   project_root = Pod::Config.instance.project_root
   path = File.join(project_root.to_s, 'BinPodfile')
@@ -145,16 +175,19 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
       raise Pod::DSLError.new(message, path, e, contents)
     end
   end
+  PodUpdateConfig.set_prepare_time(Time.now - start_time)
 end
 
 # 注册 pod install 钩子
 Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
-  # p "hello world!  post_install"
+  #基于podfile的checksum上报云端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
+  #基于 develop 分支，上报podfile.lock文件
+  upload_develop_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.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel