cocoapods-tdf-bin 0.0.22 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a9056382c20f2100f7822d00940ccbdd7b39f9cb3c351fef8972afd299e06e6
-  data.tar.gz: a64bc11f1037ba6213fe2796009848ae210ddbf29d75cbbffaab078447e2a446
+  metadata.gz: 87ed9c79da19168d3d799acb3e10665686872ea5f7b5d0180da27a1176f7f8d2
+  data.tar.gz: 40d395b273425c1e8e24e71938635f092c784dec1678723ed280707639328847
 SHA512:
-  metadata.gz: df99a6379cd2e1f20914ec71986404ff8c516ae8ad484004989f51c2f6ce2593fc73598a9d66bc01731eb4805784ab8188ecbd339e07cefae63a99d85bf93fc7
-  data.tar.gz: 66783cc41156b058cc4766c480b1b0edb978ebba9fb1307081d7d6e12af58dc135c024fa69b3bea0d5ae8ccd8d0244c74d040c9509b7b938423425b012fae9e9
+  metadata.gz: 4cb6a3cce2436e03b7010e5c5f94f286c342da9d6ee68dca686b86c80e8f74f6e2766d64bdc8d9585405c0bd0cf72677820078fe22671d44b36fbcbe962ac695
+  data.tar.gz: 1f308b97e69f2a6fec68967ae563fcf5ba6cdd6326c538e7212c19acb22facf17a131bc25ee0997148c6303b9ba623328af92c93890d2482bd09cc0bd0e2ba3d

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

@@ -22,7 +22,7 @@ module Pod
         end
 
         def initialize(argv)
-          @arguments = argv.arguments.map
+          @arguments = argv.arguments
           super
         end
 
@@ -55,8 +55,8 @@ 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)
-            puts "============== #{name} 开始 clone 到 #{path}==============".blue
+            repo_url = Batch.find_repo_with_pod(name)
+            puts "============== #{name} 开始 clone 到 #{path}==============".tdf_blue
             puts `git clone #{repo_url} #{path}`
           end
         end
@@ -72,7 +72,7 @@ module Pod
               v
             end
             arg = arg.join(" ")
-            puts "============== #{path} 开始执行 git #{arg} 命令 ==============".blue
+            puts "============== #{path} 开始执行 git #{arg} 命令 ==============".tdf_blue
             puts `git -C #{path} #{arg}`
           end
         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} ==============".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,23 +104,34 @@ 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}".blue
+          puts "将 local_batch 依赖 替换为 \n#{pod_remote_str}".tdf_blue
 
           # 替换 podfile 中的local batch
+          re = / *batch_pod_local *\[([^\].]*)\], *".*"/
           podfile = File.join(Pathname.pwd, "Podfile")
-          podfile_str = File.read(podfile).gsub(/ *batch_pod_local *\[([^\].]*)\], *".*"/, pod_remote_str)
+          podfile_str = File.read(podfile)
+
+          local_pod_str = podfile_str.match(re).to_s
+          local_pod_lines = local_pod_str.to_s.split("\n")
+          local_pod_lines = local_pod_lines.map do |s|
+            "# #{s}"
+          end
+          local_pod_str = local_pod_lines.join("\n")
+          local_pod_str << "\n"
+          pod_remote_str.insert(0, local_pod_str)
+
+          podfile_str = podfile_str.gsub(re, pod_remote_str)
           File.open(podfile, "r+") do |podfile|
             podfile << podfile_str
           end
-          puts "替换成功".blue
+          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
@@ -139,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/config/config.rb

@@ -12,8 +12,8 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-          'code_repo_url' => { description: '源码私有源 Git 地址', default: 'git@git.2dfire.net:ios/cocoapods-spec.git' },
-          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@git.2dfire.net:ios/cocoapods-spec-binary.git' },
+          'code_repo_url' => { description: '源码私有源 Git 地址', default: 'git@git.2dfire.net:app/cocoapods-spec/cocoapods-spec.git' },
+          'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@git.2dfire.net:app/cocoapods-spec-binary/cocoapods-spec-binary.git' },
           'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://iosframeworkserver-shopkeeperclient.app.2dfire.com/download/%s/%s.zip' },
           'binary_upload_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s ', default: 'http://iosframeworkserver-shopkeeperclient.app.2dfire.com/upload/%s/%s.zip' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.22'
+  VERSION = '0.0.26'
 end
 
 module Pod

data/lib/cocoapods-tdf-bin/helpers/string_helper.rb

@@ -1,30 +1,30 @@
 class String
   # colorization
-  def colorize(color_code)
+  def tdf_colorize(color_code)
     "\e[#{color_code}m#{self}\e[0m"
   end
 
-  def red
-    colorize(31)
+  def tdf_red
+    tdf_colorize(31)
   end
 
-  def green
-    colorize(32)
+  def tdf_green
+    tdf_colorize(32)
   end
 
-  def yellow
-    colorize(33)
+  def tdf_yellow
+    tdf_colorize(33)
   end
 
-  def blue
-    colorize(34)
+  def tdf_blue
+    tdf_colorize(34)
   end
 
-  def pink
-    colorize(35)
+  def tdf_pink
+    tdf_colorize(35)
   end
 
-  def light_blue
-    colorize(36)
+  def tdf_light_blue
+    tdf_colorize(36)
   end
 end

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.22
+  version: 0.0.26
 platform: ruby
 authors:
 - gaijiaofan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel