cocoapods-tdf-bin 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a60a204a9efc776e33a292e40562c5bd6e90f14dd3e63926080be837a280a9
-  data.tar.gz: 9181a31ac1374403f099518908fc94c617cbc2c323362e9755f380ae8c18a7cf
+  metadata.gz: 52d79d7c48a4fa498edfe0d2a4676363072fbac3d1edcbef40a3885261213f60
+  data.tar.gz: 9f2481c7880b46e3474650aea259d97432d60abfba3cfdaf45af00c07f467d4f
 SHA512:
-  metadata.gz: bcbe47a985ce1297af94fb8bded55c6f37042b8975bcc002ae055d4c4f54a38153a0cc697c5ed295cb7608f2545490bd2fbbdbbb4e41e95dddd138d7e8fd70b6
-  data.tar.gz: a8f38cbfdbb35db96b6b1d67ad75119c2c943047901a5fe71e46c805d9594c29cf4c97d5e3042b0f3da4d04f0bedd9bef5e765856bda88f12bef277d73de5e6a
+  metadata.gz: e472d730c0ec163ab3ab78c751f5c4ed68e4a401a32771a9e6444a2fc64028ab4e66ae2e4d230aacd0543c4d1dfcd8317466be1cd0b150814eeff2e0bf78d929
+  data.tar.gz: 426600ad46764c5d356a788bdff3ff89487eb146a5e45e0924e5608b6007c98e96a84f98311ddb016bc7d6d8447c0c0528077cda720f0701f2cc10fb644d408f

data/lib/cocoapods-tdf-bin/command/bin/batch.rb

@@ -9,6 +9,11 @@ module Pod
 
         self.summary = "批量操作本地依赖组件的 git 命令"
         self.description = <<-DESC
+          批量导入的例子：
+          batch_pod [
+            "TDFHomeModule",
+            "TDFLogin",
+          ], "../../", :branch => "feature/smallNeeds", :isLocal => true
           用来批量操作通过 batch_pod_local 本地依赖的组件库，比如 pod bin batch pull, pod bin batch checkout master 等等；
           操作的是是通过 batch_pod_local 依赖的本地组件
         DESC
@@ -57,23 +62,35 @@ module Pod
           local_pods = podfile_instance.get_batch_local_pods
           local_pods.each_key do |name|
             path = local_pods[name][0][:path]
+            branch = local_pods[name][0][:branch]
             repo_url = Batch.find_repo_with_pod(name)
             puts "============== #{name} 开始 clone 到 #{path}==============".tdf_blue
             puts `git clone #{repo_url} #{path}`
+            res = `git -C #{path} checkout #{branch}`
+            puts "imwcl1"
+            puts res
+            if res != 0
+              puts "imwcl2"
+              `git -C #{path} checkout -b #{branch}`
+            end 
           end
         end
 
         def run_git(podfile_instance)
+          arg = @arguments.map do |v|
+            match_str = /\s/.match(v)
+            if nil != match_str
+              v = "\"#{v}\""
+            end
+            v
+          end
+          arg = arg.join(" ")
+
+          puts "============== 主工程开始执行 git #{arg} 命令 ==============".tdf_blue
+          puts `git #{arg}`
+
           podfile_instance.get_batch_local_pods.each_value do |value|
             path = value[0][:path]
-            arg = @arguments.map do |v|
-              match_str = /\s/.match(v)
-              if nil != match_str
-                v = "\"#{v}\""
-              end
-              v
-            end
-            arg = arg.join(" ")
             puts "============== #{path} 开始执行 git #{arg} 命令 ==============".tdf_blue
             puts `git -C #{path} #{arg}`
           end

data/lib/cocoapods-tdf-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.30'
+  VERSION = "0.0.31"
 end
 
 module Pod

data/lib/cocoapods-tdf-bin/native/podfile.rb

@@ -13,10 +13,26 @@ module Pod
         set_internal_hash_value(ALLOW_PRERELEASE, true)
       end
 
-      def batch_pod_local(pods, path = "../../")
+      def batch_pod(pods, path = "../../", *requirements)
+        isLocal = requirements[0][:isLocal]
+        branch = requirements[0][:branch]
+        if isLocal.nil?
+          isLocal = false
+        end
+        if branch.nil?
+          branch = "master"
+        end
+        if isLocal
+          batch_pod_local(pods, path, branch)
+        else
+          batch_pod_remote(pods, branch)
+        end
+      end
+
+      def batch_pod_local(pods, path = "../../", branch = "master")
         pod_hash = Hash.new
         pods.each do |name|
-          pod_hash[name] =  [ :path => "#{path}#{name}" ]
+          pod_hash[name] =  [ :path => "#{path}#{name}", :branch => branch ]
         end
         if get_batch_local_pods.nil?
           set_internal_hash_value(BATCH_POD_LOCAL, pod_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel