cocoapods-meitu-bin 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10fbbb2a4ad0c86bbae1e71d4c93482c4c41f3f09fb58b57dcf3f2f3a76d8907
-  data.tar.gz: fa321bbb4812aa3b48ea7b476df5d16554015d7c0d34b32e71cdcce24590ed79
+  metadata.gz: bf922746db89582b7329cf9c703a49ea506e2d1384507e7752587d3b9de4123b
+  data.tar.gz: ebdb54496afee8b0e0e57bf6e31358b743e204a895c2d0c45fead0813ac0c102
 SHA512:
-  metadata.gz: 41081d2f10314f7d6133608c9caae31a6aab43546199d5ec8759fa56e1f3acddd5068e616344d5543f7215258e5fb0c7907a87eee73dd873f19ce563f64cde6a
-  data.tar.gz: d875fa4ca53418bb58477892185cf4dcd4c4f6d7189b96aed8369dfb6b8177a6a6664e85768b1a831072fcc11e428c814ba9bb51352fc74cc6a648d49bb9b08d
+  metadata.gz: ab9245d4c070947805daae07dc13c7376e104ffe405aaa2dbaaaa84a1970cdb90262b0219a518e309c96df2f9ca94ec0d708fc227f1fc1dd7c8bed438bad22eb
+  data.tar.gz: e98017a256e5c3e56e27054019654bc12b3b45c4e21d18d1274d7333132fe7cd332c857d1048406a632a3cdaeacb822e20918d41450575c2b953350898f8d0d2

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

@@ -153,35 +153,17 @@ module Pod
 
         # 获取 podfile
         def podfile
-          @podfile ||= begin
-                         podfile_path = File.join(Pathname.pwd, 'Podfile')
-                         raise Informative, 'Podfile不存在' unless File.exist?(podfile_path)
-                         sources_manager = Pod::Config.instance.sources_manager
-                         podfile = Podfile.from_file(Pathname.new(podfile_path))
-                         podfile_hash = podfile.to_hash
-                         podfile_hash['sources'] = (podfile_hash['sources'] || []).concat(sources_manager.code_source_list.map(&:url))
-                         podfile_hash['sources'] << sources_manager.binary_source.url
-                         podfile_hash['sources'].uniq!
-                         Podfile.from_hash(podfile_hash)
-                       end
+          @podfile ||=  Pod::Config.instance.podfile
         end
 
         # 获取 podfile.lock
         def lockfile
-          @lockfile ||= begin
-                          lock_path = File.join(Pathname.pwd, 'Podfile.lock')
-                          raise Informative, 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
-                          Lockfile.from_file(Pathname.new(lock_path))
-                        end
+          @lockfile ||= Pod::Config.instance.lockfile
         end
 
         # 获取 sandbox
         def sandbox
-          @sandbox ||= begin
-                         sandbox_path = File.join(Pathname.pwd, 'Pods')
-                         raise Informative, 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
-                         Pod::Sandbox.new(sandbox_path)
-                       end
+          @sandbox ||=  Pod::Config.instance.sandbox
         end
 
         # 根据podfile和podfile.lock分析依赖

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

@@ -17,12 +17,14 @@ module Pod
 
         def self.options
           [
-            %w[--error-source 过滤异常的source，比如http的，CI打包只支持SSH认证]
+            %w[--error-source 过滤异常的source，比如http的，CI打包只支持SSH认证],
+            %w[--export-file 导出当前所有tag版本的podspec]
           ].concat(super).uniq
         end
 
         def initialize(argv)
           @error_source = argv.flag?('error-source', false)
+          @export_file = argv.flag?('export-file', false)
           super
         end
 
@@ -33,8 +35,26 @@ module Pod
           repo_update
           # 分析依赖
           @analyze_result = analyse
-          # 打印source
-          show_cost_source
+
+          if  @error_source
+            # 打印source
+            show_cost_source
+          end
+
+          if  @export_file
+            pod_targets = @analyze_result.pod_targets.uniq
+            pod_targets.map { |pod_target|
+              current_path = Dir.pwd
+              spec_path = "#{current_path}/podfile_shell/#{pod_target.root_spec.name}/#{pod_target.root_spec.version.version}/"
+              `mkdir -p  #{spec_path}`
+              if system("cp #{pod_target.root_spec.defined_in_file.to_s}  #{spec_path} > /dev/null 2>&1")
+                puts "#{pod_target.root_spec.name} 的 #{pod_target.root_spec.version.version} 已经导出"
+              else
+                `rm -rf #{current_path}/podfile_shell/#{pod_target.root_spec.name} > /dev/null 2>&1`
+              end
+              # puts pod_target.root_spec.name pod_target.root_spec.version.version pod_target.root_spec.defined_in_file
+            }
+          end
           # 计算耗时
           show_cost_time
         end

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end
 
 module Pod

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

@@ -15,7 +15,7 @@ def get_podfile_lock
     #获取 PODFILE CHECKSUM 用来判断服务端是否存在该podfile.lock
     checksum = get_checksum(Pod::Config.instance.podfile_path)
     PodUpdateConfig.set_checksum(checksum)
-    #目前只支持MTXX target "MTXX" 项目 #想要支持其他项目可以添加对应 target "xxx"
+    #目前只支持MTXX target "MTXX" 项目 想要支持其他项目可以添加对应 target "xxx"
     content = File.read(Pod::Config.instance.podfile_path)
     if content
       if content.include?("target \"MTXX\"")
@@ -38,13 +38,13 @@ def get_podfile_lock
     end
     # podfile.lock文件下载和使用逻辑
     if is_load_podfile_lock
-      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
@@ -201,14 +201,17 @@ 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
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new($ARGV)).run
-
-  get_podfile_lock
+  content = File.read(Pod::Config.instance.podfile_path)
+  if content
+    if content.include?("target \"MTXX\"")
+      PodUpdateConfig.set_is_mtxx(true)
+    else
+      PodUpdateConfig.set_is_mtxx(false)
+    end
+  end
+  # get_podfile_lock
 
   # 有插件/本地库 且是dev环境下，默认进入源码白名单  过滤 archive命令
   if _context.podfile.plugins.keys.include?('cocoapods-meitu-bin') && _context.podfile.configuration_env == 'dev'
@@ -242,17 +245,17 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
   PodUpdateConfig.set_prepare_time(Time.now - start_time)
 end
 
-# 注册 pod install 钩子
-Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
-  #基于podfile的checksum上报云端podfile.lock文件
-  if PodUpdateConfig.is_mtxx
-    if PodUpdateConfig.checksum
-      upload_podfile_lock(PodUpdateConfig.checksum)
-    end
-    upload_branch_podfile_lock
-  end
-
-end
+# # 注册 pod install 钩子
+# Pod::HooksManager.register('cocoapods-meitu-bin', :post_install) do |context|
+#   #基于podfile的checksum上报云端podfile.lock文件
+#   if PodUpdateConfig.is_mtxx
+#     if PodUpdateConfig.checksum
+#       upload_podfile_lock(PodUpdateConfig.checksum)
+#     end
+#     upload_branch_podfile_lock
+#   end
+#
+# end
 
 Pod::HooksManager.register('cocoapods-meitu-bin', :source_provider) do |context, _|
   sources_manager = Pod::Config.instance.sources_manager

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement