cocoapods-bb-PodAssistant 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9981c561f8eb760349f20d77d0afd544602a810472cb9f8ecd02d6e2779664
-  data.tar.gz: da2528d18dfe9a93eafd8c18de120ba5212663c845bce0473f3c5fbbb056a8ba
+  metadata.gz: 95c6d433814654744108bb1b8d1051ac00b37dff52e8d0c73fbb03bbb7d67d52
+  data.tar.gz: d804e3f603a8ed9e8612fb4edf6c5ed19ae543d2328dfaf92bf335664f0da421
 SHA512:
-  metadata.gz: 8adc406969d02c2cb60393ff1afbba8a3e909acee63b85643183e72e58e3f087b156022037059a90a2ebe348c1ec832720ff7d5b66a637c42cc64ab0ff9925e8
-  data.tar.gz: a02261b3e1006d4d8164646843bc02414442ede74086dc763b66a41fe560610730797fc167f1662e4229f96d84cb867ab664c6f209fe5160108b06b63d56eea8
+  metadata.gz: 75858bf2163338409042d5e4be54e38d6c08a8ea93df77341870af4a0425bd1dc9a1b8a905376775b958318b554b537d4a0b9ad0f822f92d67ed53b82d0ccf04
+  data.tar.gz: 8216d2c5d5df66e7ff8526ae9394ba0a11c1391ac3f6c835e997458417aacab84d3372b346f9caaa565f087679448d094719c5b80ad48c29aeb04de1ed4691d6

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

@@ -1,5 +1,4 @@
 require 'cocoapods-bb-PodAssistant/config/source_manager'
-require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 
 module Pod
   class Command
@@ -18,17 +17,11 @@ module Pod
 
         def run
           # verify_podfile_exists!
-          env = BB::StableEnv.new()
-          if env.verify_stable_env_exists == true
-            env.system_clone_stable_git # 自动拉取远端git仓库数据
-            source_manager = BB::SourceManager.new()
-            puts "[PodAssistant] 开始配置生成当前项目yml文件".yellow
-            # 生成本地yml配置
-            source_manager.generate_localStable
-            puts "[PodAssistant] `pod stable init` complete!".green
-          else
-            puts "[PodAssistant] ❌工程没有配置stable环境".red
-          end
+          source_manager = BB::SourceManager.new()
+          puts "[PodAssistant] 开始配置生成当前项目yml文件".yellow
+          # 生成本地yml配置
+          source_manager.generate_localStable
+          puts "[PodAssistant] `pod stable init` complete!".green
         end
 
       end

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

@@ -7,10 +7,6 @@ module Pod
   class Command
     class Stable < Command
       class Sync < Stable
-        require 'fileutils'
-        require 'cocoapods/executable.rb'
-        extend Executable
-        executable :git
 
         self.summary = '[同步远端yml配置] sync a Stable yml config file'
 
@@ -26,31 +22,10 @@ module Pod
           puts "开始合并远端stable yml数据".yellow
           # 数据合并
           source_manager = BB::SourceManager.new()
-          fetch_stale_git
           source_manager.merge_stable_data
           puts "[PodAssistant] `pod stable sync` complete! Please execute the [pod install/ pod update] command".green
         end
 
-        # 拉取stable仓库代码  ruby脚本内部调用
-        def clone_stable_git
-          cache = BB::Cache.new()
-          cachePath = cache.cachePath
-          configGitPath(cachePath)
-          unless Dir.exist?(File.join(cachePath))
-            clonePath = File.dirname(cachePath)
-            FileUtils.mkdir_p clonePath
-            git_clone(@stable_source,clonePath)
-          end
-        end
-
-        def fetch_stale_git
-          clone_stable_git
-          # git操作
-          git_reset
-          git_fetch
-          git_checkout_and_pull(@stable_source, @stable_branch, @stable_tag)
-        end
-
       end
     end
   end

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

@@ -21,26 +21,37 @@ module Pod
 
         def self.options
           [
-            # ['--business-spec=specName', '业务线公共stable spec名称'],
+            ['--sync', '立即同步远端yml配置，更新组件信息'],
           ].concat(super)
         end
 
         def initialize(argv)
           @pods = argv.arguments!
+          @sync = argv.flag?('sync')
           super
-
         end
 
         def run
           puts "[PodAssistant] 开始执行 $ pod stable update".yellow
+          # system "git checkout Podfile.lock"
+          source_manager = BB::SourceManager.new()
           # verify_podfile_exists! # 系统提供api验证podfile是否ok
+          if @sync
+            puts "[PodAssistant] 需要同步组件信息#{@pods}".green
+            source_manager.merge_stable_data(@pods)
+          end
+          podStartTime = Time.new
           if @pods.any?
             pods_str = @pods.join(" ")
             system "pod update #{pods_str}"
           else
             system "pod update"
           end
-          source_manager = BB::SourceManager.new()
+          podEndTime = Time.new
+          # 获取时间差
+          time = podEndTime - podStartTime
+          puts "[PodAssistant] pod update操作总耗时【#{time.to_s.send(:red)}秒】start:#{podStartTime} end:#{podEndTime}".green
+          
           source_manager.update_local_stable_from_podmodules(@pods)
           puts "[PodAssistant] `pod stable update` complete!".green
         end

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

@@ -1,4 +1,5 @@
 require 'cocoapods-bb-PodAssistant/config/stable_source'
+require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 
 module BB
     class Cache
@@ -7,10 +8,15 @@ module BB
                 stable_source = StableSource.stable_default_source
             end
             @stable_source = stable_source
+            @bundleId = BB::PodUtils.getProjectBundleIdentifier
+            if @bundleId.nil?
+                @bundleId = 'stable'
+            end
         end
 
         def cachePath()
-            File.join(File.expand_path('~/.cache'), 'cocoapods-bb-PodAssistant','stable',@stable_source.split('/').last.chomp('.git').to_s)
+            # 缓存路径采用bundle包名区分，解决多产品同时打包问题
+            File.join(File.expand_path('~/.cache'), 'cocoapods-bb-PodAssistant',@bundleId,@stable_source.split('/').last.chomp('.git').to_s)
         end
     end
 end

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

@@ -9,6 +9,7 @@ module BB
     class SourceManager
         def initialize()
             env = BB::StableEnv.new()
+            # puts "SourceManager env:#{env}".red
             @businessSpecName = env.business_stable
             @stableMgr = BB::StableManager.new()
         end
@@ -93,10 +94,10 @@ module BB
             localSpec.writeData(local_stable_yaml, stable_lock)  
         end
 
-        # 合并stable数据
-        def merge_stable_data()
+        # 合并stable数据，参数，支持传入更新某几个数据
+        def merge_stable_data(update_pods=[])
             #4、show origin_stable_lock diff with local_stable_lock
-            new_stable_spec = compare_specs(fetch_local_stable_datas, fetch_origin_stable_datas)
+            new_stable_spec = compare_specs(fetch_local_stable_datas, fetch_origin_stable_datas, update_pods)
 
             #5、rewirte local_stable_lock with origin_stable_lock
             update_localstable_datas(new_stable_spec)    
@@ -122,8 +123,8 @@ module BB
             return result
         end
 
-        # compare specs 参数1:本地，参数2:远端
-        def compare_specs(local_specs, common_specs)
+        # compare specs 参数1:本地，参数2:远端，参数3:指定更新pod库
+        def compare_specs(local_specs, common_specs, update_pods=[])
             added_projects = []
             updated_projects = []
             rollbacked_projects = []
@@ -146,15 +147,15 @@ module BB
                 elsif local_version != version
                     # puts "merge name:#{name} local_version:#{local_version} route_version:#{version}".red
                     # 版本不一致
-                    if (version.is_a? String) && (local_version.is_a? String)
-                    end
-                    if versionGreat(version, local_version)
-                        updated_projects << "【#{name}】 (#{local_version}) -> (#{version.to_s.send(:yellow)})"
-                    else
-                        rollbacked_projects << "【#{name}】 (#{version.to_s.send(:red)}) <- (#{local_version})"
-                    end
                     podCoreName = subspec_podname(name)
-                    need_update_pod_lists[podCoreName] = version
+                    if (update_pods.length == 0) || (update_pods.include?(podCoreName))
+                        if versionGreat(version, local_version)
+                            updated_projects << "【#{name}】 (#{local_version}) -> (#{version.to_s.send(:yellow)})"
+                        else
+                            rollbacked_projects << "【#{name}】 (#{version.to_s.send(:red)}) <- (#{local_version})"
+                        end
+                        need_update_pod_lists[podCoreName] = version
+                    end
                 end
             end
             # 解决subspec组件同步更新版本信息
