cocoapods-meitu-bin 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d08ad747354eed564ac808dd84af6cf490739ff1567740fd4f99b636806226
-  data.tar.gz: 17b14b936e21584f557b8a00d142c14bc0adaff059153595d22e9883bf1d2a9c
+  metadata.gz: 10fbbb2a4ad0c86bbae1e71d4c93482c4c41f3f09fb58b57dcf3f2f3a76d8907
+  data.tar.gz: fa321bbb4812aa3b48ea7b476df5d16554015d7c0d34b32e71cdcce24590ed79
 SHA512:
-  metadata.gz: 2f34ef08407db4f94389575c817b67bafaa5fe64666e8ee78af4c22c27957d71f34a182653a0a7254bc1193aebefd444129c87b189329f12e6ac938a8f9d1ce5
-  data.tar.gz: 926be1cd89841e7d649f8ccb61fc109ffe84d398fae226973d9550c1fe41824613fcd47d676a27780056869a5a305f6b1569375510605f9ba1ddbb8b33e830c0
+  metadata.gz: 41081d2f10314f7d6133608c9caae31a6aab43546199d5ec8759fa56e1f3acddd5068e616344d5543f7215258e5fb0c7907a87eee73dd873f19ce563f64cde6a
+  data.tar.gz: d875fa4ca53418bb58477892185cf4dcd4c4f6d7189b96aed8369dfb6b8177a6a6664e85768b1a831072fcc11e428c814ba9bb51352fc74cc6a648d49bb9b08d

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)
           # 删除编译产物
@@ -250,25 +257,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
@@ -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.2"
+  VERSION = "1.3.0"
 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
@@ -10,7 +11,10 @@ module CBin
         @skip_simulator = skip_simulator
         @configuration = configuration
         @file_accessors = pod_target.file_accessors unless pod_target.nil?
-        @base_dir = "#{Pathname.pwd}/all_build/Build"
+        @base_dir = "#{Pathname.pwd}/build_pods"
+        if PodUpdateConfig.shell_project
+          @base_dir = "#{Pathname.pwd}/all_build/Build"
+        end
       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}/all_build/Build/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/source_provider_hook.rb

@@ -12,6 +12,9 @@ def get_podfile_lock
   begin
     # 默认是获取要获取服务端podfile.lock文件
     is_load_podfile_lock = true
+    #获取 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
@@ -35,9 +38,6 @@ 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
       # zip下载地址
       curl = "https://xiuxiu-dl-meitu-com.obs.cn-north-4.myhuaweicloud.com/ios/binary/MTXX/#{checksum}/podfile.lock.zip"

metadata

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