cocoapods-bb-PodAssistant 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d73bccc2529481814cc586c3d0cb46b863c986741859ac8d399f1a8962ed1c
-  data.tar.gz: d96718876d58008ffa7e846cae38e68d46358fe3e88effd7477b669b514ede12
+  metadata.gz: 95c6d433814654744108bb1b8d1051ac00b37dff52e8d0c73fbb03bbb7d67d52
+  data.tar.gz: d804e3f603a8ed9e8612fb4edf6c5ed19ae543d2328dfaf92bf335664f0da421
 SHA512:
-  metadata.gz: 979d7c8365b57c364e953ebe616d55be2c40c5547a72d42089db504123d9188bfe8920ede679ec412128e41cca44feaec052d32d1163c60b7434d022be2dfba4
-  data.tar.gz: c86d930fdd7cc595ea411b235ce98b18e8c105665b178a05938f9f4e942a20530bb83a5ac2dabb6a530022d0f82f2373adf6951d55984d2473b15d52d93e2a0f
+  metadata.gz: 75858bf2163338409042d5e4be54e38d6c08a8ea93df77341870af4a0425bd1dc9a1b8a905376775b958318b554b537d4a0b9ad0f822f92d67ed53b82d0ccf04
+  data.tar.gz: 8216d2c5d5df66e7ff8526ae9394ba0a11c1391ac3f6c835e997458417aacab84d3372b346f9caaa565f087679448d094719c5b80ad48c29aeb04de1ed4691d6

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

