cocoapods-meitu-bin 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf922746db89582b7329cf9c703a49ea506e2d1384507e7752587d3b9de4123b
-  data.tar.gz: ebdb54496afee8b0e0e57bf6e31358b743e204a895c2d0c45fead0813ac0c102
+  metadata.gz: d866fcda4827c97d86810fa175e8f2e94ba8b9b7cb5fddba738168a39de9e209
+  data.tar.gz: 1ba573957dfc51fa2cc2b4f42ab483864b78d4f57c59280be20d31b758950d9a
 SHA512:
-  metadata.gz: ab9245d4c070947805daae07dc13c7376e104ffe405aaa2dbaaaa84a1970cdb90262b0219a518e309c96df2f9ca94ec0d708fc227f1fc1dd7c8bed438bad22eb
-  data.tar.gz: e98017a256e5c3e56e27054019654bc12b3b45c4e21d18d1274d7333132fe7cd332c857d1048406a632a3cdaeacb822e20918d41450575c2b953350898f8d0d2
+  metadata.gz: 828c4415a0cb11b9d920a804e59285e1b41d215d96804917e641e8c0438165c565c519ea715bbccc4381aaf1a90c63067166bc9777548f954cd7c00116270866
+  data.tar.gz: 1ad302d1311dca387411bd59ba4333a17ffcd81f59bed55059dfee8d70b9f74d53679394fe94696c7fd9b30261ac9b03a98bdf6fcffe5e31eb031135d16b7f47

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

@@ -118,35 +118,17 @@ module Pod
 
         # 获取 podfile
         def podfile
-          @podfile ||= begin
-                         podfile_path = File.join(Pathname.pwd, 'Podfile')
-                         raise '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 '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 '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.rb

@@ -15,7 +15,8 @@ require 'cocoapods-meitu-bin/command/bin/lock'
 require 'cocoapods-meitu-bin/command/bin/source'
 require 'cocoapods-meitu-bin/helpers'
 require 'cocoapods-meitu-bin/helpers/framework_builder'
-
+require 'cocoapods-meitu-bin/native/clean'
+require 'cocoapods-meitu-bin/native/verify'
 module Pod
   class Command
     # This is an example of a cocoapods plugin adding a top-level subcommand

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

@@ -12,6 +12,9 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
+          'minimum_deployment_target' => { description: '最低部署目标，参与二进制版本生成', default: 'iOS12.0'},
+          'bundle_identifier' => { description: '捆绑标识符，参与二进制版本生成', default: 'com.xxx.www' },
+          'random_value' => { description: '随机值，参与二进制版本生成', default: 'a1b2c3d4f5' },
           'binary_repo_url' => { description: '二进制podspec私有源地址', default: 'git@github.com:Zhangyanshen/example-private-spec-bin.git' },
           'binary_upload_url' => { description: '二进制文件上传地址', default: 'http://localhost:8080/frameworks' },
           'binary_download_url' => { description: '二进制文件下载地址，后面会依次传入Xcode版本、configuration、组件名称与组件版本', default: 'http://localhost:8080/frameworks' },
@@ -56,6 +59,8 @@ module CBin
       CBin.config.binary_download_url
     end
 
+
+
     def set_configuration_env(env)
       @configuration_env = env
     end
@@ -158,8 +163,34 @@ class PodUpdateConfig
   @@is_mtxx = false
   @@is_clear = false
   @@shell_project = false
-
-
+  @@external_source_commit = {}
+
+
+
+  def self.set_external_source_commit
+    podfile_obj = Pod::Config.instance.podfile
+    # 遍历 Podfile 中的目标定义
+    podfile_obj.target_definitions.each do |target_name, target_definition|
+      target_definition.dependencies.each do |dependency|
+        if dependency.external_source
+          # if dependency.name == "MTBusinessBaseKit"
+          #   puts dependency.external_source
+          # end
+          if dependency.external_source[:commit]
+            git_commit = dependency.external_source[:commit]
+            # puts "Git Commit for #{dependency}: #{git_commit}"
+            if @@external_source_commit[dependency.name].nil?
+              @@external_source_commit[dependency.name] = git_commit
+            end
+          end
+        end
+      end
+    end
+    puts "#{@@external_source_commit}" if ENV['p_bin_d'] == '1'
+  end
+  def self.external_source_commit
+    @@external_source_commit
+  end
   def self.set_shell_project
     @@shell_project = true
   end

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

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

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

@@ -1,5 +1,5 @@
 require 'digest'
-
+require 'cocoapods-meitu-bin/config/config'
 module CBin
   module BuildAll
     class BinHelper
@@ -20,7 +20,14 @@ module CBin
           # puts "#{pod_name}:#{include_dependencies}"
           if include_dependencies
             specs << dependencies_str(pod_name, specifications)
+          else
+            if !ENV['MEITU_USE_OPEN_COMMIT']
+              specs << dependencies_commit_str(pod_name, specifications)
+            end
           end
+          specs <<  minimum_deployment_target_str
+          specs <<  bundle_identifier_str
+          specs <<  random_value_str
           specs << xcode_version
           specs << (configuration.nil? ? 'Debug' : configuration)
           specs_str = specs.join('')
@@ -35,6 +42,20 @@ module CBin
         "#{original_version}.bin#{specs_str_md5}"
       end
 
+      #最低部署目标，参与二进制版本生成
+      def minimum_deployment_target_str
+        CBin.config.minimum_deployment_target
+      end
+
+      # 捆绑标识符，参与二进制版本生成
+      def bundle_identifier_str
+        CBin.config.bundle_identifier
+      end
+      # 随机值，参与二进制版本生成
+      def random_value_str
+        CBin.config.random_value
+      end
+
       def xcode_version
         @xcode_version ||= begin
                              `xcodebuild -version`.split(' ').join('')
@@ -49,11 +70,13 @@ module CBin
       # 将当前 Pod 库的依赖库拼接成字符串（格式：pod1_name(pod1_version),pod2_name(pod2_version),...）
       def dependencies_str(pod_name, specifications)
         deps = []
+
         specifications.map do |spec|
           if spec.root.name == pod_name
             deps.concat(spec.dependencies)
           end
         end
+
         if deps.empty?
           UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_d'] == '1'
           return ''
@@ -64,6 +87,11 @@ module CBin
             next
           end
           version = dep_version(dep, specifications)
+          if !ENV['MEITU_USE_OPEN_COMMIT']
+            if PodUpdateConfig.external_source_commit[dep.name]
+              version = PodUpdateConfig.external_source_commit[dep.name]
+            end
+          end
           result << "#{dep.name}(#{version})"
         end
         if ENV['p_bin_d'] == '1'
@@ -76,6 +104,29 @@ module CBin
         end
         result.join(',')
       end
+      def dependencies_commit_str(pod_name, specifications)
+        deps = []
+        specifications.map do |spec|
+          if spec.root.name == pod_name
+            deps.concat(spec.dependencies)
+          end
+        end
+
+        if deps.empty?
+          UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_d'] == '1'
+          return ''
+        end
+        result = []
+        deps.uniq.map do |dep|
+          if dep.root_name == pod_name
+            next
+          end
+          if PodUpdateConfig.external_source_commit[dep.name]
+            result << "#{dep.name}(#{PodUpdateConfig.external_source_commit[dep.name]})"
+          end
+        end
+        result.join(',')
+      end
 
       # 获取依赖库版本号
       def dep_version(dep, specifications)

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

