cocoapods-tdf-bin 0.0.29 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965e339f8eea15bcc092ce5aec87779766eaf08b0ef2b149e656fb99f9b3ee3d
-  data.tar.gz: 8a886b055ee958714e9375a299adc02e7dff365556991f34c62d79ff65033502
+  metadata.gz: 16d408732ce244aa6fa7590f6ff2737677dc5fc46a9f867aa91b034b7b70141a
+  data.tar.gz: e31eb5ad823627d63de950459b59b65e69bff363868ca5a7af962f891c6db4da
 SHA512:
-  metadata.gz: 38eeb96491f2c9f4bcd6a0bf46c2fcf1027849e858795a1d8de29c23e8514f87cd8f9930a1e7739f5a7e54ddc96c29042929faa55c1d931d935c156d8ae4b999
-  data.tar.gz: 627146df6541bc5cd4858f23350a9c329bca13cdb90c775038e521e21f98c90a1b975645bbea4fdc0623462bb823f1b717c1e2d7c15c9cdace44e89458843910
+  metadata.gz: c4d2f61a21673472392f44b043f4d47295197cfe224b1b95090903cae474439b7ec2c75fe3b8f7b3233e2b42ccfe7bb65cb141d0c3e20208edb572b8b90f35e4
+  data.tar.gz: 539e68c18b271e1a4ef853f597b9de5f68259f8dbe2d9dcb67248435d953278028a2c2c6411d360b26f7073c4ade8f845b1a15e33576843be6f0e089935f9ae9

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,33 @@ 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 res
+            if res != 0
+              `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/command/bin/spec/push.rb

@@ -59,8 +59,6 @@ module Pod
                     end
                   end
 
-                  argvs << '--verbose'
-
                   push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
                   push.validate!
                   push.run

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.29'
+  VERSION = "0.0.32"
 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)

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

@@ -120,12 +120,12 @@ module Pod
         use_source_pods = podfile.use_source_pods
 
         # 所有库的个数
-        all_spec_count = 0
+        # all_spec_count = 0
 
         missing_binary_specs = []
         specs_by_target.each do |target, rspecs|
 
-          all_spec_count = all_spec_count + rspecs.count
+          # all_spec_count = all_spec_count + rspecs.count
 
           # use_binaries 并且 use_source_pods 不包含  本地可过滤
           use_binary_rspecs = if podfile.use_binaries? || podfile.use_binaries_selector

metadata

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