@@ -0,0 +1,30 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+
+module Pod
+  class Command
+    class Stable < Command
+      class Init < Stable
+
+        self.summary = '[初始化项目yml配置] Generate a Stable yml config file from a Podfile.lock'
+
+        self.description = <<-DESC
+          通过项目`Podfile.lock`文件，生成`stable_specs_lock.yml`配置文件
+        DESC
+
+        def initialize(argv)
+          super
+        end
+
+        def run
+          # verify_podfile_exists!
+          source_manager = BB::SourceManager.new()
+          puts "[PodAssistant] 开始配置生成当前项目yml文件".yellow
+          # 生成本地yml配置
+          source_manager.generate_localStable
+          puts "[PodAssistant] `pod stable init` complete!".green
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+
+module Pod
+  class Command
+    class Stable < Command
+      class Install < Stable
+        self.summary = '[命令同执行`pod install操作`] Install project dependencies according to versions from a Podfile.lock'
+
+        self.description = <<-DESC
+          Downloads all dependencies defined in `Podfile` and creates an Xcode
+          Pods library project in `./Pods`.
+
+          The Xcode project file should be specified in your `Podfile` like this:
+
+              project 'path/to/XcodeProject.xcodeproj'
+
+          If no project is specified, then a search for an Xcode project will
+          be made. If more than one Xcode project is found, the command will
+          raise an error.
+
+          This will configure the project to reference the Pods static library,
+          add a build configuration file, and add a post build script to copy
+          Pod resources.
+
+          This may return one of several error codes if it encounters problems.
+          * `1` Generic error code
+          * `31` Spec not found (i.e out-of-date source repos, mistyped Pod name etc...)
+        DESC
+
+        def run
+          puts "[PodAssistant] 开始执行 $ pod stable install".yellow
+          system "pod install"
+          puts "[PodAssistant] `pod stable install` complete!".green
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+require 'cocoapods-bb-PodAssistant/helpers/git_cmd_helper'
+require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
+require 'cocoapods'
+
+module Pod
+  class Command
+    class Stable < Command
+      class Sync < Stable
+
+        self.summary = '[同步远端yml配置] sync a Stable yml config file'
+
+        self.description = <<-DESC
+          同步远端stable yml配置文件，并对本地文件进行合并操作
+        DESC
+
+        def initialize(argv)
+          super
+        end
+
+        def run
+          puts "开始合并远端stable yml数据".yellow
+          # 数据合并
+          source_manager = BB::SourceManager.new()
+          source_manager.merge_stable_data
+          puts "[PodAssistant] `pod stable sync` complete! Please execute the [pod install/ pod update] command".green
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+
+module Pod
+  class Command
+    class Stable < Command
+      class Update < Stable
+        self.summary = '[命令同执行`pod update操作`] Update outdated project dependencies and create new ' \
+        'Podfile.lock'
+
+        self.description = <<-DESC
+          Updates the Pods identified by the specified `POD_NAMES`, which is a
+          space-delimited list of pod names. If no `POD_NAMES` are specified, it
+          updates all the Pods, ignoring the contents of the Podfile.lock. This
+          command is reserved for the update of dependencies; pod install should
+          be used to install changes to the Podfile.
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAMES', false, true),
+        ]
+
+        def self.options
+          [
+            ['--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
+          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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+require 'cocoapods-bb-PodAssistant/config/cache_path'
+require 'cocoapods-bb-PodAssistant/helpers'
+
+require 'cocoapods-bb-PodAssistant/command/stable/init'
+require 'cocoapods-bb-PodAssistant/command/stable/install'
+require 'cocoapods-bb-PodAssistant/command/stable/update'
+require 'cocoapods-bb-PodAssistant/command/stable/sync'
+
+module Pod
+
+    # class StableOptions
+    #   # define business specs,defalut is stable_specs
+    #   option :business_specs, "stable_specs"
+
+    #   # define custom lockSpecs tag
+    #   option :tag, ""
+
+    #   # define custom lockSpecs branch
+    #   option :branch, ""
+    # end
+
+    class Command
+      class Stable < Command
+        self.abstract_command = true
+
+        self.summary = '拉取稳定Podfile.lock配置'
+        self.description = <<-DESC
+          拉取稳定lock配置插件。利用版本比对进行更新配置实现对组件版本控制管理。
+        DESC
+
+        self.default_subcommand = 'init'
+
+        #-----------------------------------------------------------------------#
+
+        extend Executable
+        executable :git
+
+        def validate!
+          super
+          banner! if @help
+        end
+
+        def run
+          puts "[PodAssistant] `pod stable` 帮助文档请查看�".yellow
+          # banner! 
+        end
+
+      end
+    end
+  end

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

@@ -1,9 +1,8 @@
-require 'cocoapods-bb-PodAssistant/command/PodAssistant'
 #stable
-require 'cocoapods-bb-PodAssistant/command/stable/stable'
-require 'cocoapods-bb-PodAssistant/command/stable/podfile-linkline'
+require 'cocoapods-bb-PodAssistant/command/stable'
+require 'cocoapods-bb-PodAssistant/babybus/stable/podfile-linkline'
 #linkline
-require 'cocoapods-bb-PodAssistant/command/linkline/linkline'
-require 'cocoapods-bb-PodAssistant/command/linkline/target-linkline'
-require 'cocoapods-bb-PodAssistant/command/linkline/targetdefinition-linkline'
-require 'cocoapods-bb-PodAssistant/command/linkline/targetValidator-linkline'
+require 'cocoapods-bb-PodAssistant/command/linkline'
+require 'cocoapods-bb-PodAssistant/babybus/linkline/target-linkline'
+require 'cocoapods-bb-PodAssistant/babybus/linkline/targetdefinition-linkline'
+require 'cocoapods-bb-PodAssistant/babybus/linkline/targetValidator-linkline'

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

@@ -2,12 +2,15 @@ require 'cocoapods-bb-PodAssistant/helpers'
 require 'cocoapods-bb-PodAssistant/config/stable_specs'
 require 'cocoapods-bb-PodAssistant/helpers/stable_manager_helper'
 require 'cocoapods-core'
+require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 
 # 数据源管理
 module BB
     class SourceManager
-        def initialize(businessSpecName = nil)
-            @businessSpecName = businessSpecName
+        def initialize()
+            env = BB::StableEnv.new()
+            # puts "SourceManager env:#{env}".red
+            @businessSpecName = env.business_stable
             @stableMgr = BB::StableManager.new()
         end
 
@@ -91,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)    
@@ -120,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 = []
@@ -144,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组件同步更新版本信息
@@ -173,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
@@ -190,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})"
@@ -242,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)
@@ -249,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
@@ -271,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.6"
+  VERSION = "0.1.8"
 end

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

