cocoapods-bb-PodAssistant 0.1.5.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f28225f78453b91584c65af22176c0a36c55679bc6aa8ce273a6248c18a5602
-  data.tar.gz: 3e8130c32e18020f89f660a581e50d1d152fd73c41dfa1c37d5cc95d3ffdfa28
+  metadata.gz: 7a9981c561f8eb760349f20d77d0afd544602a810472cb9f8ecd02d6e2779664
+  data.tar.gz: da2528d18dfe9a93eafd8c18de120ba5212663c845bce0473f3c5fbbb056a8ba
 SHA512:
-  metadata.gz: dd13a647bdd0906b30f4d4640614ba33cf8ac014b378bac59a1ba562feb1af73d9ee85c9596c165eee906f010de5b599c41b3fadb5ddf6acfa6a5a5032f8fbf0
-  data.tar.gz: 5d277674798ae013dec5330a42a282dbcfd2a705238774fb288c54fd75bed95876b7ea2d1d42db1f652522f0765f5fd7c32936f97a69fc56bcdee4a762833175
+  metadata.gz: 8adc406969d02c2cb60393ff1afbba8a3e909acee63b85643183e72e58e3f087b156022037059a90a2ebe348c1ec832720ff7d5b66a637c42cc64ab0ff9925e8
+  data.tar.gz: a02261b3e1006d4d8164646843bc02414442ede74086dc763b66a41fe560610730797fc167f1662e4229f96d84cb867ab664c6f209fe5160108b06b63d56eea8

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

@@ -0,0 +1,37 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
+
+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!
+          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
+        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,57 @@
+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
+        require 'fileutils'
+        require 'cocoapods/executable.rb'
+        extend Executable
+        executable :git
+
+        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()
+          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
+end

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