@@ -0,0 +1,95 @@
+require 'cocoapods/downloader'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Clean < Bin
+        # self.abstract_command = true
+        self.summary = '删除二进制组件版本pod缓存'
+        self.description = <<-DESC
+          #{summary}，--all 移除全部二进制版本缓存
+        DESC
+
+        def self.options
+          [
+            %w[--all 移除全部二进制版本缓存],
+            # %w[--no-need 移除除了当前需要的版本外的其他版本二进制版本缓存]
+          ].concat(super).uniq
+        end
+
+        def initialize(argv)
+          @all = argv.flag?('all', false)
+          # @no_need = argv.flag?('no-need', false)
+          super
+        end
+
+        def run
+          cache = Downloader::Cache.new(Pod::Config.instance.cache_root + 'Pods')
+          all_del_cache_size=0
+          cache.cache_descriptors_per_pod.each do |pod_name, cache_descriptors|
+              del_cache_descriptors = []
+              del_cache_versions = []
+              current_pod_name_del_cache_size=0
+              cache_descriptors.each do |desc|
+                # version 包含 bin
+                if desc[:version].to_s.include?('bin')
+                  if @all
+                    current_pod_name_del_cache_size += folder_size(desc[:slug])
+                    del_cache_descriptors << desc
+                    del_cache_versions << desc[:version]
+                  end
+                end
+              end
+              all_del_cache_size+=current_pod_name_del_cache_size
+              size = format_size(current_pod_name_del_cache_size)
+              Pod::UI.puts "#{pod_name}删除#{del_cache_versions}共#{size}"
+              remove_caches(del_cache_descriptors)
+          end
+          size = format_size(all_del_cache_size)
+          Pod::UI.puts "共删除#{size}二进制版本pod缓存".red
+        end
+
+        private
+        def remove_caches(cache_descriptors)
+          cache_descriptors.each do |desc|
+            UI.message("Removing spec #{desc[:spec_file]} (v#{desc[:version]})") do
+              FileUtils.rm(desc[:spec_file])
+            end
+            UI.message("Removing cache #{desc[:slug]}") do
+              FileUtils.rm_rf(desc[:slug])
+            end
+          end
+        end
+        def folder_size(path)
+          return 0 unless File.directory?(path)
+
+          total_size = 0
+          Dir.foreach(path) do |entry|
+            next if entry == '.' || entry == '..'
+
+            full_path = File.join(path, entry)
+            if File.file?(full_path)
+              total_size += File.size(full_path)
+            elsif File.directory?(full_path)
+              total_size += folder_size(full_path)
+            end
+          end
+
+          total_size
+        end
+        def format_size(size)
+          units = %w[bytes KB MB GB TB]
+          return '0 bytes' if size.zero?
+
+          exp = (Math.log(size) / Math.log(1024)).to_i
+          exp = units.size - 1 if exp > units.size - 1
+          format('%.2f %s', size / (1024 ** exp).to_f, units[exp])
+        end
+        def clean_all_binary
+          # Your method implementation here
+
+        end
+      end
+    end
+  end
+end

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

@@ -133,6 +133,8 @@ module Pod
         start_time = Time.now
         @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
         UI.puts "pod_time_profiler: Molinillo resolve耗时:#{'%.1f' % (Time.now - start_time)}s".green
+        #记录podfile 中commit 使用的组件map，提供后面二进制版本生成使用
+        PodUpdateConfig.set_external_source_commit
         resolver_specs_by_target
       rescue Molinillo::ResolverError => e
         handle_resolver_error(e)

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