@@ -1,4 +1,5 @@
 # cache stable
+require 'cocoapods'
 
 ######################################## Git Command  ########################################
 def configGitPath(gitPath)
@@ -66,7 +67,10 @@ def git_branch_exists?(branch)
 end
 
 def git_clone(source, path)
-    puts "git clone source:#{source} path:#{path}"
+    puts "git clone source:#{source} path:#{path}".yellow
+    if !File.directory?(path)
+        Dir.mkdir(path)
+    end
     UI.section("Cloning `#{source}` into `#{path}`.") do
         Dir.chdir(path) { git! ['clone', source] } #origin git command
     end

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

@@ -158,16 +158,20 @@ 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]
                     if pod.nil? # stbale没有受版本控制
                         need_update_pod_data[podName] = podfile_pod
                     else
-                        # puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".yellow
-                        if podName == "BBWriteReview/World"
-                            puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".yellow
-                        end
+                        # if podCoreName == 'BBGameModule'
+                        #     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
                                 need_update_pod_data[podName] = podfile_pod
@@ -206,9 +210,42 @@ module BB
                                     need_update_pod_data[podName] = pod
                                 end
                             else
-                                if podName != podCoreName
-                                    # puts "[PodAssistant] '#{podName}', '#{pod.send(:red)}' 以stable配置为主."
-                                    need_update_pod_data[podName] = pod
+                                is_podfile_data = false
+                                newPod = nil
+                                if pod.is_a? (Hash)
+                                    stable_branch = pod[:branch]
+                                    stable_git = pod[:git]
+                                    if stable_git.nil?
+                                        stable_git = pod[:git_format]
+                                    end
+                                    if (stable_branch && !stable_branch.empty?) || (stable_git && !stable_git.empty?)
+                                        puts "[PodAssistant] '#{podName}', '#{podfile_pod}' 以podfile配置为主[分支=>标签]."
+                                        newPod = podfile_pod
+                                        is_podfile_data = true
+                                    else
+                                        newPod = pod
+                                    end
+                                elsif pod.is_a? (String)
+                                    if pod.include?(':branch') ||  pod.include?(':git') ||  pod.include?(':git_format')
+                                        puts "[PodAssistant] '#{podName}', '#{podfile_pod}' 以podfile配置为主[分支=>标签]."
+                                        newPod = podfile_pod
+                                        is_podfile_data = true
+                                    else
+                                        newPod = pod
+                                    end
+                                else
+                                    newPod = podfile_pod
+                                    is_podfile_data = true
+                                end
+                                if is_podfile_data == true
+                                    need_update_pod_data[podCoreName] = newPod
+                                    if podName != podCoreName
+                                        need_update_pod_data[podName] = newPod
+                                    end
+                                else
+                                    if podName != podCoreName
+                                        need_update_pod_data[podName] = newPod
+                                    end
                                 end
                             end
                         end

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

@@ -1,36 +1,133 @@
-require 'cocoapods-bb-PodAssistant/helpers/git_cmd_helper'
 require 'cocoapods-bb-PodAssistant/config/stable_source'
 
 module BB
-    class StableEnv
-        def initialize(stable_source = nil, stable_branch = nil, stable_tag = nil)
-            if stable_source.nil?
-              stable_source = StableSource.stable_default_source
-            end
-            @stable_source = stable_source
-            @stable_branch = stable_branch
-            @stable_tag = stable_tag
-
+    class StableEnv  
+        def initialize()
             @cache = BB::Cache.new()
             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
         def loadStaleEnv