@@ -175,16 +176,20 @@ module BB
                 end
                 local_exist_ver = new_specs[name]
                 if local_exist_ver.nil?
-                    new_specs[name] = version
-                    added_projects << "【#{name}】 (#{version.to_s.send(:green)})"
+                    if (update_pods.length == 0) || (update_pods.include?(name))
+                        new_specs[name] = version
+                        added_projects << "【#{name}】 (#{version.to_s.send(:green)})"
+                    end
                 end
                 if array.is_a?(Array)
                     array.each do |name|
                         name = name.to_s
                         local_exist_ver = new_specs[name]
                         if local_exist_ver.nil?
-                            new_specs[name] = version
-                            added_projects << "【#{name}】 (#{version.to_s.send(:green)})"
+                            if (update_pods.length == 0) || (update_pods.include?(name))
+                                new_specs[name] = version
+                                added_projects << "【#{name}】 (#{version.to_s.send(:green)})"
+                            end
                         end
                     end
                 end
@@ -192,7 +197,6 @@ module BB
             # step.3 匹配组件移除
             removedata.each do |name|
                 name = name.to_s
-                # local_exist_ver = new_specs[name]
                 version = listdata[name]
                 if version
                     deleted_projects << "【#{name}】 (#{"delete".send(:red)}) <- (#{version})"
@@ -244,6 +248,8 @@ module BB
             lockfile = podfile_lock
             local_specs = {}
             dependencies = lockfile.dependencies
+            pod_names = lockfile.pod_names
+            # dependencies依赖数据
             dependencies.each do | dependency |
                 pod_name = dependency.name
                 if has_include_subspec(pod_name)
@@ -251,6 +257,7 @@ module BB
                 else
                     podCoreName = pod_name
                 end
+                # puts "podCoreName:#{podCoreName} pod_name:#{pod_name}".red
                 if dependency.external_source.is_a? Hash
                     # 指向分支
                     external_source = dependency.external_source
@@ -273,6 +280,25 @@ module BB
                     end
                 end
             end
+            # 被依赖数据
+            pod_names.each do | pod_name |
+                if has_include_subspec(pod_name)
+                    podCoreName = subspec_podname(pod_name)
+                else
+                    podCoreName = pod_name
+                end
+                pod = local_specs[podCoreName]
+                # puts "podCoreName:#{podCoreName} pod:#{pod}".green
+                if pod.nil?
+                    # 指向标签版本
+                    version = lockfile.version(pod_name).to_s
+                    if !version.empty? && !local_specs.has_key?(podCoreName)
+                        local_specs[podCoreName] = version
+                        # puts "[标签] #{podCoreName} => (#{version})".yellow
+                    end
+                end
+            end
+
             # Pod::UI.puts "yml配置数据:#{local_specs}"
             if local_specs.length > 0
                 update_localstable_datas(local_specs)

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

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

@@ -158,6 +158,10 @@ module BB
             need_update_pod_data={}
             stable_hash = local_stable_data
             podfile_hash.each do |podName,podfile_pod|
+                if podfile_pod.count == 0
+                    puts "❌ podfile组件配置异常，请确认:method => REMOTE_VERSION是否配置\n组件信息如下:\n#{podName} => #{podfile_pod}".red
+                    exit
+                end
                 podCoreName = @source_manager.subspec_podname(podName)
                 if (podName == podCoreName) || @source_manager.has_pod_subspec(podName, podCoreName)
                     pod = stable_hash[podCoreName]
@@ -165,7 +169,8 @@ module BB
                         need_update_pod_data[podName] = podfile_pod
                     else
                         # if podCoreName == 'BBGameModule'
-                        #     puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".green
+                        #     succ = (pod == podfile_pod) ? true : false
+                        #     puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod}) succ:#{succ}".green
                         # end
                         if pod == podfile_pod
                             if podName != podCoreName

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

@@ -7,6 +7,11 @@ module BB
             configGitPath(@cache.cachePath)
             # 自动加载stable环境
             loadStaleEnv
+            if verify_stable_env_exists == false
+              puts "[PodAssistant] ❌工程没有配置stable环境".red
+            else
+              fetch_stale_git # 自动拉取远端git仓库数据
+            end
         end
 
         # stable 环境,执行pod stable
