cocoapods-bb-PodAssistant 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2705715a5d3a1fb1d3a9b67f74e24803ef31012292ff01ce65b15ec33b1402
-  data.tar.gz: 2cc66113449ec295ecb88c99bcaaea6cdd4a277498c07924e656a652f79022ce
+  metadata.gz: 35d02b24a30633e891421f088d9fe05c17585e9b6db05f0c337a9468b980adf5
+  data.tar.gz: 4c7ac41d4a5f98ab346dfa587a686f079af075ef434df61e5441597f84f265f7
 SHA512:
-  metadata.gz: d2df0329e92d8ba05f49d57386c147bd9577bbfc4e5c4704a8fcbd693929d237d709fe512d2593bd921b1a2f92958adacba6225cd3f7e0c73e1055241a4ad17e
-  data.tar.gz: 70179167a38a24a9aab3a8bca075f0339a9a2597c00b669ec02437dcba7fcb929a419ee716e2ba3eaa64dc4322ca901422dde6ca2cfb70baab3164c73790d1ba
+  metadata.gz: 58d31747fb116514f4520aacf1b730d0503d7e5ca3ca136772488519871ae667dad4200fb05ae65938378e8c47268e86fad32275b794bea660a65227836eee8b
+  data.tar.gz: 32b9d36bf4238aaf709dc6bdad0feded1ba5845270d42089d6cae5490120a99a1695c755b4edffdf10c9b4b1f96f187dc6eaaa1f70320e3d4b19a9133ceb9e17

data/lib/cocoapods-bb-PodAssistant/babybus/bbsadvert/podfile_dependency_cache.rb

@@ -0,0 +1,32 @@
+module Pod
+    class Config
+        attr_accessor :bb_idfa_flag
+    end
+end
+
+module Pod
+    class Installer
+      class Analyzer
+        class PodfileDependencyCache
+            alias_method :bb_origin_initialize, :initialize
+            def initialize(podfile_dependencies, dependencies_by_target_definition)
+                bb_origin_initialize(podfile_dependencies,dependencies_by_target_definition)
+            
+                if @podfile_dependencies
+                    @podfile_dependencies.each do |dep|
+                        if dep.name.include?('/noidfa')
+                            Pod::Config.instance.bb_idfa_flag = 'noidfa'
+                            break
+                        elsif dep.name.include?('/idfa')
+                            Pod::Config.instance.bb_idfa_flag = 'idfa'
+                            break
+                        end
+                    end
+                end
+            end
+        end
+      end
+    end
+end
+
+

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/command.rb

@@ -1,3 +1,6 @@
+# bbsadvert
+require 'cocoapods-bb-PodAssistant/babybus/bbsadvert/podfile_dependency_cache.rb'
+
 #stable
 require 'cocoapods-bb-PodAssistant/command/stable'
 require 'cocoapods-bb-PodAssistant/babybus/stable/podfile-linkline'

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.3.0"
 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.3.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -90,6 +90,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/cocoapods-bb-PodAssistant.rb
+- lib/cocoapods-bb-PodAssistant/babybus/bbsadvert/podfile_dependency_cache.rb
 - 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
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-bb-PodAssistant.