-            
+          unless File.exist?(File.join(Pathname.pwd, "Podfile"))
+            err_msg = "- Error: #{File.join(Pathname.pwd, "Podfile")} is not exit"
+            Pod::UI.puts "#{err_msg}".send(:red)
+            exit -9001
+          end
+
+          #获取podfile 内容
+          #1、删除所有注释行，避免干扰
+          #2、正则匹配，筛选出stable 方法
+          #3、执行stable 方法，获取配置
+          podfileContent = File.read(File.join(Pathname.pwd, "Podfile"))
+          podfileContent_vaild = podfileContent.lines.reject { |line| line.strip.start_with?("#") }.join
+          stableCommand = podfileContent_vaild.match(/^\s*stable!\s*'([^']+)'(?:,\s*(\w+):\s*'([^']+)')*/m)
+          unless stableCommand
+            puts "- Error: not stable define in the podfile! you can define to podfile:".red
+            puts "stable! 'https://git.babybus.co/babybus/ios/Specs/stable-specs.git', specs:'<业务线stbale名称-可选>', tag:'<标签-可选>', branch:'<分支-可选>'".green
+            exit -9002
+          end
+          eval(stableCommand.to_s)
         end
 
-        # 开发环境,执行pod install/update
-        def loadDeveloperEnv
+        # 拉取stable仓库代码  hook开发环境,执行pod install/update
+        def system_clone_stable_git
             cachePath = @cache.cachePath
-            puts "hook [pod install/update] sync stable git=>#{cachePath}"
-            if Dir.exist?(File.join(cachePath))
-              `cd #{cachePath}; git switch main; git pull --all`
-            else
+            puts "hook [pod install/update] fetch stable git=>#{cachePath}"
+            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 约定函数规则，切勿修改
+        #help load podfile option
+        def stable!(source, options = {})
+          @stable_source = source
+          if options.has_key?(:specs) 
+            @businessSpec = options[:specs]
+          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}".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
+          return @stable_tag
+        end
+        def business_stable
+          return @businessSpec
+        end
+        # 验证stable环境是否存在
+        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.loadDeveloperEnv
+      $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(@businessSpec)
         # 生成本地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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -79,14 +79,17 @@ files:
 - lib/cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment.rb
 - lib/cocoapods-bb-PodAssistant/babybus/helpers/babybus_info_plist_helper.rb
 - lib/cocoapods-bb-PodAssistant/babybus/installer/post_install_hooks.rb
+- lib/cocoapods-bb-PodAssistant/babybus/linkline/target-linkline.rb
+- lib/cocoapods-bb-PodAssistant/babybus/linkline/targetValidator-linkline.rb
+- lib/cocoapods-bb-PodAssistant/babybus/linkline/targetdefinition-linkline.rb
+- lib/cocoapods-bb-PodAssistant/babybus/stable/podfile-linkline.rb
 - lib/cocoapods-bb-PodAssistant/command.rb
-- lib/cocoapods-bb-PodAssistant/command/PodAssistant.rb
-- lib/cocoapods-bb-PodAssistant/command/linkline/linkline.rb
-- lib/cocoapods-bb-PodAssistant/command/linkline/target-linkline.rb
-- lib/cocoapods-bb-PodAssistant/command/linkline/targetValidator-linkline.rb
-- lib/cocoapods-bb-PodAssistant/command/linkline/targetdefinition-linkline.rb
-- lib/cocoapods-bb-PodAssistant/command/stable/podfile-linkline.rb
-- lib/cocoapods-bb-PodAssistant/command/stable/stable.rb
+- lib/cocoapods-bb-PodAssistant/command/linkline.rb
+- lib/cocoapods-bb-PodAssistant/command/stable.rb
+- lib/cocoapods-bb-PodAssistant/command/stable/init.rb
+- lib/cocoapods-bb-PodAssistant/command/stable/install.rb
+- lib/cocoapods-bb-PodAssistant/command/stable/sync.rb
+- lib/cocoapods-bb-PodAssistant/command/stable/update.rb
 - lib/cocoapods-bb-PodAssistant/config/cache_path.rb
 - lib/cocoapods-bb-PodAssistant/config/source_manager.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_source.rb

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

