cocoapods-bb-PodAssistant 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2705715a5d3a1fb1d3a9b67f74e24803ef31012292ff01ce65b15ec33b1402
-  data.tar.gz: 2cc66113449ec295ecb88c99bcaaea6cdd4a277498c07924e656a652f79022ce
+  metadata.gz: a2f479136e8df55d4ac4833cbd6542fc65bb11cc5e5ea2ef137806cde3103c30
+  data.tar.gz: a6487fd194b8b54792a917285a8ee9daf10bc9b5d626addb6e8e79b500783aaf
 SHA512:
-  metadata.gz: d2df0329e92d8ba05f49d57386c147bd9577bbfc4e5c4704a8fcbd693929d237d709fe512d2593bd921b1a2f92958adacba6225cd3f7e0c73e1055241a4ad17e
-  data.tar.gz: 70179167a38a24a9aab3a8bca075f0339a9a2597c00b669ec02437dcba7fcb929a419ee716e2ba3eaa64dc4322ca901422dde6ca2cfb70baab3164c73790d1ba
+  metadata.gz: a519bee2c0a2a0bfb407fe9b609882709c29321826222482576d0959472c73e39c6b7dbbc492c738530c951aa9cc8e8cf971162d176f7c52f1b04ee69f27b2c8
+  data.tar.gz: 954b121cfd5949fac4349ce3db307d3cb83a3e656765efaa9f0c33834158a3002466dd11fb00f7a3f7315ff31b6a69dfe19d920224acd9c1247ab4d6d7334c9f

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

@@ -48,6 +48,7 @@ module Pod
                 # puts "pwd:#{`pwd`}".green
                 path = @is_matrix ? matrix_stable_path : common_stable_path
                 Dir.chdir(File.join(path)) {
+                    commit_msg = ""
                     if @pods.any?
                         if (@pods.length > 1) && (@dependencies)
                             puts "❌ 无效指令，不能处理多个组件#{@pods}依赖，更新组件仅支持单组件".red
@@ -69,6 +70,7 @@ module Pod
                         end
                         pods_str = @pods.join(" ")
                         system "pod stable update #{pods_str}"
+                        commit_msg = "update pod #{pods_str}"
                     else
                         if (@dependencies) || (@remove)
                             puts "❌ 无效指令，没有制定组件名称 详见 pod stable push --help".red
@@ -77,6 +79,8 @@ module Pod
                         end
                         system "pod stable update"
                     end
+                    # 提交spec本地lock依赖，避免pod stable push <组件>出现组件版本回退问题
+                    source_manager.commit_localspec_data(@is_matrix, commit_msg)
                 }
             }
         end

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

@@ -186,7 +186,7 @@ module BB
                 puts "dependenciesdata:#{dependenciesdata} count:#{dependenciesdata.length}".red
                 # 提交依赖/移除数据
                 if removedata.length > 0 || dependenciesdata.length > 0
-                    @stableMgr.commit_data(stable_yaml, "dependencies:#{dependenciesdata} remove:#{removedata}")
+                    commit_git_data(stable_yaml, "dependencies:#{dependenciesdata} remove:#{removedata}")
                 end
             end
         end
@@ -196,6 +196,17 @@ module BB
         def update_business_dependencies_and_remove_data(dependencies_pods, remove_pods)
             update_dependencies_and_remove_data(business_stable_yaml, business_stable_datas, dependencies_pods, remove_pods)
         end
+        def commit_localspec_data(is_matrix, commit_msg)
+            if is_matrix
+                stable_yaml = business_stable_yaml
+            else
+                stable_yaml = public_stable_yaml
+            end
+            commit_git_data(stable_yaml, commit_msg)
+        end
+        def commit_git_data(stable_yaml, commit_msg)
+            @stableMgr.commit_data(stable_yaml, commit_msg)
+        end
         # compare specs 参数1:本地，参数2:远端，参数3:指定更新pod库
         def compare_specs(local_specs, common_specs, update_pods=[], is_force = false)
             added_projects = []

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

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

@@ -27,7 +27,6 @@ module BB
         end
         # 提交数据
         def commit_data(yml_path, commit_msg="")
-            puts "commit_stable_lock commit_msg:#{commit_msg}".red
             commit_stable_lock_data(yml_path, commit_msg)
         end
 
@@ -72,7 +71,7 @@ module BB
         private def commit_stable_lock_data(yml_path, commit_msg="")
             yml_name = File.basename(yml_path)
             # `cd #{cachePath}; git pull --all; git add #{yml_name}; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
-            `cd #{cachePath}; git pull --all; git add * ; git commit -m "[update] 更新stable配置文件#{yml_name} #{commit_msg}"; git push; git pull --all;`
+            `cd #{cachePath} && git pull --all && git add . && git commit -m "[update] 更新stable配置文件#{yml_name} #{commit_msg}" && git push && git pull --all;`
         end
         private def update_local_stable_lock(yml_path, pod_targets)
             # step.1 更新yaml配置文件

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core