cocoapods-bb-PodAssistant 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97479d53d22f4894ba793463fbb3aa6cc0affdb87959c19640398527e63a1bdd
-  data.tar.gz: e9d2bbe17b2e17c47688c02d5a6cba2e44bef6f500ee8b70fa90e5d27332ee58
+  metadata.gz: db18fa9c11519008cc3187769f5aa81c9a8460b7eff538c9b277f3cefdd443c6
+  data.tar.gz: 28d2897172a135d0a74ddeddf4e9cfc9782f3a956b06c1aa546e18240695d2bf
 SHA512:
-  metadata.gz: ad79dceeb9b07d81250ff78dda40620203c4ad74b40e3596d6544beb4a6ffad7d6d2b61a2fad0aaacf66a317438662992e6580ec62f9fc0a49cceb2d677fb5db
-  data.tar.gz: e0a2bf40bd535d3ab06edba17a6b49a7b5e8dbff2df1b5563d59b8cb117b06d2f9f466a88d51e6a89972e2b1db93b0de3abf444b2ce33e1f1523305fa6f6c5a7
+  metadata.gz: '0843133052d9eb17e2defc372439be5242c621b13fbe24c98fee6f6cfbb2b93d24abb452f7edf1df91ee8bab3ed5d7658a38ac8da0f187acc58e8f9d1765fd6a'
+  data.tar.gz: dc2656f219568af7fa787ab911683e64a9245d53d213ae628db6aa1e2c04a890d6c10a26ed24e885dda2345f17af1f93056df4f47675673f5e0dcd78cbd3513f

data/lib/cocoapods-bb-PodAssistant/command/stable/push.rb

@@ -10,11 +10,11 @@ module Pod
         self.description = <<-DESC
           常用命令如下：\n
           更新所有公共组件: `pod stable push`\n