@@ -0,0 +1,50 @@
+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
+          [
+            # ['--business-spec=specName', '业务线公共stable spec名称'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @pods = argv.arguments!
+          super
+
+        end
+
+        def run
+          puts "[PodAssistant] 开始执行 $ pod stable update".yellow
+          # verify_podfile_exists! # 系统提供api验证podfile是否ok
+          if @pods.any?
+            pods_str = @pods.join(" ")
+            system "pod update #{pods_str}"
+          else
+            system "pod update"
+          end
+          source_manager = BB::SourceManager.new()
+          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/source_manager.rb

@@ -2,12 +2,14 @@ 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()
+            @businessSpecName = env.business_stable
             @stableMgr = BB::StableManager.new()
         end
 
@@ -29,7 +31,12 @@ module BB
         # 产品线本地lock数据
         def fetch_local_stable_datas
             localSpec = BB::StableSpecs.new()
-            return localSpec.readData(local_stable_yaml)
+            yml = local_stable_yaml
+            if !File.file?(yml)
+                puts "yml配置文件不存在，执行自动初始化项目yml配置文件".green
+                generate_localStable
+            end
+            return localSpec.readData(yml)
         end
 
         # 远端公共lock数据
@@ -231,51 +238,38 @@ module BB
             return lockfile
         end
 
+        # 生成项目stable配置文件
+        # 策略：根据podfile.lock dependencies依赖记录pod core标签/分支数据，不存储subspec数据
         def generate_localStable
             lockfile = podfile_lock
             local_specs = {}
-            # step.1 获取分支指向信息
             dependencies = lockfile.dependencies
             dependencies.each do | dependency |
+                pod_name = dependency.name
+                if has_include_subspec(pod_name)
+                    podCoreName = subspec_podname(pod_name)
+                else
+                    podCoreName = pod_name
+                end
                 if dependency.external_source.is_a? Hash
-                    name = dependency.name
+                    # 指向分支
                     external_source = dependency.external_source
-                    podCoreName = subspec_podname(name)
                     # checkout_options = lockfile.checkout_options_for_pod_named(podCoreName)
                     # if checkout_options.is_a? Hash
                     #     commit = checkout_options[:commit]
                     #     external_source[:commit] = commit
                     #     puts "name:#{podCoreName} checkout_options:#{checkout_options} commit:#{commit}"
                     # end
-                    if podCoreName != name
-                        # local_specs.delete(podCoreName)
+                    if !local_specs.has_key?(podCoreName)
                         local_specs[podCoreName] = external_source
-                        if (!has_include_core_subspec(name)) # 过滤core数据
-                            local_specs[name] = external_source
-                            Pod::UI.puts "[分支] #{name} => (#{external_source})"
-                        end
-                    else
-                        local_specs[name] = external_source
-                        Pod::UI.puts "[分支] #{name} => (#{external_source})"
-                    end
-                end
-            end
-            # step.2 获取pods标签信息,如果存在分支优先使用分支信息
-            lockfile.pod_names.each do |pod_name|
-                version = lockfile.version(pod_name)
-                podCoreName = subspec_podname(pod_name)
-                if local_specs.has_key?(podCoreName)
-                    if podCoreName != pod_name
-                        if (!has_include_core_subspec(pod_name)) # 过滤core数据
-                            # Pod::UI.puts "step.2 #{pod_name} => (#{local_specs[podCoreName]})"
-                            local_specs[pod_name] = local_specs[podCoreName]
-                        end
+                        # puts "[分支] #{podCoreName} => (#{external_source})".yellow
                     end
                 else
-                    if (!has_include_core_subspec(pod_name)) # 过滤core数据
-                        ver = version.to_s
-                        local_specs[pod_name] = ver
-                        Pod::UI.puts "[标签] #{pod_name} => (#{ver})"
+                    # 指向标签版本
+                    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

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.1.5.1"
+  VERSION = "0.1.7"
 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

@@ -14,7 +14,14 @@ module BB
         @@member_configs = [
         ]
 
-        def initialize(all_modules, member_modules, member_configs, ignore_local_stable = false, skip_stable_check = false)
+        # pod组件合并
+        # 参数说明
+        # all_modules 业务使用组件
+        # member_modules 项目成员模块，一般用于切本地开发使用
+        # member_configs 项目成员工程配置
+        # ignore_local_stable 是否忽略本地stable配置，true 适合pod子组件
+        # skip_stable_check 是否跳过stable检测，true 采用标准pod合并操作
+        def initialize(all_modules, member_modules = {}, member_configs = [], ignore_local_stable = false, skip_stable_check = false)
             @source_manager = BB::SourceManager.new()
             #加载远程稳定仓库 和本地podfile 指定的仓库进行合并
             if skip_stable_check == true
@@ -24,7 +31,6 @@ module BB
             end
             @@member_modules = member_modules
             @@member_configs = member_configs
-            # puts "member_modules:#{member_modules}"
         end
 
         def current_member
@@ -142,39 +148,101 @@ module BB
             }
             return podfile_hash
         end
+        # 合并组建数据
+        # 策略:本地stable作为基础数据，遍历podfile组件进行替换，变化以本地为主，标签以stable为主
         def merge_module_data(podfile_specs, local_stable_data)
             # puts "podfile_specs: #{podfile_specs}".green
             podfile_hash = convert_podfile_specs_data(podfile_specs)
             # puts "podfile_hash: #{podfile_hash}".red
             # puts "local_stable_data: #{local_stable_data}".red
             need_update_pod_data={}
-            podfile_hash.each do |podName,pod|
-                local_pod_data = local_stable_data[podName]
-                if pod != local_pod_data
-                    branch = pod[:branch]
-                    git_format = pod[:git_format]
-                    version = pod[:version]
-                    podCoreName = @source_manager.subspec_podname(podName)
-                    # puts "podName:#{podName} pod:#{pod} branch:#{branch} git_format:#{git_format} version:#{version} local_pod_data:#{local_pod_data}".green
-                    if (branch && !branch.empty?) || (git_format && !git_format.empty?)
-                        # 项目配置指向分支数据，以本项目为主
-                        puts "[PodAssistant] #{podName} 指向分支数据 => #{pod}"
-                        need_update_pod_data[podCoreName] = pod
-                    end
-                    # succ = (version && !version.empty? && (local_pod_data.is_a? String) && (version != local_pod_data) && !version.include?(local_pod_data))
-                    # puts "podName:#{podName} version:#{version} succ=#{succ}".red
-                    if (version && !version.empty? && (local_pod_data.is_a? String) && (version != local_pod_data) && !version.include?(local_pod_data))
-                        version = version.lstrip # 去除首字母空格
-                        initial_str = version[0..0] # 第一个字母
-                        # 项目配置固定版本，以本项目为主
-                        is_fixed_version = initial_str.include?('=') ? true : false # 固定版本 pod 'A','= x.x.x'
-                        is_lessthan_version = version.include?('<') ? true : false # 限制《最高》组件版本 pod 'A','< x.x.x' 或者 pod 'A','<= x.x.x'
-                        is_greaterthan_version = version.include?('>') ? true : false # 限制《最低》组件版本 pod 'A','> x.x.x' 或者 pod 'A','>= x.x.x'
-                        is_fuzzy_version = version.include?('~>') ? true : false # 固定版本 pod 'A','~> x.x.x'
-                        is_fuzzy_versionV2 = (!is_fixed_version && !is_lessthan_version && !is_greaterthan_version && !is_fuzzy_version) ? true : false # 固定版本 pod 'A','x.x.x'
-                        if (is_fixed_version == true) || (is_lessthan_version == true) || (is_fuzzy_version == true) || (is_fuzzy_versionV2 == true)
-                            puts "[PodAssistant] ⚠️ 限制组件版本 '#{podName}', '#{version}' 以项目配置为主. (最新版本=> #{local_pod_data.send(:red)})"
-                            need_update_pod_data[podCoreName] = version
+            stable_hash = local_stable_data
+            podfile_hash.each do |podName,podfile_pod|
+                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
+                        # if podCoreName == 'BBGameModule'
+                        #     puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".green
+                        # end
+                        if pod == podfile_pod
+                            if podName != podCoreName
+                                need_update_pod_data[podName] = podfile_pod
+                            end
+                        else
+                            branch = podfile_pod[:branch]
+                            git = podfile_pod[:git]
+                            if git.nil?
+                                git = podfile_pod[:git_format]
+                            end
+                            version = podfile_pod[:version]
+                            if (branch && !branch.empty?) || (git && !git.empty?)
+                                # 项目配置指向分支数据，以本项目为主
+                                puts "[PodAssistant] #{podName} 指向分支数据 => #{podfile_pod}"
+                                stable_hash[podCoreName] = podfile_pod
+                                if podName != podCoreName
+                                    need_update_pod_data[podName] = podfile_pod
+                                end
+                            elsif (version && !version.empty? && (pod.is_a? String) && (version != pod))
+                                version = version.lstrip # 去除首字母空格
+                                initial_str = version[0..0] # 第一个字母
+                                # 项目配置固定版本，以本项目为主
+                                is_fixed_version = initial_str.include?('=') ? true : false # 固定版本 pod 'A','= x.x.x'
+                                is_lessthan_version = version.include?('<') ? true : false # 限制《最高》组件版本 pod 'A','< x.x.x' 或者 pod 'A','<= x.x.x'
+                                is_greaterthan_version = version.include?('>') ? true : false # 限制《最低》组件版本 pod 'A','> x.x.x' 或者 pod 'A','>= x.x.x'
+                                is_fuzzy_version = version.include?('~>') ? true : false # 固定版本 pod 'A','~> x.x.x'
+                                is_fuzzy_versionV2 = (!is_fixed_version && !is_lessthan_version && !is_greaterthan_version && !is_fuzzy_version) ? true : false # 固定版本 pod 'A','x.x.x'
+                                if (is_fixed_version == true) || (is_lessthan_version == true) || (is_fuzzy_versionV2 == true)
+                                    puts "[PodAssistant] ⚠️ 限制组件版本 '#{podName}', '#{version}' 以项目配置为主. (最新版本=> #{pod.send(:red)})"
+                                    stable_hash[podCoreName] = version
+                                    if podName != podCoreName
+                                        need_update_pod_data[podName] = version
+                                    end
+                                elsif (is_greaterthan_version == true) || (is_fuzzy_version == true)
+                                    # puts "[PodAssistant] '#{podName}', '#{pod.send(:red)}' 以stable配置为主."
+                                    need_update_pod_data[podName] = pod
+                                end
+                            else
+                                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
                     end
                 end
@@ -182,22 +250,16 @@ module BB
             if need_update_pod_data.count > 0
                 # puts "need_update_pod_data:#{need_update_pod_data}".green
                 # 规避指向分支/远端版本替换yml配置所有组件，避免pod指向指向多个源
-                need_update_pod_data.each do |podCoreName,pod|
-                    local_stable_data.keys.each do |podName|
-                        if (podName == podCoreName) || @source_manager.has_pod_subspec(podName, podCoreName)
-                            local_stable_data[podName] = pod
-                            puts "[PodAssistant] 合并组件 #{podName} #{pod} 以项目为主".yellow
-                        end
-                    end
+                need_update_pod_data.each do |podName,pod|
+                    stable_hash[podName] = pod
+                    puts "[PodAssistant] merge pod #{podName} #{pod}"
                 end
-                puts "[PodAssistant] 重新保存本地stable数据".yellow
-                @source_manager.update_localstable_datas(local_stable_data) 
             else
                 puts "[PodAssistant] 本地stable数据无变化<===完成".yellow
             end
-            # puts "local_stable_data: #{local_stable_data}".red
+            # puts "[PodAssistant] stable_hash:#{stable_hash}".red
             stable_specs = []
-            local_stable_data.each do |name,pod|
+            stable_hash.each do |name,pod|
                 if pod.is_a? Hash
                     branch = pod[:branch]
                     git = pod[:git]
@@ -239,7 +301,7 @@ module BB
                 elsif pod.is_a? String
                     stable_specs.push({ names: [name], version: pod, method: REMOTE_TAG })
                 else
-                    puts "unknow type data:#{pod}".red
+                    puts "unknow type [#{name}] data:#{pod}".red
                 end
             end
             return stable_specs

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

@@ -1,36 +1,79 @@
-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
         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}"
+            puts "hook [pod install/update] fetch stable git=>#{cachePath}"
             if Dir.exist?(File.join(cachePath))
-              `cd #{cachePath}; git switch main; git pull --all`
+              # `cd #{cachePath}; git switch main; git pull --all`
+              system "cd #{cachePath}; git switch main; git pull --all"
             else
               clonePath = File.dirname(cachePath)
               FileUtils.mkdir_p clonePath
-              `git clone #{@stable_source} #{cachePath}`
+              # `git clone #{@stable_source} #{cachePath}`
+              system "git clone #{@stable_source} #{cachePath}"
             end
         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}".yellow
+        end
+
+        def stable_source
+          return @stable_source
+        end
+        def stable_branch
+          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
     end
 end

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

@@ -47,13 +47,25 @@ module Pod
     class Podfile
         # @!group DSL support
         include Pod::Podfile::DSL
-
-        # pod组件合并操作
-        def pod_module_run(pod_modules, member_modules = {}, member_configs = [], ignore_local_stable = false, skip_stable_check = false)
+        # pod组件合并操作（项目）
+        def project_pod_module_run(pod_modules, member_modules = {}, member_configs = [], skip_stable_check = false)
+            # Pod::UI.puts "Pod Module:#{pod_modules}"
+            time1 = Time.new
+            puts "[PodAssistant]项目pod组件组装开始操作时间:#{time1}".green
+            source = BB::PodModule.new(pod_modules, member_modules, member_configs, false, skip_stable_check)
+            pod_box_module_run(source)
+            time2 = Time.new
+            puts "[PodAssistant]项目pod组件组装结束时间:#{time2}".green
+             # 获取时间差
+            time = time2 - time1
+            puts "项目pod组件组装操作耗时:#{time.to_s.send(:red)}秒".green
+        end
+        # pod组件合并操作（单组件）
+        def pod_module_run(pod_modules, member_modules = {}, member_configs = [])
             # Pod::UI.puts "Pod Module:#{pod_modules}"
             time1 = Time.new
             puts "[PodAssistant]pod组件组装开始操作时间:#{time1}".green
-            source = BB::PodModule.new(pod_modules, member_modules, member_configs, ignore_local_stable, skip_stable_check)
+            source = BB::PodModule.new(pod_modules, member_modules, member_configs, true, true)
             pod_box_module_run(source)
             time2 = Time.new
             puts "[PodAssistant]pod组件组装结束时间:#{time2}".green

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

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