cocoapods-tdf-bin 0.0.20 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c0aa092f0b877d34f9d83f058a11fd05a1ba66970ea31d052139c6cf20ce067
-  data.tar.gz: 84105568bae6e85ba0a53fba5920542e3bcdd98dfd1c0cdb63c299f40c880b85
+  metadata.gz: b12ad3159d7e92f44ffd550df9bf4d09646c07769d9feea345778edf575ccb8c
+  data.tar.gz: cc4bee203d36048b9ca59b9e83f10cf5ba2e1bc77458ebd9a4399b046984bcfa
 SHA512:
-  metadata.gz: c11d27a445a8e609e2eee91dc2d82bd23ed8fcdb43f435173d728963f96a1bfd1767f514ac597bbc12c2c89fab4b329325cc57f37e2ff227815245e76788451a
-  data.tar.gz: e444caa31f9bc67f4e06770d57f738e9906a1fd57082f8108f611af260116fa3214db85a2d68198f0cfcc4e9b5cfc3aae57d8f6d21f683bdcb5dae92c462da21
+  metadata.gz: 21663273f73583007da2afb7c44fdfbe7dd287b4e402f3ec9887b89affbe7b4646fc8674a3cabd302534e93678b2b6822e98d4ca50a6f952b2a98378bb481d3f
+  data.tar.gz: 90212296c1ecde617fe82904aee89e295770f02467678a3fa8f2eb8076e22fc6b6da71c3268074c9178f1a2525f830a7cad8a4a4be1dd18bbf8119970357114e

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

@@ -56,7 +56,7 @@ module Pod
           local_pods.each_key do |name|
             path = local_pods[name][0][:path]
             repo_url = find_repo_with_pod(name)
-            puts "============== #{name} 开始 clone 到 #{path}==============".blue
+            puts "============== #{name} 开始 clone 到 #{path}==============".tdf_blue
             puts `git clone #{repo_url} #{path}`
           end
         end
@@ -64,8 +64,15 @@ module Pod
         def run_git(podfile_instance)
           podfile_instance.get_batch_local_pods.each_value do |value|
             path = value[0][:path]
-            arg = @arguments.join(" ")
-            puts "============== #{path} 开始执行 git #{arg} 命令 ==============".blue
+            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
         end
@@ -79,7 +86,7 @@ module Pod
             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}  当前组 #{group_name} ==============".tdf_blue
 
             group_key = "#{group_name}&&#{current_branch}"
             repo_arr = group_map[group_key]
@@ -101,17 +108,29 @@ module Pod
             end
             group = key.split("&&")[0]
             branch = key.split("&&")[1]
-            pod_remote_str << "  ], \"#{branch}\", \"#{group}\"\n\n"
+            pod_remote_str << "  ], \"#{branch}\", \"#{group}\" \n\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)

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.20'
+  VERSION = '0.0.24'
 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

metadata

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