-          更新指定公共组件: `pod stable push 组件名称`\n
-          更新指定公共组件/移除组件: `pod stable push 组件名称 --remove=组件名称` #多个移除名称带`,`\n
-          更新指定公共组件/带依赖关系: `pod stable push 组件名称 --dependencies=组件名称` #多个依赖名称带`,`\n
-          更新指定公共组件/带依赖关系/移除组件: `pod stable push 组件名称 --dependencies=组件名称 --remove=组件名称` #多个依赖名称带`,`\n
-          参数说明:--dependencies 依赖组件 --remove 需要移除组件 --update-matrix 更新矩阵产品公共业务线
+          更新指定公共组件: `pod stable push <组件名称>`\n
+          更新指定公共组件/移除组件: `pod stable push <组件名称> --remove=组件名称` #多个移除名称带`,`\n
+          更新指定公共组件/带依赖关系: `pod stable push <组件名称> --dependencies=组件名称` #多个依赖名称带`,`\n
+          更新指定公共组件/带依赖关系/移除组件: `pod stable push <组件名称> --dependencies=组件名称 --remove=组件名称` #多个依赖名称带`,`\n
+          参数说明:--dependencies 依赖组件 --remove 需要移除组件 --update-matrix 更新矩阵产品公共业务线 --update-common 更新公共组件
         DESC
 
         self.arguments = [
@@ -25,7 +25,8 @@ module Pod
             [
                 ['--dependencies', '依赖组件名称，多个使用`,`隔开'],
                 ['--remove', '移除公共组件名称，多个使用`,`隔开'],
-                ['--update-matrix', '更新矩阵产品公共业务线'],
+                ['--update-matrix', '更新[矩阵]产品公共业务线,默认true'],
+                ['--update-common', '更新公共组件,默认false'],
             ].concat(super)
         end
 
@@ -33,13 +34,14 @@ module Pod
             @pods = argv.arguments!
             @dependencies = argv.option('dependencies', nil)&.split(',')
             @remove = argv.option('remove', nil)&.split(',')
-            @is_matrix = argv.flag?('update-matrix', false)
+            @is_pub = argv.flag?('update-common', false)
+            @is_matrix = !@is_pub # argv.flag?('update-matrix', true)
             super
         end
 
         def run
             puts "[PodAssistant] 开始执行 $ pod stable push".yellow
-            source_manager = BB::SourceManager.new(false)
+            source_manager = BB::SourceManager.new(false, @is_matrix)
             cachePath = source_manager.cache_path
             puts "stable cache git=>#{cachePath}"
             Dir.chdir(File.join(cachePath)) { 

data/lib/cocoapods-bb-PodAssistant/config/source_manager.rb

@@ -7,8 +7,8 @@ require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 # 数据源管理
 module BB
     class SourceManager
-        def initialize(verify_stable_env=true)
-            @env = BB::StableEnv.new(verify_stable_env)
+        def initialize(verify_stable_env=true, isMatrix=false)
+            @env = BB::StableEnv.new(verify_stable_env, isMatrix)
             @businessSpecName = @env.business_stable
             @stableMgr = BB::StableManager.new(@env, verify_stable_env)
         end
@@ -182,6 +182,12 @@ module BB
                 stable_specs[YAML_CONFIG_REMOVE_KEY] = removedata
                 stable_specs[YAML_CONFIG_DEPENDENCIES_KEY] = dependenciesdata
                 update_stable_lock(stable_yaml, stable_specs)
+                puts "removedata:#{removedata} len:#{removedata.length}".red
+                puts "dependenciesdata:#{dependenciesdata} count:#{dependenciesdata.length}".red
+                # 提交依赖/移除数据
+                if removedata.length > 0 || dependenciesdata.length > 0
+                    @stableMgr.commit_data(stable_yaml, "dependencies:#{dependenciesdata} remove:#{removedata}")
+                end
             end
         end
         def update_common_dependencies_and_remove_data(dependencies_pods, remove_pods)

data/lib/cocoapods-bb-PodAssistant/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/cocoapods-bb-PodAssistant/helpers/pod_module_helper.rb

@@ -169,6 +169,23 @@ module BB
             }
             return podfile_hash
         end
+        # stable本地数据去除指向本地
+        def convert_local_stable_data(local_stable_data)
+            stable_hash = {}
+            local_stable_data.each do |name,pod|
+                if pod.is_a? Hash
+                    path = pod[:path]
+                    if path
+                        puts "filter local path data:#{name}".red
+                    else
+                        stable_hash[name] = pod
+                    end
+                else
+                    stable_hash[name] = pod
+                end
+            end
+            return stable_hash
+        end
         # 合并组建数据
         # 策略:本地stable作为基础数据，遍历podfile组件进行替换，变化以本地为主，标签以stable为主
         def merge_module_data(podfile_specs, local_stable_data)
@@ -177,7 +194,8 @@ module BB
             # puts "podfile_hash: #{podfile_hash}".red
             # puts "local_stable_data: #{local_stable_data}".red
             need_update_pod_data={}
-            stable_hash = local_stable_data
+            # fix 指向本地组件切换到远端组件，本地yml配置不会更新问题
+            stable_hash = convert_local_stable_data(local_stable_data) # stable_hash = local_stable_data
             podfile_hash.each do |podName,podfile_pod|
                 if podfile_pod.count == 0
                     puts "❌ podfile组件[#{podName}]配置异常，请确认:method => REMOTE_VERSION是否配置\n组件信息如下:\n#{podName} => #{podfile_pod}".red
@@ -238,10 +256,11 @@ module BB
                                 if pod.is_a? (Hash)
                                     stable_branch = pod[:branch]
                                     stable_git = pod[:git]
+                                    stable_path = pod[:path]
                                     if stable_git.nil?
                                         stable_git = pod[:git_format]
                                     end
-                                    if (stable_branch && !stable_branch.empty?) || (stable_git && !stable_git.empty?)
+                                    if (stable_branch && !stable_branch.empty?) || (stable_git && !stable_git.empty?) || (stable_path && !stable_path.empty?)
                                         puts "[PodAssistant] '#{podName}', '#{podfile_pod}' 以podfile配置为主[分支=>标签]."
                                         newPod = podfile_pod
                                         is_podfile_data = true
@@ -249,7 +268,7 @@ module BB
                                         newPod = pod
                                     end
                                 elsif pod.is_a? (String)
-                                    if pod.include?(':branch') ||  pod.include?(':git') ||  pod.include?(':git_format')
+                                    if pod.include?(':branch') ||  pod.include?(':git') ||  pod.include?(':git_format') ||  pod.include?(':path')
                                         puts "[PodAssistant] '#{podName}', '#{podfile_pod}' 以podfile配置为主[分支=>标签]."
                                         newPod = podfile_pod
                                         is_podfile_data = true

data/lib/cocoapods-bb-PodAssistant/helpers/stable_env_helper.rb

@@ -2,8 +2,9 @@ require 'cocoapods-bb-PodAssistant/config/stable_source'
 
 module BB
     class StableEnv  
-        def initialize(verify_stable_env=true)
+        def initialize(verify_stable_env=true, isMatrix=false)
             @cache = BB::Cache.new(nil, verify_stable_env)
+            @isMatrix = isMatrix
             configGitPath(@cache.cachePath)
             if verify_stable_env
               # 自动加载stable环境
@@ -101,8 +102,14 @@ module BB
           return @stable_tag
         end
         def business_stable
+          if @businessSpec.nil? && @isMatrix
+            return default_matrix_business_stable
+          end
           return @businessSpec
         end
+        def default_matrix_business_stable
+          return "global_stable_specs"
+        end
         # 验证stable环境是否存在
         def verify_stable_env_exists
           return @stable_source.empty? ? false : true

data/lib/cocoapods-bb-PodAssistant/helpers/stable_manager_helper.rb

@@ -25,8 +25,14 @@ module BB
                 puts "没有配置业务线公共源，请确认!!!".yellow
             end
         end
-         # podfile 更新配置文件使用(项目)
-         def update_product_stable_lock(pod_targets)
+        # 提交数据
+        def commit_data(yml_path, commit_msg="")
+            puts "commit_stable_lock commit_msg:#{commit_msg}".red
+            commit_stable_lock_data(yml_path, commit_msg)
+        end
+
+        # podfile 更新配置文件使用(项目)
+        def update_product_stable_lock(pod_targets)
             update_local_stable_lock(local_stable_yaml, pod_targets)
         end
 
@@ -61,9 +67,12 @@ module BB
             stableSpec = BB::StableSpecs.new()
             stableSpec.update_stable_lock(yml_path, pod_targets)
             # step.2 提交修改后代码
+            commit_stable_lock_data(yml_path)
+        end
+        private def commit_stable_lock_data(yml_path, commit_msg="")
             yml_name = File.basename(yml_path)
             # `cd #{cachePath}; git pull --all; git add #{yml_name}; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
-            `cd #{cachePath}; git pull --all; git add * ; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
+            `cd #{cachePath}; git pull --all; git add * ; git commit -m "[update] 更新stable配置文件#{yml_name} #{commit_msg}"; git push; git pull --all;`
         end
         private def update_local_stable_lock(yml_path, pod_targets)
             # step.1 更新yaml配置文件

data/lib/cocoapods-bb-PodAssistant/source_provider_hook.rb

@@ -72,12 +72,12 @@ module BB
         $source_manager.generate_localStable
         $podEndTime = Time.new
         puts "[PodAssistant] plugin hook post_install".yellow
-        puts "[PodAssistant] pod库下载耗时 GitCloneAllSize: #{$gitAllSize} M GitCloneAllTime: #{$cloneAllTime} S CDNDownloadAllSize: #{$pluginCurrentZipAllSize} M CDNAllTime: #{$downloadAllTime} S CDNDownloadAllTime: #{$cdnDownloadAllTime} S CDNUnzipAllTime: #{$cdnUnZipAllTime} S"
-        # 如果是--verbose模式且$gitAllSize与$cloneAllTime（不为0表示有下载pod）
-        if $pluginIsVerbose == true && $gitAllSize != 0 && $cloneAllTime != 0 && $pluginCurrentZipAllSize != 0 && $downloadAllTime != 0
-            File.rename "#{Dir.home}/.AllPodsTimeAndSize.csv", "#{installer.sandbox_root}/AllPodsTimeAndSize.csv"
-            puts "具体的统计数据请在#{installer.sandbox_root}/AllPodsTimeAndSize.csv中查看"
-        end
+        # puts "[PodAssistant] pod库下载耗时 GitCloneAllSize: #{$gitAllSize} M GitCloneAllTime: #{$cloneAllTime} S CDNDownloadAllSize: #{$pluginCurrentZipAllSize} M CDNAllTime: #{$downloadAllTime} S CDNDownloadAllTime: #{$cdnDownloadAllTime} S CDNUnzipAllTime: #{$cdnUnZipAllTime} S"
+        # # 如果是--verbose模式且$gitAllSize与$cloneAllTime（不为0表示有下载pod）
+        # if $pluginIsVerbose == true && $gitAllSize != 0 && $cloneAllTime != 0 && $pluginCurrentZipAllSize != 0 && $downloadAllTime != 0
+        #     File.rename "#{Dir.home}/.AllPodsTimeAndSize.csv", "#{installer.sandbox_root}/AllPodsTimeAndSize.csv"
+        #     puts "具体的统计数据请在#{installer.sandbox_root}/AllPodsTimeAndSize.csv中查看"
+        # end
          # 获取时间差
          time = $podEndTime - $podStartTime
          puts "[PodAssistant] pod操作总耗时【#{time.to_s.send(:red)}秒】start:#{$podStartTime} end:#{$podEndTime}".green
@@ -87,202 +87,202 @@ module BB
     end
   end
 
-  class Pod::Downloader::Cache
-    # 使用方法别名hook copy_and_clean方法
-    alias :origin_copy_and_clean :copy_and_clean
-    def copy_and_clean(source, destination, spec)
-      # 执行之前的拷贝到cache并且清除git clone临时目录的方法
-      origin_copy_and_clean(source, destination, spec)
-      # 如果是--verbose，则输出详细信息，生成csv
-      if $pluginIsVerbose == true
-        verboseCopy_and_clean(source, destination, spec)
-      end
-    end
+  # class Pod::Downloader::Cache
+  #   # 使用方法别名hook copy_and_clean方法
+  #   alias :origin_copy_and_clean :copy_and_clean
+  #   def copy_and_clean(source, destination, spec)
+  #     # 执行之前的拷贝到cache并且清除git clone临时目录的方法
+  #     origin_copy_and_clean(source, destination, spec)
+  #     # 如果是--verbose，则输出详细信息，生成csv
+  #     if $pluginIsVerbose == true
+  #       verboseCopy_and_clean(source, destination, spec)
+  #     end
+  #   end
 
-    # --verbose输出详细信息，生成在home路径下.AllPodsTimeAndSize.csv的隐藏文件
-    def verboseCopy_and_clean(source, destination, spec)
-      begin
-        # 计算拷贝到的目录下所有文件总大小，单位为M
-        dirSum = Dir.size(destination.to_s)/1000.0/1000.0
-        # 标红输出cache文件大小，单位为M
-        puts "[PodAssistant] cachesize #{spec.name}: "+"#{dirSum}"+" M"
-        # 如果相等则为CDN的下载方式
-        if $gitSize == 0
-          # CDN的下载方式
-          CSV.open("#{Dir.home}/.AllPodsTimeAndSize.csv", "a+") do |csv|
-            csv << [spec.name, $downloadTime, $pluginCurrentZipSize, dirSum, "CDN不统计此项", "CDN", $cdnDownloadTime, $cdnUnZipTime]
-          end
-        else
-          # git的下载方式
-          # 计算git clone大小和cache文件大小的差值，如果差值过大，则有优化空间
-          diffSize = $gitSize - dirSum
-          # 标红输出差值
-          puts "[PodAssistant] diffSize = #{diffSize}"+"M "
-          CSV.open("#{Dir.home}/.AllPodsTimeAndSize.csv", "a+") do |csv|
-            csv << [spec.name, $cloneTime, $gitSize, dirSum, diffSize, "Git", "Git不统计此项", "Git不统计此项"]
-          end
-        end
+  #   # --verbose输出详细信息，生成在home路径下.AllPodsTimeAndSize.csv的隐藏文件
+  #   def verboseCopy_and_clean(source, destination, spec)
+  #     begin
+  #       # 计算拷贝到的目录下所有文件总大小，单位为M
+  #       dirSum = Dir.size(destination.to_s)/1000.0/1000.0
+  #       # 标红输出cache文件大小，单位为M
+  #       puts "[PodAssistant] cachesize #{spec.name}: "+"#{dirSum}"+" M"
+  #       # 如果相等则为CDN的下载方式
+  #       if $gitSize == 0
+  #         # CDN的下载方式
+  #         CSV.open("#{Dir.home}/.AllPodsTimeAndSize.csv", "a+") do |csv|
+  #           csv << [spec.name, $downloadTime, $pluginCurrentZipSize, dirSum, "CDN不统计此项", "CDN", $cdnDownloadTime, $cdnUnZipTime]
+  #         end
+  #       else
+  #         # git的下载方式
+  #         # 计算git clone大小和cache文件大小的差值，如果差值过大，则有优化空间
+  #         diffSize = $gitSize - dirSum
+  #         # 标红输出差值
+  #         puts "[PodAssistant] diffSize = #{diffSize}"+"M "
+  #         CSV.open("#{Dir.home}/.AllPodsTimeAndSize.csv", "a+") do |csv|
+  #           csv << [spec.name, $cloneTime, $gitSize, dirSum, diffSize, "Git", "Git不统计此项", "Git不统计此项"]
+  #         end
+  #       end
         
-        # 换行
-        puts
+  #       # 换行
+  #       puts
 
-      rescue => exception
-        # 输出拷贝清除方法异常
-        puts "[PodAssistant] verboseCopy_and_clean error(已捕获): #{exception}".red
-      end
-      $gitSize = 0
-    end
-  end
+  #     rescue => exception
+  #       # 输出拷贝清除方法异常
+  #       puts "[PodAssistant] verboseCopy_and_clean error(已捕获): #{exception}".red
+  #     end
+  #     $gitSize = 0
+  #   end
+  # end
 
 
-  class Pod::Downloader::Cache
+  # class Pod::Downloader::Cache
 
-    alias :origin_download :download
+  #   alias :origin_download :download
 
-    def download(request, target)
-      # 获取downloader下载的文件路径
-      source = target.to_s
-      # 赋值当前正在下载的文件路径给全局变量，为了解压zip的时候做判断
-      $pluginCurrentTarget = source
-      # 赋值当前正在下载的pod名称给全局变量，为了解压zip的时候做输出
-      $pluginCurrentPodName = request.name.to_s
-      # 获取clone执行前时间点
-      time1 = Time.new
-      # 执行之前的download_source方法，接收该方法的返回值
-      result, podspecs = origin_download(request, target)
+  #   def download(request, target)
+  #     # 获取downloader下载的文件路径
+  #     source = target.to_s
+  #     # 赋值当前正在下载的文件路径给全局变量，为了解压zip的时候做判断
+  #     $pluginCurrentTarget = source
+  #     # 赋值当前正在下载的pod名称给全局变量，为了解压zip的时候做输出
+  #     $pluginCurrentPodName = request.name.to_s
+  #     # 获取clone执行前时间点
+  #     time1 = Time.new
+  #     # 执行之前的download_source方法，接收该方法的返回值
+  #     result, podspecs = origin_download(request, target)
 
-      # 如果不是--verbose，只输出总耗时，总下载大小
-      # 捕获一下异常，不会因为plugin的原因导致pod失败
-      begin
-        # 获取clone执行后时间点
-        time2 = Time.new
-        # 获取时间差
-        time = time2 - time1
-        if request.params["git".to_sym]
-          # 说明是git方式
-          # 赋值一个给全局变量，之后时间统计要用到
-          $cloneTime = time
-          # 赋值一个给全局变量，之后时间统计要用到
-          $cloneAllTime = $cloneAllTime + time
-          # 计算downloader下载的文件大小，单位为M
-          dirSum = Dir.size(source)/1000.0/1000.0
-          # 赋值给一个全局变量，之后输出会用到
-          $gitAllSize = $gitAllSize + dirSum
-        else
-          # 说明是CDN方式
-          # 赋值一个给全局变量，之后时间统计要用到
-          $downloadTime = time
-          # 赋值一个给全局变量，之后时间统计要用到
-          $downloadAllTime = $downloadAllTime + time
-          # 赋值给一个全局变量，之后输出会用到
-          $cdnDownloadAllTime = $cdnDownloadAllTime + $cdnDownloadTime
-          # 赋值给一个全局变量，之后输出会用到
-          $cdnUnZipAllTime = $cdnUnZipAllTime + $cdnUnZipTime
-          # 赋值给一个全局变量，之后输出会用到
-          $pluginCurrentZipAllSize = $pluginCurrentZipAllSize + $pluginCurrentZipSize
-        end
+  #     # 如果不是--verbose，只输出总耗时，总下载大小
+  #     # 捕获一下异常，不会因为plugin的原因导致pod失败
+  #     begin
+  #       # 获取clone执行后时间点
+  #       time2 = Time.new
+  #       # 获取时间差
+  #       time = time2 - time1
+  #       if request.params["git".to_sym]
+  #         # 说明是git方式
+  #         # 赋值一个给全局变量，之后时间统计要用到
+  #         $cloneTime = time
+  #         # 赋值一个给全局变量，之后时间统计要用到
+  #         $cloneAllTime = $cloneAllTime + time
+  #         # 计算downloader下载的文件大小，单位为M
+  #         dirSum = Dir.size(source)/1000.0/1000.0
+  #         # 赋值给一个全局变量，之后输出会用到
+  #         $gitAllSize = $gitAllSize + dirSum
+  #       else
+  #         # 说明是CDN方式
+  #         # 赋值一个给全局变量，之后时间统计要用到
+  #         $downloadTime = time
+  #         # 赋值一个给全局变量，之后时间统计要用到
+  #         $downloadAllTime = $downloadAllTime + time
+  #         # 赋值给一个全局变量，之后输出会用到
+  #         $cdnDownloadAllTime = $cdnDownloadAllTime + $cdnDownloadTime
+  #         # 赋值给一个全局变量，之后输出会用到
+  #         $cdnUnZipAllTime = $cdnUnZipAllTime + $cdnUnZipTime
+  #         # 赋值给一个全局变量，之后输出会用到
+  #         $pluginCurrentZipAllSize = $pluginCurrentZipAllSize + $pluginCurrentZipSize
+  #       end
         
-        # 如果是--verbose，则输出详细信息，生成csv
-        if $pluginIsVerbose == true
-          verboseDownload(request, time, dirSum)
-        end
-        # 返回值
-        [result, podspecs]
-      rescue => exception
-        # 标红输出git clone hook异常
-        puts "[PodAssistant] download error(已捕获): #{exception}"
-      end
-    end
+  #       # 如果是--verbose，则输出详细信息，生成csv
+  #       if $pluginIsVerbose == true
+  #         verboseDownload(request, time, dirSum)
+  #       end
+  #       # 返回值
+  #       [result, podspecs]
+  #     rescue => exception
+  #       # 标红输出git clone hook异常
+  #       puts "[PodAssistant] download error(已捕获): #{exception}"
+  #     end
+  #   end
 
-    def verboseDownload(request, time, dirSum)
-      if request.params["git".to_sym]
-        # 说明是git方式
-        # 标红输出git clone耗时
-        puts "[PodAssistant] #{request.name.to_s} clone time: #{time}"+" S"
-        # 赋值给一个全局变量，之后输出会用到
-        $gitSize = dirSum
-        # 标红输出git clone下载文件大小
-        puts "[PodAssistant] #{request.name.to_s} clone allsize: "+"#{dirSum}"+" M"
-      else
-        # 说明是CDN方式
-        # 标红输出CDN 下载耗时
-        puts "[PodAssistant] #{request.name.to_s} CDN download time: #{$cdnDownloadTime}"+" S"
-        # 标红输出CDN 解压耗时
-        puts "[PodAssistant] #{request.name.to_s} CDN unzip time: #{$cdnUnZipTime}"+" S"
-        # 标红输出CDN 总耗时
-        puts "[PodAssistant] #{request.name.to_s} CDN All time: #{$downloadTime}"+" S"
-        # 标红输出CDN clone下载文件大小
-        puts "[PodAssistant] #{request.name.to_s} CDN zipSize: "+"#{$pluginCurrentZipSize}"+" M"
-      end
+  #   def verboseDownload(request, time, dirSum)
+  #     if request.params["git".to_sym]
+  #       # 说明是git方式
+  #       # 标红输出git clone耗时
+  #       puts "[PodAssistant] #{request.name.to_s} clone time: #{time}"+" S"
+  #       # 赋值给一个全局变量，之后输出会用到
+  #       $gitSize = dirSum
+  #       # 标红输出git clone下载文件大小
+  #       puts "[PodAssistant] #{request.name.to_s} clone allsize: "+"#{dirSum}"+" M"
+  #     else
+  #       # 说明是CDN方式
+  #       # 标红输出CDN 下载耗时
+  #       puts "[PodAssistant] #{request.name.to_s} CDN download time: #{$cdnDownloadTime}"+" S"
+  #       # 标红输出CDN 解压耗时
+  #       puts "[PodAssistant] #{request.name.to_s} CDN unzip time: #{$cdnUnZipTime}"+" S"
+  #       # 标红输出CDN 总耗时
+  #       puts "[PodAssistant] #{request.name.to_s} CDN All time: #{$downloadTime}"+" S"
+  #       # 标红输出CDN clone下载文件大小
+  #       puts "[PodAssistant] #{request.name.to_s} CDN zipSize: "+"#{$pluginCurrentZipSize}"+" M"
+  #     end
       
-    end
+  #   end
 
-  end
+  # end
 
-  class Pod::Downloader::Http
-    # 使用方法别名hook解压方法，获取解压之前的文件大小
-    alias :origin_download_file :download_file
-    alias :origin_extract_with_type :extract_with_type
+  # class Pod::Downloader::Http
+  #   # 使用方法别名hook解压方法，获取解压之前的文件大小
+  #   alias :origin_download_file :download_file
+  #   alias :origin_extract_with_type :extract_with_type
 
-    def download_file(_full_filename)
-      # 捕获一下异常，不会因为plugin的原因导致pod失败
-      begin
-        if _full_filename.to_s.include?($pluginCurrentTarget)
-          # 说明是之前被赋值的开始下载了
+  #   def download_file(_full_filename)
+  #     # 捕获一下异常，不会因为plugin的原因导致pod失败
+  #     begin
+  #       if _full_filename.to_s.include?($pluginCurrentTarget)
+  #         # 说明是之前被赋值的开始下载了
 
-          # 获取CDN下载执行前时间点
-          time1 = Time.new
-          # 执行原来的CDN下载方法
-          origin_download_file(_full_filename)
-          # 获取CDN下载执行后时间点
-          time2 = Time.new
-          # 赋值CDN下载耗时给全局变量，用于之后输出以及写在csv中
-          $cdnDownloadTime = time2 - time1
-        else
-          # 说明不是之前被赋值的开始下载了，输出一下，然后清空
-          puts "[PodAssistant] unzip warning: #{$pluginCurrentTarget} target error"
-          puts "[PodAssistant] unzip warning: #{$pluginCurrentPodName} name error"
-          $pluginCurrentTarget = ""
-          $pluginCurrentPodName = ""
-        end
-      rescue => exception
-        # 输出CDM下载方法异常
-        puts "[PodAssistant] download_file error(已捕获): #{exception}"
-      end
+  #         # 获取CDN下载执行前时间点
+  #         time1 = Time.new
+  #         # 执行原来的CDN下载方法
+  #         origin_download_file(_full_filename)
+  #         # 获取CDN下载执行后时间点
+  #         time2 = Time.new
+  #         # 赋值CDN下载耗时给全局变量，用于之后输出以及写在csv中
+  #         $cdnDownloadTime = time2 - time1
+  #       else
+  #         # 说明不是之前被赋值的开始下载了，输出一下，然后清空
+  #         puts "[PodAssistant] unzip warning: #{$pluginCurrentTarget} target error"
+  #         puts "[PodAssistant] unzip warning: #{$pluginCurrentPodName} name error"
+  #         $pluginCurrentTarget = ""
+  #         $pluginCurrentPodName = ""
+  #       end
+  #     rescue => exception
+  #       # 输出CDM下载方法异常
+  #       puts "[PodAssistant] download_file error(已捕获): #{exception}"
+  #     end
       
-    end
+  #   end
 
-    def extract_with_type(full_filename, type = :zip)
-      # 捕获一下异常，不会因为plugin的原因导致pod失败
-      begin
-        if full_filename.to_s.include?($pluginCurrentTarget)
-          # 说明是之前被赋值的下载完成了，开始进行解压了
+  #   def extract_with_type(full_filename, type = :zip)
+  #     # 捕获一下异常，不会因为plugin的原因导致pod失败
+  #     begin
+  #       if full_filename.to_s.include?($pluginCurrentTarget)
+  #         # 说明是之前被赋值的下载完成了，开始进行解压了
 
-          # 计算拷贝到的目录下所有文件总大小，单位为M
-          dirSum = File.size(full_filename.to_s)/1000.0/1000.0
-          # 赋值给当前正在解压的zip大小，之后输出到csv要用
-          $pluginCurrentZipSize = dirSum
-        else
-          # 说明不是之前被赋值的下载完成了，输出一下，然后清空
-          puts "[PodAssistant] unzip warning: #{$pluginCurrentTarget} target error"
-          puts "[PodAssistant] unzip warning: #{$pluginCurrentPodName} name error"
-          $pluginCurrentTarget = ""
-          $pluginCurrentPodName = ""
-        end
-      rescue => exception
-        # 输出CDN解压方法异常
-        puts "[PodAssistant] extract_with_type error(已捕获): #{exception}"
-      end
-      # 获取CDN解压前时间点
-      time1 = Time.new
-      # 执行之前的解压方法
-      origin_extract_with_type(full_filename, type)
-      # 获取CDN解压后时间点
-      time2 = Time.new
-      # 赋值CDN解压耗时给全局变量，用于之后输出以及写在csv中
-      $cdnUnZipTime = time2 - time1
-    end
-  end
+  #         # 计算拷贝到的目录下所有文件总大小，单位为M
+  #         dirSum = File.size(full_filename.to_s)/1000.0/1000.0
+  #         # 赋值给当前正在解压的zip大小，之后输出到csv要用
+  #         $pluginCurrentZipSize = dirSum
+  #       else
+  #         # 说明不是之前被赋值的下载完成了，输出一下，然后清空
+  #         puts "[PodAssistant] unzip warning: #{$pluginCurrentTarget} target error"
+  #         puts "[PodAssistant] unzip warning: #{$pluginCurrentPodName} name error"
+  #         $pluginCurrentTarget = ""
+  #         $pluginCurrentPodName = ""
+  #       end
+  #     rescue => exception
+  #       # 输出CDN解压方法异常
+  #       puts "[PodAssistant] extract_with_type error(已捕获): #{exception}"
+  #     end
+  #     # 获取CDN解压前时间点
+  #     time1 = Time.new
+  #     # 执行之前的解压方法
+  #     origin_extract_with_type(full_filename, type)
+  #     # 获取CDN解压后时间点
+  #     time2 = Time.new
+  #     # 赋值CDN解压耗时给全局变量，用于之后输出以及写在csv中
+  #     $cdnUnZipTime = time2 - time1
+  #   end
+  # end
 
   # class Pod::Downloader::Git
   #   # 使用方法别名hook clone方法

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-bb-PodAssistant.