@@ -1,44 +0,0 @@
-module Pod
-  class Command
-    # This is an example of a cocoapods plugin adding a top-level subcommand
-    # to the 'pod' command.
-    #
-    # You can also create subcommands of existing or new commands. Say you
-    # wanted to add a subcommand to `list` to show newly deprecated pods,
-    # (e.g. `pod list deprecated`), there are a few things that would need
-    # to change.
-    #
-    # - move this file to `lib/pod/command/list/deprecated.rb` and update
-    #   the class to exist in the the Pod::Command::List namespace
-    # - change this class to extend from `List` instead of `Command`. This
-    #   tells the plugin system that it is a subcommand of `list`.
-    # - edit `lib/cocoapods_plugins.rb` to require this file
-    #
-    # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
-    #       in the `plugins.json` file, once your plugin is released.
-    #
-    class Podassistant < Command
-      self.summary = 'Short description of cocoapods-bb-PodAssistant.'
-
-      self.description = <<-DESC
-        Longer description of cocoapods-bb-PodAssistant.
-      DESC
-
-      # self.arguments = 'NAME'
-
-      def initialize(argv)
-        # @name = argv.shift_argument
-        super
-      end
-
-      def validate!
-        super
-        # help! 'A Pod name is required.' unless @name
-      end
-
-      def run
-        UI.puts "Add your implementation for the cocoapods-bb-PodAssistant plugin in #{__FILE__}"
-      end
-    end
-  end
-end

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