@@ -0,0 +1,107 @@
+# 用于效验podfile相关准确性
+module Pod
+  class Command
+    class Bin < Command
+      class Verify < Bin
+        # self.abstract_command = true
+        self.summary = '效验podfile相关准确性'
+        self.description = <<-DESC
+          #{summary}，效验podfile相关准确性
+        DESC
+
+        def self.options
+          [
+            %w[--verify-podfile podfile是否正确且相关依赖正常],
+            %w[--verify-podfile-branch 效验podfile是否包含:branch=>'xxx'语法],
+          ].concat(super).uniq
+        end
+
+        def initialize(argv)
+          @verify_podfile = argv.flag?('verify-podfile', false)
+          @verify_podfile_branch = argv.flag?('verify-podfile-branch', false)
+          super
+        end
+
+        def run
+          # Pod::UI.puts "共删除#{size}二进制版本pod缓存".red
+
+          if @verify_podfile
+            analyzing_dependencies
+          end
+          if @verify_podfile_branch
+            verify_podfile_branch
+          end
+        end
+
+        private
+        def verify_podfile
+          begin
+             podfile
+          rescue Pod::DSLError => error
+            info ="podfile文件效验失败：#{error}"
+            raise Pod::DSLError.new(info, path, error, contents)
+          end
+          begin
+            analyzing_dependencies
+          rescue Pod::DSLError => error
+            # puts "podfile依赖分析失败：#{error}"
+            info = "podfile依赖分析失败：#{error}"
+            raise Pod::DSLError.new(info, path, error, contents)
+          end
+        end
+        def verify_podfile_branch
+          begin
+            podfile
+          rescue Pod::DSLError => error
+            info = "podfile文件效验失败：#{error.message}"
+            raise Pod::DSLError.new(info, path, error, contents)
+          end
+          podfile_obj = podfile
+          branch_list = []
+          podfile_obj.target_definitions.each do |target_name, target_definition|
+            target_definition.dependencies.each do |dependency|
+              if dependency.external_source
+                if dependency.external_source[:branch]
+                  branch = dependency.external_source[:branch]
+                  branch_list << "#{dependency.name}:#{branch}"
+                end
+              end
+            end
+          end
+          if branch_list.count > 0
+            Pod::UI.puts "podfile包含以下branch：#{branch_list}".red
+            Pod::UI.puts "请检查podfile是否包含 :branch => 'xxx' 语法".red
+
+            raise Pod::DSLError.new("合入develop分支不能使用branch,podfile包含branch,请检查：#{branch_list}", nil, nil, nil)
+          end
+        end
+        def analyzing_dependencies
+          analyzer = Pod::Installer::Analyzer.new(
+            sandbox,
+            podfile,
+            lockfile
+          )
+          analyzer.update_repositories
+          analyzer.analyze(true)
+        end
+        def podfile
+          @podfile ||=  Pod::Config.instance.podfile
+        end
+
+        # 获取 podfile.lock
+        def lockfile
+          @lockfile ||= Pod::Config.instance.lockfile
+        end
+
+        # 获取 sandbox
+        def sandbox
+          @sandbox ||=  Pod::Config.instance.sandbox
+        end
+        def clean_all_binary
+          # Your method implementation here
+
+        end
+      end
+    end
+  end
+end

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

@@ -203,6 +203,13 @@ Pod::HooksManager.register('cocoapods-meitu-bin', :pre_install) do |_context|
   Pod::UI.puts "当前configuration: `#{ENV['configuration'] || Pod::Config.instance.podfile.configuration}`".green
   # pod bin repo update 更新二进制私有源
   Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new($ARGV)).run
+  #获取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))
+      #brash 指定的组件添加到全局PodUpdateConfig配置中，执行pod install 需要更新的分支最新提交
+      PodUpdateConfig.add_value(dependency.name)
+    end
+  end
   content = File.read(Pod::Config.instance.podfile_path)
   if content
     if content.include?("target \"MTXX\"")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-21 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -143,6 +143,7 @@ files:
 - lib/cocoapods-meitu-bin/native.rb
 - lib/cocoapods-meitu-bin/native/acknowledgements.rb
 - lib/cocoapods-meitu-bin/native/analyzer.rb
+- lib/cocoapods-meitu-bin/native/clean.rb
 - lib/cocoapods-meitu-bin/native/file_accessor.rb
 - lib/cocoapods-meitu-bin/native/gen.rb
 - lib/cocoapods-meitu-bin/native/installation_options.rb
@@ -163,6 +164,7 @@ files:
 - lib/cocoapods-meitu-bin/native/specification.rb
 - lib/cocoapods-meitu-bin/native/target_validator.rb
 - lib/cocoapods-meitu-bin/native/validator.rb
+- lib/cocoapods-meitu-bin/native/verify.rb
 - lib/cocoapods-meitu-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 - spec/command/bin_spec.rb