cocoapods-linkline 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d117490d018435edb6595c5154d1a7b04c3f279c86c12f66b1b5b54c311271bb
-  data.tar.gz: 503ffc8974e2ba3890a86fb90d8d20a0d87e0c52a2574f09ea422666d1164faa
+  metadata.gz: 44ce7d66915ab09fb0578104356b94e292f6838a273be57d81f9398ee0fa69c4
+  data.tar.gz: 90b2cc8a039a8ef0d14ebe095879ff8d1e198da9c3e2357b1e7631852083af5d
 SHA512:
-  metadata.gz: e5011720de5a848307a2003e4352c0931493959024557b057beb8a9bd698f2086da3e00f9bbd64729e8ace7ea1ae9ed63542f5b268d54bbc69ad4b34d2989993
-  data.tar.gz: f631de91deebfd4dbb71f632bc10429c49d73b9f44c0cd51441b3135f3dc30810be584ebecc9126c780296d6127400dee19b1f86ed3f3d1e4c29e83f6cdcedb3
+  metadata.gz: 37d0810df7d0ed87b2d59ede1c28da87c1c7398b4880e6121a0765f0ae69485b79f8d72d7c7c4f9cc511467136efefc0cfd3f46aa82de5748a9231920793f1f8
+  data.tar.gz: 0c38e25f326762c8c45e115049a2ffe161e7e2636e0a124397b11dd19e77c824e000e4841176aa907e04e32d01d2c8dff4cadb6b5e41e0e7a240cb21ce1568fd

data/lib/cocoapods-linkline/command/stable/stable.rb

@@ -48,7 +48,8 @@ module Pod
 
           #3、fetch newest code
           git_reset
-          git_pull
+          git_fetch
+          git_checkout_and_pull
 
           local = ll_fetch_local_stable_datas
           origin = ll_fetch_origin_stable_datas
@@ -68,15 +69,21 @@ module Pod
             Pod::UI.puts "#{err_msg}".send(:red)
             exit -9001
           end
-          
-          matches = File.read(File.join(Pathname.pwd, "Podfile")).match(/^\s*stable!\s*'([^']+)'(?:,\s*(\w+):\s*'([^']+)')*/m)
-          unless matches
-            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"
+
+          #获取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(matches.to_s)
+          eval(stableCommand.to_s)
         end
 
         def ll_cloneStable
@@ -268,8 +275,42 @@ module Pod
           git('reset','--hard') #fommate git command
         end
 
-        def git_pull 
-           git('pull','origin','main','-f') #fommate git command
+        def git_fetch 
+          git('fetch') #fommate git command
+        end
+
+        def git_checkout_and_pull 
+          if defined? @ll_stable_branch
+            unless git_branch_exists?(@ll_stable_branch)
+              err_msg = "- Error: #{@ll_stable_source} did not exit branch #{@ll_stable_branch}"
+              Pod::UI.puts "#{err_msg}".send(:red)
+              exit -9006
+            end
+
+            git('checkout',@ll_stable_branch) #fommate git command
+            git('pull','origin',@ll_stable_branch,'-f') #fommate git command
+          elsif defined? @ll_stable_tag
+            unless git_tag_exists?(@ll_stable_tag)
+              err_msg = "- Error: #{@ll_stable_source} did not exit tag #{@ll_stable_tag}"
+              Pod::UI.puts "#{err_msg}".send(:red)
+              exit -9007
+            end
+
+            git('checkout',@ll_stable_tag) #fommate git command
+          else
+            protechBranch = git('symbolic-ref','refs/remotes/origin/HEAD').split("/").last.strip || "main"
+            git('checkout',protechBranch)
+            git('pull','origin',protechBranch,'-f')
+          end
+        end
+
+        def git_tag_exists?(tag)
+            git('tag').split("\n").include?(tag)
+        end
+
+        def git_branch_exists?(branch)
+            branchs = git('branch','-a').split("\n")
+            branchs.include?(branch) || branchs.include?('  remotes/origin/' + branch) || branchs.include?('remotes/origin/' + branch)
         end
 
         def git_clone(source, path)

data/lib/cocoapods-linkline/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsLinkline
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-linkline
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - youhui