@@ -1,168 +0,0 @@
-require 'cocoapods-bb-PodAssistant/config/source_manager'
-require 'cocoapods-bb-PodAssistant/config/cache_path'
-require 'cocoapods-bb-PodAssistant/helpers'
-
-module Pod
-
-    # class StableOptions
-    #   # define business specs,defalut is stable_specs
-    #   option :business_specs, "stable_specs"
-
-    #   # define custom lockSpecs tag
-    #   option :tag, ""
-
-    #   # define custom lockSpecs branch
-    #   option :branch, ""
-    # end
-
-    class Command
-      class Stable < Command
-        require 'fileutils'
-        require 'cocoapods/executable.rb'
-        extend Executable
-        executable :git
-
-        self.summary = '拉取稳定lock配置'
-        self.description = <<-DESC
-          拉取稳定lock配置插件。利用版本比对进行更新配置实现对组件版本控制管理。
-        DESC
-
-        self.arguments = [
-            CLAide::Argument.new('Podfile', false)
-        ]
-        def self.options
-          [
-            ['--init', '初始化项目yml配置，根据当前项目Podfile.lock生成'],
-            ['--sync', '同步远端yml配置，更新项目yml配置'],
-            ['--install', '命令同执行`pod install操作`'],
-            ['--update', '命令同执行`pod update操作`'],
-            ['--update-pod', '命令同执行`pod update <组件>操作`,更新yml配置组件版本信息，多个组件使用`,`或者`空格`隔开,注意⚠️  使用`空格`需要使用双引号'],
-          ].concat(super)
-        end
-        
-        def initialize(argv)
-          @names = argv.arguments! unless argv.arguments.empty?
-          @help = argv.flag?('help')
-          @init = argv.flag?('init')
-          @sync = argv.flag?('sync')
-          # install操作
-          @install = argv.flag?('install')
-          @update = argv.flag?('update')
-          # update组件数据支持多个使用`,`或者`空格`隔开
-          update_pods = argv.option('update-pod','')
-          if !update_pods.empty?
-            if update_pods.include?(' ')
-              @update_pods = update_pods.split(' ') unless update_pods.nil?
-            else update_pods.include?(',')
-              @update_pods = update_pods.split(',') unless update_pods.nil?
-            end
-          end
-          super
-        end
-        def validate!
-          super
-          banner! if @help
-        end
-
-        #help load podfile option
-        def stable!(source, options = {})
-          @ll_stable_source = source
-          if options.has_key?(:specs) 
-            @businessSpec = options[:specs]
-            puts "当前业务使用源=>#{@businessSpec}"
-          end
-          @ll_stable_tag = options[:tag] if options.has_key?(:tag) 
-          @ll_stable_branch = options[:branch] if options.has_key?(:branch)
-          @cache = BB::Cache.new()
-          configGitPath(@cache.cachePath)
-        end
-
-        ######################################## Main ########################################
-        
-        def run
-          # begin
-            source_manager = BB::SourceManager.new(@businessSpec)
-            if @init
-              puts "[PodAssistant] 开始配置生成当前项目yml文件".yellow
-              # 生成本地yml配置
-              source_manager.generate_localStable
-              puts "[PodAssistant] `pod stable --init` complete!".green
-            elsif @install
-              puts "[PodAssistant] 执行 $ pod install".yellow
-              system "pod install"
-              puts "[PodAssistant] `pod stable --install` complete!".green
-            elsif @update
-              puts "[PodAssistant] 执行 $ pod update".yellow
-              system "pod update"
-              puts "[PodAssistant] `pod stable --update` complete!".green
-            elsif @update_pods
-              # 更新单个组件
-              puts "更新pod组件#{@update_pods} count:#{@update_pods.count}".yellow
-              source_manager.update_podmodules(@update_pods)
-              podnames = @update_pods.join(" ")
-              puts "[PodAssistant] 执行 $ pod update #{podnames}".yellow
-              system "pod update #{podnames}"
-              source_manager.update_local_stable_from_podmodules(@update_pods)
-              podnames = @update_pods.join(",")
-              puts "[PodAssistant] `pod stable --update-pod=#{podnames}` complete!".green
-            elsif @sync
-              puts "开始合并远端lock数据".yellow
-              ll_load_stable
-              #2、clone origin lock spec to cache dir 
-              ll_cloneStable
-              #3、fetch newest code
-              ll_fetch_stale_git
-              # 数据合并
-              source_manager.merge_stable_data
-              puts "[PodAssistant] `pod stable` complete! Please execute the [pod install/ pod update] command".green
-            else
-              puts "[PodAssistant] `pod stable` 帮助文档请查看👇".yellow
-              banner! 
-            end
-          # rescue => exception
-          #   puts "[pod stable] error(已捕获): #{exception}".red
-          # end
-          
-        end
-
-        private
-        ######################################## API ########################################
-        def ll_load_stable
-          unless File.exist?(File.join(Pathname.pwd, "Podfile"))
-            err_msg = "- Error: #{File.join(Pathname.pwd, "Podfile")} is not exit"
-            Pod::UI.puts "#{err_msg}".send(:red)
-            exit -9001
-          end
-
-          #获取podfile 内容
-          #1、删除所有注释行，避免干扰
-          #2、正则匹配，筛选出stable 方法
-          #3、执行stable 方法，获取配置
-          podfileContent = File.read(File.join(Pathname.pwd, "Podfile"))
-          podfileContent_vaild = podfileContent.lines.reject { |line| line.strip.start_with?("#") }.join
-          stableCommand = podfileContent_vaild.match(/^\s*stable!\s*'([^']+)'(?:,\s*(\w+):\s*'([^']+)')*/m)
-          unless stableCommand
-            err_msg = "- Error: not stable define in the podfile! you can define like【stable! 'https://git.babybus.co/babybus/ios/Specs/stable-specs.git', specs:'global_stable_specs'】in podfile"
-            Pod::UI.puts "#{err_msg}".send(:red)
-            exit -9002
-          end
-          eval(stableCommand.to_s)
-        end
-        def ll_cloneStable
-          cachePath = @cache.cachePath
-          unless Dir.exist?(File.join(cachePath))
-            clonePath = File.dirname(cachePath)
-            FileUtils.mkdir_p clonePath
-            git_clone(@stable_source,clonePath)
-          end
-        end
-
-        def ll_fetch_stale_git
-          git_reset
-          git_fetch
-          git_checkout_and_pull(@stable_source, @stable_branch, @stable_tag)
-        end
-
-      end
-    end
-  end