cocoapods-tdf-bin 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b12ad3159d7e92f44ffd550df9bf4d09646c07769d9feea345778edf575ccb8c
-  data.tar.gz: cc4bee203d36048b9ca59b9e83f10cf5ba2e1bc77458ebd9a4399b046984bcfa
+  metadata.gz: 791a58d07bcd6abf68f6b1c8b03880555070ce1e8f3fc53beeb35305d6560b87
+  data.tar.gz: 9dbd4643830bffb28819d663b3f00d6587e39493e5382e45d73bfb7261780089
 SHA512:
-  metadata.gz: 21663273f73583007da2afb7c44fdfbe7dd287b4e402f3ec9887b89affbe7b4646fc8674a3cabd302534e93678b2b6822e98d4ca50a6f952b2a98378bb481d3f
-  data.tar.gz: 90212296c1ecde617fe82904aee89e295770f02467678a3fa8f2eb8076e22fc6b6da71c3268074c9178f1a2525f830a7cad8a4a4be1dd18bbf8119970357114e
+  metadata.gz: fc1e341b60778a600c7fd1232de3485df72af05eeac6daa00c3cca13df5efb2f584dcf8b589a0feac90af2058cbbf35226d00a097aa60f855ba4ca39a6930881
+  data.tar.gz: ed9feba4701f605e4b83b9d3b1c8f1360c604561e1cd740df55ddc80067e8540079e232e2822e892004c4570a141749e08477ee955eca8b5793dc3dd34b4dc05

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

@@ -55,7 +55,7 @@ module Pod
           local_pods = podfile_instance.get_batch_local_pods
           local_pods.each_key do |name|
             path = local_pods[name][0][:path]
-            repo_url = find_repo_with_pod(name)
+            repo_url = Batch.find_repo_with_pod(name)
             puts "============== #{name} 开始 clone 到 #{path}==============".tdf_blue
             puts `git clone #{repo_url} #{path}`
           end
@@ -83,12 +83,10 @@ module Pod
           group_map = {}
           local_pods.each_key do |name|
             path = local_pods[name][0][:path]
-            git_url = `git -C #{path} remote get-url --push origin`
             current_branch = `git -C #{path} branch --show-current`.delete!("\n")
-            group_name = get_group_with_repo(git_url)
-            puts "============== #{name} 当前分支 #{current_branch}  当前组 #{group_name} ==============".tdf_blue
+            puts "============== #{name} 当前分支 #{current_branch} ==============".tdf_blue
 
-            group_key = "#{group_name}&&#{current_branch}"
+            group_key = "#{current_branch}"
             repo_arr = group_map[group_key]
             if repo_arr.is_a? Array
               repo_arr << name
@@ -106,9 +104,8 @@ module Pod
             pod_names.each do |name|
               pod_remote_str << "    \"#{name}\",\n"
             end
-            group = key.split("&&")[0]
-            branch = key.split("&&")[1]
-            pod_remote_str << "  ], \"#{branch}\", \"#{group}\" \n\n"
+            branch = key
+            pod_remote_str << "  ], \"#{branch}\" \n"
           end
           puts "将 local_batch 依赖 替换为 \n#{pod_remote_str}".tdf_blue
 
@@ -133,8 +130,8 @@ module Pod
           puts "替换成功".tdf_blue
         end
 
-        def find_repo_with_pod(pod_name)
-          sources = config.sources_manager.all
+        def self.find_repo_with_pod(pod_name)
+          sources = Config.instance.sources_manager.all
           sources = sources.select do |s|
             s.name == "2dfire-cocoapods-spec"
           end
@@ -151,18 +148,7 @@ module Pod
           git_url
         end
 
-        def get_group_with_repo(repo_url)
-          if repo_url.start_with?("http")
-            re = Regexp.new("git.2dfire.net/.*/")
-            repo_group = repo_url.match(re)[0][15..-2]
-          else
-            re = Regexp.new("git.2dfire.net:.*/")
-            repo_group = repo_url.match(re)[0][15..-2]
-          end
-          repo_group
-        end
-
-        private :clone_all, :run_git, :find_repo_with_pod, :done_all, :get_group_with_repo
+        private :clone_all, :run_git, :done_all
 
       end
     end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end
 
 module Pod

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

@@ -2,6 +2,7 @@
 
 require 'cocoapods'
 require 'cocoapods-tdf-bin/native/podfile_env'
+require 'cocoapods-tdf-bin/command/bin/batch'
 
 module Pod
   class Podfile
@@ -24,10 +25,11 @@ module Pod
         end
       end
 
-      def batch_pod_remote(pods, branch , group = 'ios')
+      def batch_pod_remote(pods, branch)
         pod_hash = Hash.new
         pods.each do |name|
-          pod_hash[name] = [ :git => "git@git.2dfire.net:#{group}/#{name}.git", :branch => "#{branch}" ]
+          git_url = Pod::Command::Bin::Batch.find_repo_with_pod(name)
+          pod_hash[name] = [ :git => git_url, :branch => "#{branch}" ]
         end
         if get_batch_remote_pods.nil?
           set_internal_hash_value(BATCH_POD_REMOTE, pod_hash)
@@ -135,5 +137,6 @@ module Pod
     def get_internal_hash_value(key, default = nil)
       internal_hash.fetch(key, default)
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tdf-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel