cocoapods-bb-PodAssistant 0.1.8 → 0.1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c6d433814654744108bb1b8d1051ac00b37dff52e8d0c73fbb03bbb7d67d52
-  data.tar.gz: d804e3f603a8ed9e8612fb4edf6c5ed19ae543d2328dfaf92bf335664f0da421
+  metadata.gz: f6c32b006b3836cba11f001d3ebc24c707f3bd473a35156cfaf3bceae50f4528
+  data.tar.gz: 447a74c6907306dfdacf90685572eeea587b97e0e20ad61c0ccebf7001f4ca69
 SHA512:
-  metadata.gz: 75858bf2163338409042d5e4be54e38d6c08a8ea93df77341870af4a0425bd1dc9a1b8a905376775b958318b554b537d4a0b9ad0f822f92d67ed53b82d0ccf04
-  data.tar.gz: 8216d2c5d5df66e7ff8526ae9394ba0a11c1391ac3f6c835e997458417aacab84d3372b346f9caaa565f087679448d094719c5b80ad48c29aeb04de1ed4691d6
+  metadata.gz: b0f45f73957e38a0007348067cbcbc39d65a1a533ffe0ba5a349d82134909f3e51bdc72e062adfcecc7b184ddc3da11df2cc2dd2041740331f6216ebe53a8a27
+  data.tar.gz: ea3629e578813651181a761037a0d4ec02a25b0003c6e24cca1574de0e1fd3b82a0e0ec0fc4f028b2e5fc91da44019c64e2eff3cecd80bab4cf44a1f7913a073

data/README.md

@@ -15,14 +15,26 @@ pod stable --help
 
 * 初始化本地lock文件
 ```
-pod stable --init
+pod stable init
 ```
 
 * 同步lock文件
 ```
-pod stable
+pod stable sync
 ```
 
+* pod install
+```
+pod stable install
+```
+
+* pod update
+```
+pod stable update [组件名称] --sync
+```
+> `--sync`选项可选，会自动同步远端标签，不带默认不更新远端版本
+更多用法，参照：pod stable update --help
+
 ## linkline使用
 支持动态/静态库
 

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

@@ -8,7 +8,9 @@ module BB
                 stable_source = StableSource.stable_default_source
             end
             @stable_source = stable_source
-            @bundleId = BB::PodUtils.getProjectBundleIdentifier
+            if File.exist?(File.join(Pathname.pwd, "Podfile"))
+                @bundleId = BB::PodUtils.getProjectBundleIdentifier
+            end
             if @bundleId.nil?
                 @bundleId = 'stable'
             end

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

@@ -11,7 +11,7 @@ module BB
             env = BB::StableEnv.new()
             # puts "SourceManager env:#{env}".red
             @businessSpecName = env.business_stable
-            @stableMgr = BB::StableManager.new()
+            @stableMgr = BB::StableManager.new(env)
         end
 
         # 公共源路径(远端)

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

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

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

@@ -73,17 +73,24 @@ module BB
         # 获取info配置文件路径
         def self.getInfoPlistPath
             path = File.join(getProjectPath, "bbframework/Resources/Info.plist")
-            # puts "InfoPlist:#{path}"
-            raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
-            return path
+            if File.exist?(path)
+                return path
+            end
+            puts "无法找打工程Info.plist配置文件，工程目录:#{getProjectPath}".yellow
+            return nil
+            # raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
+            # return path
         end
         # 获取info配置key对应的值
         def self.getValueFromInfoPlist(key)
             plistPath = getInfoPlistPath
-            value = `/usr/libexec/PlistBuddy -c "Print #{key}" #{plistPath}`
-            value = value.rstrip()
-            puts "#{key} => #{value}"
-            return value
+            if !plistPath.nil?
+                value = `/usr/libexec/PlistBuddy -c "Print #{key}" #{plistPath}`
+                value = value.rstrip()
+                puts "#{key} => #{value}"
+                return value
+            end
+            return ""
         end
         # 获取Xcode版本
         def self.xcode_version

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

@@ -49,7 +49,7 @@ module BB
             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}"
+                  system "cd #{cachePath}; git checkout #{stable_branch}; git reset --hard origin/#{stable_branch}; git pull --all"
                 end
                 if stable_tag
                   system "cd #{cachePath}; git checkout #{stable_tag};"
@@ -57,7 +57,7 @@ module BB
               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}"
+                system "cd #{cachePath}; git checkout #{protechBranch}; git reset --hard origin/#{protechBranch}; git pull --all"
               end
             else
               puts "❌ stable配置无效分支信息source:#{@stable_source} branch:#{stable_branch}".red

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

@@ -1,9 +1,11 @@
 require 'cocoapods-bb-PodAssistant/config/stable_specs'
 require 'cocoapods-bb-PodAssistant/helpers'
+require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 
 module BB
     class StableManager
-        def initialize()
+        def initialize(env = nil)
+            @env = env
         end
         
         # podfile 更新配置文件使用(通用)
@@ -11,8 +13,16 @@ module BB
             update_stable_lock(public_stable_yaml, pod_targets)
         end
         # podfile 更新配置文件使用(业务线)
-        def update_business_stable_lock(businessSpecName, pod_targets)
-            update_stable_lock(business_stable_yaml(businessSpecName), pod_targets)
+        def update_business_stable_lock(pod_targets)
+            if @env.nil?
+                @env = BB::StableEnv.new()
+            end
+            businessSpecName = @env.business_stable
+            if !businessSpecName.nil?
+                update_stable_lock(business_stable_yaml(businessSpecName), pod_targets)
+            else
+                puts "没有配置业务线公共源，请确认!!!".yellow
+            end
         end
          # podfile 更新配置文件使用(项目)
          def update_product_stable_lock(pod_targets)
@@ -65,21 +75,24 @@ module BB
             stableMgr.update_common_stable_lock(pod_targets)
         end
         # podfile 更新配置文件使用(业务线)
-        def self.updateBusinessStableLock(businessSpecName, pod_targets)
+        def self.updateBusinessStableLock(pod_targets)
             stableMgr = StableManager.new()
-            stableMgr.update_stable_lock(businessSpecName, pod_targets)
+            stableMgr.update_business_stable_lock(pod_targets)
         end
         # 更新产品lock
         def self.updateProductStableLock(pod_targets)
             stableMgr = StableManager.new()
             stableMgr.update_product_stable_lock(pod_targets)
         end
+        # pod助手ruby文件路径
+        def self.pod_assistant_path()
+            stableMgr = StableManager.new()
+            return File.join(stableMgr.cachePath, "PodAssistant/PodAssistant.rb") #名称固定
+        end
+        # pod助手机器人ruby文件路径
+        def self.pod_assistant_robot_path()
+            stableMgr = StableManager.new()
+            return File.join(stableMgr.cachePath, "PodAssistant/robot.rb") #名称固定
+        end
     end
-
-    # class << self
-    #     def updateCommonStableLock(pod_targets)
-    #         stableMgr = StableManager.new()
-    #         stableMgr.update_common_stable_lock(pod_targets)
-    #     end
-    # end
 end

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

@@ -82,8 +82,17 @@ module Pod
             BB::StableManager.updateCommonStableLock(installer.pod_targets)
         end
         # 更新业务公共lock
-        def update_business_stable_lock(businessSpecName, pod_targets)
-            BB::StableManager.updateBusinessStableLock(businessSpecName, pod_targets)
+        def update_business_stable_lock(installer)
+            BB::StableManager.updateBusinessStableLock(installer.pod_targets)
+        end
+
+        # pod助手ruby文件路径
+        def pod_assistant_path()
+            return BB::StableManager.pod_assistant_path
+        end
+        # pod助手机器人ruby文件路径
+        def pod_assistant_robot_path()
+            return BB::StableManager.pod_assistant_robot_path
         end
         
         # 从列表中搜索得到对应配置

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core