@@ -36,15 +41,31 @@ module BB
         def system_clone_stable_git
             cachePath = @cache.cachePath
             puts "hook [pod install/update] fetch stable git=>#{cachePath}"
-            if Dir.exist?(File.join(cachePath))
-              # `cd #{cachePath}; git switch main; git pull --all`
-              system "cd #{cachePath}; git switch main; git pull --all"
-            else
+            if !Dir.exist?(File.join(cachePath))
               clonePath = File.dirname(cachePath)
               FileUtils.mkdir_p clonePath
-              # `git clone #{@stable_source} #{cachePath}`
               system "git clone #{@stable_source} #{cachePath}"
             end
+            if verify_branch_exists
+              if stable_tag || stable_branch
+                if stable_branch
+                  system "cd #{cachePath}; git checkout #{stable_branch}; git reset --hard origin/#{stable_branch}"
+                end
+                if stable_tag
+                  system "cd #{cachePath}; git checkout #{stable_tag};"
+                end
+              else
+                result =`git symbolic-ref refs/remotes/origin/HEAD`
+                protechBranch = result.split("/").last.strip || default_branch
+                system "cd #{cachePath}; git checkout #{protechBranch}; git reset --hard origin/#{protechBranch}"
+              end
+            else
+              puts "❌ stable配置无效分支信息source:#{@stable_source} branch:#{stable_branch}".red
+              exit
+            end
+        end
+        def fetch_stale_git
+          system_clone_stable_git
         end
 
         # ========podfile 约定函数规则，切勿修改
@@ -56,13 +77,19 @@ module BB
           end
           @stable_tag = options[:tag] if options.has_key?(:tag) 
           @stable_branch = options[:branch] if options.has_key?(:branch)
-          puts "###stable env => [stable公共源]:#{source} [业务线源名称]:#{@businessSpec} branch:#{@stable_branch} tag:#{@stable_tag}".yellow
+          puts "###stable env => [stable公共源]:#{source} [业务线源名称]:#{@businessSpec} branch:#{@stable_branch} tag:#{@stable_tag}".green
         end
 
         def stable_source
           return @stable_source
         end
+        def default_branch
+          return "main"
+        end
         def stable_branch
+          if @stable_branch.nil?
+            return default_branch
+          end
           return @stable_branch
         end
         def stable_tag
@@ -75,5 +102,32 @@ module BB
         def verify_stable_env_exists
           return @stable_source.empty? ? false : true
         end
+        # tag是否存在
+        def verify_tag_exists
+          tag = stable_tag
+          if tag
+            cachePath = @cache.cachePath
+            # result = system "cd #{cachePath}; git tag"
+            result = `cd #{cachePath}; git tag`
+            puts "verify_tag_exists:#{result}".red
+            return result.split("\n").include?(tag)
+          end
+          return false
+        end
+        # 分支是否存在
+        def verify_branch_exists
+          branch = stable_branch
+          if branch
+            cachePath = @cache.cachePath
+            # result = system "cd #{cachePath}; git tag"
+            branchs = `cd #{cachePath}; git branch -a`
+            if branchs
+              branchs = branchs.split("\n")
+              return branchs.include?(branch) || branchs.include?('  remotes/origin/' + branch) || branchs.include?('remotes/origin/' + branch)
+            end
+            puts "verify_branch_exists:#{branchs}".red
+          end
+          return false
+        end
     end
 end

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

@@ -42,6 +42,7 @@ end
 
 $podStartTime = 0
 $podEndTime = 0
+$source_manager = nil
 
 module BB
 
@@ -49,8 +50,7 @@ module BB
     begin
       $podStartTime = Time.new
       puts "[PodAssistant] plugin hook pre_install".yellow
-      env = BB::StableEnv.new()
-      env.system_clone_stable_git # 自动拉取远端git仓库数据
+      $source_manager = BB::SourceManager.new() # 自动拉取远端git仓库数据
       if $pluginIsVerbose == true
         # home路径下是否存在.AllPodsTimeAndSize.csv的隐藏文件
         if File.exist?("#{Dir.home}/.AllPodsTimeAndSize.csv")
@@ -68,9 +68,8 @@ module BB
   end
   Pod::HooksManager.register("cocoapods-bb-PodAssistant", :post_install) do |installer|
     begin
-        source_manager = BB::SourceManager.new()
         # 生成本地yml配置
-        source_manager.generate_localStable
+        $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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - humin