cocoapods-meitu-bin 1.2.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb5a3689a2c0965a08d686c8b9065f4b15e59fc7949eb124aa467a192268f97
-  data.tar.gz: 1ae316557c112e0e7352d459d09b233e2f9ad1f85563ea45005194ffaa157705
+  metadata.gz: d27332c19899d2616ca39da9eb2d13d98184216975d6f1408bdb162856bcc24a
+  data.tar.gz: eee1c74f1fa28b591eb67f7bddeab453c070ace04fccc336cb9ada5935b11364
 SHA512:
-  metadata.gz: 7db6ab9850a98c37bc3f94eb9d95f0f1d4b5212f1ee8fd46f6e70805272fd4e920c6637f3ea132cabce9445bfd1834951a629cb8f6ca614b1d3671670738ae19
-  data.tar.gz: 7037358e37bba3f04a1b07ef63890f133b53e4895cb4951d2880a06ba31b3bde35dad5d304489b5e91dff4589f07ec65a767fe1786a390e3fee016f2f9640e9e
+  metadata.gz: a33d6edea1cc51c1a0a17717235e2ee102d7d2ca207d3c1560b3c3ea11082b01c545f9152c8e7e06f1d5ee52381049447418fad9fc290d94044fa3ced8cb090e
+  data.tar.gz: db8b46477b4cc6c4533c28f0130f623650f48cf6bb88b56f1e0c0aedd0c5d4216fc09de5ba4456c97121d00ed7f3a29f1327d757d4710370e784fa77ce91d520

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

@@ -5,6 +5,7 @@ require 'cocoapods-meitu-bin/helpers/buildAll/bin_helper'
 require 'cocoapods-meitu-bin/config/config'
 require 'yaml'
 require 'digest'
+# require 'concurrent'
 
 module Pod
   class Command
@@ -28,6 +29,7 @@ module Pod
         def self.options
           [
             %w[--clean 全部二进制包制作完成后删除编译临时目录],
+            %w[--shell-project 是否依赖壳工程编译产物一次编译生成所有组件的编译产物],
             %w[--clean-single 每制作完一个二进制包就删除该编译临时目录],
             %w[--repo-update 更新Podfile中指定的repo仓库],
             %w[--full-build 是否全量打包],
@@ -40,6 +42,7 @@ module Pod
           @pods = argv.shift_argument
           @clean = argv.flag?('clean', false)
           @clean_single = argv.flag?('clean-single', false)
+          @shell_project = argv.flag?('shell-project', false)
           @repo_update = argv.flag?('repo-update', false)
           @full_build = argv.flag?('full-build', false)
           @skip_simulator = argv.flag?('skip-simulator', false)
@@ -70,7 +73,11 @@ module Pod
           # 删除编译产物
           clean_build_pods
           # 编译所有pod_targets
-          results = build_pod_targets
+          #根据@shell_project 判断是执行 build_shell_project_pod_targets 还是 build_pod_targets
+          if @shell_project
+            PodUpdateConfig.set_shell_project
+          end
+          results = @shell_project ? build_shell_project_pod_targets : build_pod_targets
           # 执行post_build命令
           post_build(results)
           # 删除编译产物
@@ -292,6 +299,129 @@ module Pod
             results
           end
         end
+        # 基于壳工程编译产物进行个组件的zip压缩 上传和对应二进制podspec生成上传
+        def build_shell_project_pod_targets
+          UI.title "Build all pod targets(#{@full_build ? '全量打包' : '非全量打包'})".green do
+            pod_targets = @analyze_result.pod_targets.uniq
+            success_pods = []
+            fail_pods = []
+            local_pods = []
+            external_pods = []
+            binary_pods = []
+            created_pods = []
+            # # 指定线程池的大小（例如，这里创建一个拥有 16 个线程的池）
+            # pool = Concurrent::ThreadPoolExecutor.new(max_threads: 16)
+            # # 创建一个互斥锁
+            # mutex = Mutex.new
+            pod_targets.map do |pod_target|
+              begin
+                version = @version_helper.version(pod_target.pod_name, pod_target.root_spec.version.to_s, @analyze_result.specifications, @configuration, podfile.include_dependencies?)
+                # 黑名单（不分全量和非全量）
+                next if skip_build?(pod_target)
+                # 白名单（有白名单，只看白名单，不分全量和非全量）
+                next if !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
+                # 本地库
+                if @sandbox.local?(pod_target.pod_name)
+                  local_pods << pod_target.pod_name
+                  show_skip_tip("#{pod_target.pod_name} 是本地库")
+                  next
+                end
+                # 外部源（如 git）
+                if @sandbox.checkout_sources[pod_target.pod_name]
+                  external_pods << pod_target.pod_name
+                  show_skip_tip("#{pod_target.pod_name} 以external方式引入")
+                  next
+                end
+                # 无源码
+                if !@sandbox.local?(pod_target.pod_name) && !pod_target.should_build?
+                  binary_pods << pod_target.pod_name
+                  show_skip_tip("#{pod_target.pod_name} 无需编译")
+                  next
+                end
+                # 非全量编译、不在白名单中且已经有相应的二进制版本
+                if has_created_binary?(pod_target.pod_name, version)
+                  created_pods << pod_target.pod_name
+                  show_skip_tip("#{pod_target.pod_name}(#{version}) 已经有二进制版本了")
+                  next
+                end
+                # # 提交一个任务给线程池
+                # pool.post do
+                #   # 在这里执行你的任务逻辑
+                #   # 构建产物
+                #   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
+                #   builder.create_binary
+                #   # 压缩并上传zip
+                #   zip_helper = ZipFileHelper.new(pod_target, version, builder.product_dir, builder.build_as_framework?, @configuration)
+                #   result = zip_helper.zip_lib
+                #   mutex.synchronize do
+                #     # 在互斥锁的保护下，安全地修改共享资源
+                #     fail_pods << pod_target.pod_name unless result
+                #   end
+                #   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
+                #   mutex.synchronize do
+                #     # 在互斥锁的保护下，安全地修改共享资源
+                #     success_pods << pod_target.pod_name if result
+                #   end
+                # 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
+                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
+                # 生成二进制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
+              rescue Pod::StandardError => e
+                UI.info "`#{pod_target}`失败，原因：#{e}".red
+                fail_pods << pod_target.pod_name
+                next
+              end
+            end
+            # 关闭线程池，等待所有任务完成
+            # pool.shutdown
+            # pool.wait_for_termination
+            results = {
+              'Total' => pod_targets,
+              'Success' => success_pods,
+              'Fail' => fail_pods,
+              'Local' => local_pods,
+              'External' => external_pods,
+              'No Source File' => binary_pods,
+              'Created Binary' => created_pods,
+              'Black List' => @black_list || [],
+              'Write List' => @write_list || []
+            }
+
+            show_results(results)
+            results
+          end
+        end
 
         def show_skip_tip(title)
           UI.info title.yellow

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

@@ -156,7 +156,16 @@ class PodUpdateConfig
   @@checksum = nil
   @@large_pod_hash = {}
   @@is_mtxx = false
+  @@is_clear = false
+  @@shell_project = false
 
+
+  def self.set_shell_project
+    @@shell_project = true
+  end
+  def self.shell_project
+    @@shell_project
+  end
   def self.add_value(value)
     @@pods << value
   end
@@ -205,5 +214,9 @@ class PodUpdateConfig
   def self.clear
     @@pods = []
     @@lockfile = nil
+    @@is_clear = true
+  end
+  def self.is_clear
+    @@is_clear
   end
 end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "1.2.3"
+  VERSION = "1.3.1"
 end
 
 module Pod

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

@@ -1,3 +1,4 @@
+require 'cocoapods-meitu-bin/config/config'
 
 module CBin
   module BuildAll
@@ -11,6 +12,9 @@ module CBin
         @configuration = configuration
         @file_accessors = pod_target.file_accessors unless pod_target.nil?
         @base_dir = "#{Pathname.pwd}/build_pods"
+        if PodUpdateConfig.shell_project
+          @base_dir = "#{Pathname.pwd}/all_build/Build"
+        end
       end
 
       # 构建
@@ -92,7 +96,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

@@ -1,4 +1,4 @@
-
+require 'cocoapods-meitu-bin/config/config'
 module CBin
   module BuildAll
     class PodspecUtil
@@ -48,11 +48,10 @@ 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 = PodUpdateConfig.shell_project ? "#{Pathname.pwd}/all_build/Build/Products/podspec" : "#{Pathname.pwd}/build_pods/#{@pod_target}/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)
-
         File.open(file, "w+") do |f|
           f.write(spec.to_pretty_json)
         end

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

@@ -47,6 +47,9 @@ module Pod
       if PodUpdateConfig.lockfile
         self.instance_variable_set("@lockfile",PodUpdateConfig.lockfile)
       end
+      if PodUpdateConfig.is_clear
+        self.instance_variable_set("@lockfile",PodUpdateConfig.lockfile)
+      end
 
       plugin_sources = run_source_provider_hooks
       analyzer = create_analyzer(plugin_sources)

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

@@ -132,7 +132,7 @@ module Pod
 
         start_time = Time.now
         @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
-        UI.puts "Molinillo resolve耗时:#{'%.1f' % (Time.now - start_time)}s".green
+        UI.puts "pod_time_profiler: Molinillo resolve耗时:#{'%.1f' % (Time.now - start_time)}s".green
         resolver_specs_by_target
       rescue Molinillo::ResolverError => e
         handle_resolver_error(e)

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

@@ -12,7 +12,10 @@ def get_podfile_lock
   begin
     # 默认是获取要获取服务端podfile.lock文件
     is_load_podfile_lock = true
-    #目前只支持MTXX target "MTXX" 项目 #想要支持其他项目可以添加对应 target "xxx"
+    #获取 PODFILE CHECKSUM 用来判断服务端是否存在该podfile.lock
+    checksum = get_checksum(Pod::Config.instance.podfile_path)
+    PodUpdateConfig.set_checksum(checksum)
+    #目前只支持MTXX target "MTXX" 项目 想要支持其他项目可以添加对应 target "xxx"
     content = File.read(Pod::Config.instance.podfile_path)
     if content
       if content.include?("target \"MTXX\"")
@@ -35,16 +38,13 @@ def get_podfile_lock
     end
     # podfile.lock文件下载和使用逻辑
     if is_load_podfile_lock
-      #获取 PODFILE CHECKSUM 用来判断服务端是否存在该podfile.lock
-      checksum = get_checksum(Pod::Config.instance.podfile_path)
-      PodUpdateConfig.set_checksum(checksum)
-      Pod::UI.puts "当前podfile文件的checksum:#{checksum}".green
+      Pod::UI.puts "pod_time_profiler: 当前podfile文件的checksum:#{checksum}".green
       # zip下载地址
       curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.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")
-        Pod::UI.puts "匹配到精准podfile.lock文件，使用当前podfile文件的checksum:#{checksum}获取对应的podfile.lock文件".green
+        Pod::UI.puts "pod_time_profiler: 匹配到精准podfile.lock文件，使用当前podfile文件的checksum:#{checksum}获取对应的podfile.lock文件".green
         is_load_podfile_lock = true
       end
 
@@ -52,27 +52,27 @@ def get_podfile_lock
         branch_value = get_branch_name
         curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{branch_value}/podfile.lock.zip"
         if system("curl -o /dev/null -s -w %{http_code} #{curl} | grep 200  > /dev/null 2>&1")
-          Pod::UI.puts "无法匹配到精准podfile.lock文件，使用当前分支：#{branch_value} 对应的podfile.lock文件".green
+          Pod::UI.puts "pod_time_profiler: 无法匹配到精准podfile.lock文件，使用当前分支：#{branch_value} 对应的podfile.lock文件".green
           is_load_podfile_lock = true
         end
         #兜底使用develop的podfile.lock
         if !is_load_podfile_lock
-          Pod::UI.puts "服务端不存在该podfile.lock文件，使用develop分支的podfile.lock文件兜底".green
+          Pod::UI.puts "pod_time_profiler: 服务端不存在该podfile.lock文件，使用develop分支的podfile.lock文件兜底".green
           curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/develop/podfile.lock.zip"
           is_load_podfile_lock = true
         end
       end
       # 判断是否需要下载podfile.lock文件
       if is_load_podfile_lock
-        Pod::UI.puts "获取服务端存储的podfile.lcok文件".green
+        Pod::UI.puts "pod_time_profiler: 获取服务端存储的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
+          Pod::UI.puts "pod_time_profiler: 下载并解压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
+          Pod::UI.puts "pod_time_profiler: 提前根据checksum命中podfile.lcok进行依赖分析".green
           analyzer = Pod::Installer::Analyzer.new(
             Pod::Config.instance.sandbox,
             Pod::Config.instance.podfile,
@@ -89,13 +89,13 @@ def get_podfile_lock
             end
           end
         else
-          puts "获取podfile.lcok文件失败"
+          puts "pod_time_profiler:  获取podfile.lcok文件失败"
           `rm -rf podfile.lock.zip`
         end
       end
     end
   rescue => error
-    puts "podfile.lcok相关处理发生异常，报错原因：#{error}"
+    puts "pod_time_profiler: podfile.lcok相关处理发生异常，报错原因：#{error}"
     PodUpdateConfig.clear
     `rm -rf podfile.lock.zip`
     `rm -rf podfile.lock`
@@ -109,20 +109,20 @@ def upload_podfile_lock(checksum,upload = false)
     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 "根据checksum:#{checksum}上报podfile.lcok文件到服务端".green
+      Pod::UI.puts "pod_time_profiler:  根据checksum:#{checksum}上报podfile.lcok文件到服务端".green
       if upload
-        puts "mbox工作目录/mtxx/MTXX/podfile 对应的checksum = #{checksum}"
+        puts "pod_time_profiler:  mbox工作目录/mtxx/MTXX/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
+        Pod::UI.puts "pod_time_profiler:  上报podfile.lcok文件到服务端成功".green
         `rm -rf podfile.lock.zip`
       else
-        Pod::UI.puts "上报podfile.lcok文件到服务端失败".red
+        Pod::UI.puts "pod_time_profiler: 上报podfile.lcok文件到服务端失败".red
         `rm -rf podfile.lock.zip`
       end
     end
   rescue => error
-     puts "上传podfile.lcok文件失败，失败原因：#{error}"
+     puts "pod_time_profiler: 上传podfile.lcok文件失败，失败原因：#{error}"
     `rm -rf podfile.zip`
   end
 end
@@ -134,7 +134,7 @@ def upload_mbox_podfile_lock
       upload_podfile_lock(checksum,true )
     end
   rescue => error
-    puts "mbox podfile.lcok文件兼容处理失败,失败原因：#{error}"
+    puts "pod_time_profiler: mbox podfile.lcok文件兼容处理失败,失败原因：#{error}"
   end
 end
 def upload_branch_podfile_lock
@@ -142,10 +142,10 @@ def upload_branch_podfile_lock
     branch_value = get_branch_name
     if branch_value && branch_value.is_a?(String) && branch_value.length > 0
       if system("zip  podfile.lock.zip Podfile.lock > /dev/null 2>&1") && system("curl -F \"name=MTXX\" -F \"version=#{branch_value}\" -F \"file=@#{Pathname.pwd}/podfile.lock.zip\" http://nezha.community.cloud.meitu.com/file/upload.json > /dev/null 2>&1")
-        Pod::UI.puts "根据开发分支名：#{branch_value}上报podfile.lcok文件到服务端成功".green
+        Pod::UI.puts "pod_time_profiler: 根据开发分支名：#{branch_value}上报podfile.lcok文件到服务端成功".green
         `rm -rf podfile.lock.zip`
       else
-        Pod::UI.puts "根据开发分支名：#{branch_value}上报podfile.lcok文件到服务端失败".red
+        Pod::UI.puts "pod_time_profiler: 根据开发分支名：#{branch_value}上报podfile.lcok文件到服务端失败".red
         `rm -rf podfile.lock.zip`
       end
     end

metadata

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