cocoapods-tools 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89cd61478c61af9d6ccd3dc9dbc35619446a20986b670b50cfec9acbff2a70ce
-  data.tar.gz: af3adc677e9b1951620889c2bcdf2124ed62735d7a977f99436de399514fec42
+  metadata.gz: fbf3c000c6d717670638d82e28cfc181c9228b3242301300af3e4ba9f142ad28
+  data.tar.gz: d5f9c0d4bca3e37cd5e8440ac49327b6deaf8e01bdf94164d6cb08249d69a56f
 SHA512:
-  metadata.gz: 6884d09b4062e435a76690aea519f95fa1026cb98ca1c2394d49ed872096636c0b9a5bd68e638291a74af09f69e3801395e0d4808d8dd625df6d29e8ab9e0376
-  data.tar.gz: ede81f910049610f3c86de6ecccdd4f2010a7b15092b6ba6f6acfb8c7f8504174df4bbad744643caf22298784eda629789c53cd6492f2fdb88f90a635c2cb3be
+  metadata.gz: 32317ed32996bfe9032242e04bcea0202e80f4be79ed89aa09334349383381f186f35d595ab6af8e671a8360fa0b7ed8dcea9a1ea22183d5b177606f8f06d846
+  data.tar.gz: c263bc69d9c0db096bf53ea627ce94ffd6d989b5ba8b451dea169839bb55c5448f05ec0b01a92825df7508ee60497088466e34efcd049438a3110197a0f19f9d

data/lib/cocoapods-tools/command/git/component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module CocoapodsTools
+  # 组件类
+  class Component
+
+    attr_accessor :component_name, :component_url, :component_branch
+
+    def initialize(name, url, branch)
+      @component_name = name
+      @component_url = url
+      @component_branch = branch
+    end
+  end
+end

data/lib/cocoapods-tools/command/git/gt.rb

@@ -0,0 +1,27 @@
+require 'cocoapods-tools/helper/color'
+
+module CocoapodsTools
+  # This command uses an argument for the extra parameter, instead of
+  # subcommands for each of the flavor.
+  class GT < Command
+
+    require 'cocoapods-tools/command/git/merge'
+
+    self.summary = 'cocoapods gt'
+
+    self.description = 'cocoapods gt'
+
+    self.arguments = [
+      CLAide::Argument.new('merge', '1.0')
+    ]
+
+    def self.options
+      [%w[merge 自动打合并组件]].concat(super)
+    end
+
+    def initialize(argv)
+      @tag = argv.flag?('merge')
+      super
+    end
+  end
+end

data/lib/cocoapods-tools/command/git/merge.rb

@@ -0,0 +1,180 @@
+require 'cocoapods-tools/helper/color'
+require 'fileutils'
+require 'git'
+require 'rubygems'
+require 'cocoapods-tools/command/git/component'
+
+module CocoapodsTools
+  # This command uses an argument for the extra parameter, instead of
+  # subcommands for each of the flavor
+  class Merge < GT
+
+    self.summary = 'ht git merge'
+
+    self.description = 'ht git merge'
+
+    self.arguments = [
+      # CLAide::Argument.new('TAG_VERSION', false, false),
+    ]
+
+    def self.options
+      []
+    end
+
+    def initialize(argv)
+      @arguments = argv.arguments!
+      super
+    end
+
+    def validate!
+      super
+      # puts Color.color_text('validate spec', Color.green)
+      help! '输入参数过多' if @arguments.count > 1
+    end
+
+    def run
+      super
+
+      return 
+      # 1. 初始化
+      # current_branch：当前分支（主工程）。验证是否时最大分支，不是则报错提醒
+      # develop_branch：版本开发主分支
+      # need_merges: 需要手动合并的分支
+      # success_merges: 合并成功的分支
+      # pod_file: 读取 Podfile 文件
+      # change_components: 解析当前分支改动的组件，以当前分支名匹配
+      #
+      # 2. 遍历所有组件，进行合并分支操作
+      # component_dir: 修改工作目录，进入组件文件夹
+      # git reset：根据主工程当前分支，拉取组件远端仓库最新代码
+      # set-upstream-to：关联当前分支与 develop 分支
+      # git merge：检查当前分支与 develop 分支有无变动
+      #   有变动：加入 need_merges
+      #   无变动：合并操作
+
+      # 3. 输出执行结果
+      # ["need_merges": [], "success_merges": []]
+
+      # current_branch：当前分支（主工程）。验证是否时最大分支，不是则报错提醒
+      working_dir = Pathname.pwd
+      g = Git.open(working_dir)
+      current_branch = g.current_branch
+      puts Color.color_text "当前分支: #{current_branch}", Color.red
+
+      # 主业务线分支
+      business_branches = %w[/keep/ /voiceroom/ /live/ /vip/]
+      # 判断当前分支是否为业务线分支
+      is_business_branch = false
+      business_name = ''
+      business_version = ''
+      business_branches.each do |business|
+        next unless current_branch.include?(business)
+
+        business_version = current_branch.split(business).last
+        business_branch = (business_version.gsub '.', '').to_i
+        unless business_branch.is_a?(Numeric)
+          puts Color.color_text '非业务线版本分支，停止合并操作', Color.red
+          return
+        end
+
+        is_business_branch = true
+        business_name = business
+
+        remote_branches = g.branches.remote.select { |bran| bran.name.include? business }
+        remote_branches.each do |bran|
+          version = (bran.name.split(business).last.gsub! '.', '').to_i
+          if version.is_a?(Numeric) && version > business_branch
+            puts Color.color_text '非业务线最新版本分支，停止合并操作', Color.red
+            return
+          end
+        end
+
+        break
+      end
+
+      unless is_business_branch
+        puts Color.color_text '非业务线分支，停止合并操作', Color.red
+        return
+      end
+
+      puts Color.color_text "#{business_name.gsub! '/', ''} 业务线最新分支为：#{business_version}", Color.green
+
+      business_version.join('.') unless business_version.include? '.'
+      # 版本开发主分支
+      develop_branch = "develop/#{business_version}"
+      # 需要手动合并的分支
+      need_merges = []
+      # 合并成功的分支
+      success_merges = []
+      # change_components: 解析当前分支改动的组件，以当前分支名匹配
+      change_components = []
+      # 读取 Podfile 文件
+      File.open('Demo/Podfile').each do |line|
+        current_branch_without_dot = current_branch.gsub '.', ''
+        unless !(line.include? '#') && ((line.include? current_branch) || (line.include? current_branch_without_dot))
+          next
+        end
+
+        params = line.split ','
+        name = (params.first.split '\'').last
+        url = (params[1].split '\'').last
+        branch = (params[2].strip.split '\'').last
+        change_components.append(Component.new(name, url, branch))
+      end
+
+      # 测试用例
+      component = Component.new('Test2', 'ssh://git@git', '466')
+
+      # 对所有变动分支进行合并
+      # change_components.each do |component|
+      [component].each do |component|
+
+        # 组件总文件夹
+        component_parent_path = '../iOSLib'
+        FileUtils.makedirs(component_parent_path) unless File.exists? component_parent_path
+        Dir.chdir(component_parent_path) do
+          unless File.exists? component.component_name
+            Git.clone(component.component_url, component.component_name, branch: component.component_branch)
+          end
+
+          Dir.chdir(component.component_name) do
+            component_git = Git.open('./')
+            feature_branch_name = component.component_branch
+            component_git.checkout(feature_branch_name)
+            remote_develop_branch = component_git.branches["origin/#{develop_branch}"]
+            component_git.branch(develop_branch).checkout
+
+            # 每个组件都合并业务线分支和主分支
+            ['origin/master', "origin/#{feature_branch_name}"].each do |branch|
+              puts Color.color_text "=======开始合并 #{component.component_name} 组件 #{branch} 分支=======", Color.green
+              merge_result = system("git merge #{branch} -m '合并组件分支'")
+
+              if remote_develop_branch.nil? # 开发分支当前版本不存在
+                system("git push --set-upstream origin #{develop_branch}")
+                puts Color.color_text "#{component.component_name} 组件 #{branch} 分支合并成功！", Color.green
+                success_merges.append("#{component.component_name}-#{branch}")
+              elsif merge_result # 合并成功
+                system("git push origin #{develop_branch}")
+                puts Color.color_text "#{component.component_name} 组件 #{branch} 分支合并成功！", Color.green
+                success_merges.append("#{component.component_name}-#{branch}")
+              else # 存在冲突
+                abort_result = system('git merge --abort')
+                if abort_result
+                  puts Color.color_text "#{component.component_name} 组件 #{branch} 分支存在冲突，请手动合并！", Color.red
+                  need_merges.append("#{component.component_name}-#{branch}")
+                else
+                  puts Color.color_text "#{component.component_name} 组件 #{branch} 无变更，不需要合并！", Color.green
+                end
+              end
+            end
+          end
+        end
+
+        puts '==============合并结果=============='
+        puts Color.color_text "合并成功：#{success_merges}", Color.green
+        puts Color.color_text "需要手动合并：#{need_merges}", Color.red
+        puts '==================================='
+      end
+    end
+  end
+end

data/lib/cocoapods-tools/command/spec/tag.rb

@@ -1,5 +1,8 @@
 require 'cocoapods-tools/helper/color'
 require 'fileutils'
+require 'git'
+require 'open3'
+require 'cocoapods-tools/helper/color'
 
 module CocoapodsTools
   # This command uses an argument for the extra parameter, instead of
@@ -12,7 +15,7 @@ module CocoapodsTools
     self.description = 'cocoapods spec tag'
 
     self.arguments = [
-      # CLAide::Argument.new('TAG_VERSION', false, false),
+      CLAide::Argument.new('TAG_VERSION', false, false),
     ]
 
     def self.options
@@ -33,276 +36,132 @@ module CocoapodsTools
     def run
       super
 
-      # 搜索podspec路径
-      podspec_path = ''
-      find_podspec_path = Pathname.pwd
-
-      # 有可能存在多个 podspec，当用户没有指定时，需要给用户自主选择
-      pod_specs = find_podspec_path.children.select { |pn| pn.extname == '.podspec' }
-      example_path = Pathname.new("#{find_podspec_path}/Example").expand_path
-      project_path = example_path.children.select { |pn| pn.extname == '.xcodeproj' }.first
-      project_name = File.basename(project_path, '.*')
-      default_name = "#{project_name}.podspec"
-      podspec_path = default_name
-
-      # 默认为工程名同名的 spec
-      # default_name = "#{project_name}.podspec"
-      # spec_default = pod_specs.select { |path| path.basename.to_s == default_name }.first
-      spec_default = "#{project_name}.podspec"
-
-      if pod_specs.count > 1
-        input_tag = true
-        serial = 0
-        puts Color.color_text(
-          "Find #{pod_specs.count} podspec files, please enter the serial number selection:\n(default:#{spec_default})", Color.white)
-        while input_tag
-          (0...pod_specs.count).each do |i|
-            puts "#{i + 1}. #{pod_specs[i]}"
-          end
-          serial = $stdin.gets.chomp
-          input_tag = (serial.to_i > pod_specs.count || serial.to_i <= 0)
-          if serial.empty?
-            input_tag = false
-            podspec_path = spec_default
-          elsif input_tag
-            puts "Input serial = #{serial}, it's invalid and you need to input 1~#{pod_specs.count}:"
-          else
-            input_tag = false
-            podspec_path = pod_specs[serial.to_i - 1]
-          end
+      # 工作目录
+      working_dir = Pathname.pwd
+      # pod 私有源库名
+      pod_spec_name = 'libspec'
+      # pod 私有源路径
+      pod_spec_path = Pathname.pwd.parent + pod_spec_name
+      # pod 私有源仓库
+      pod_repo_url = 'ssh://git@htsz.hellotalk.net:7999/~panda/libspec.git'
+
+      # 上传私有索引库
+      # 新 tag
+      new_tag_name = @arguments[0].to_s
+      # 版本号
+      last_tag_name = ''
+
+      # 初始化组件源码 git
+      pod_source_git = Git.open(working_dir)
+
+      # 取最近的 tag 号
+      max_tag_no = -1
+      pod_source_git.tags.each do |tag|
+        tag_name = tag.name
+        tag_no = (tag_name.gsub '.', '').to_i
+        if max_tag_no < tag_no
+          max_tag_no = tag_no
+          last_tag_name = tag_name
         end
-      elsif pod_specs.count == 1
-        podspec_path = pod_specs.first.split.last
-      else
-        puts color_text("Can't find any podspec file", Color.red)
-        return
       end
 
-      if !File.exist?(podspec_path)
-        puts ("找不到 podspec 文件: #{podspec_path}, 请确认当前路径")
-        return
-      else
-        puts "Ready to deal with podspec named #{Color.color_text(podspec_path.to_s, Color.white)}"
-      end
-
-      # 在当前podspec目录下新建一个临时 need_delete_temp.podspec 文件
-      podspec_dir = File.dirname podspec_path
-      podspec_absolute_path = "#{find_podspec_path}/#{podspec_path}"
-      temp_podspec_path = "#{podspec_dir}/need_delete_temp.podspec"
-      temp_podspec_absolute_path = "#{find_podspec_path}/#{temp_podspec_path}"
-
-      cur_version = ''
-      # 读取当前podspec文件的版本
-      File.open(podspec_absolute_path, 'r+') do |f|
-        f.each_line do |line|
-          # 查找.version
-          version_desc = /.*\.version\s*=.*/.match line
-          next if version_desc.nil?
-
-          cur_version = version_desc.to_s.split('=').last.to_s.gsub("'", '')
-          cur_version = cur_version.gsub(' ', '')
-          break
-        end
+      # 上次提交 sha
+      last_commit = pod_source_git.log(1).first
+      # 最近 tag 对应的提交 sha
+      last_tag = pod_source_git.tag(last_tag_name)
+      # 读取两个 sha 间的文件变更
+      changes = `git log --name-only --pretty=oneline --full-index #{last_commit}...#{last_tag} | grep -vE '^[0-9a-f]{40} ' | sort | uniq`
+      puts Color.color_text "===== 与 tag：#{last_tag_name} 对比，所有文件变更如下 ======", Color.green
+      puts changes
+      puts Color.color_text '==================变更文件打印结束=================', Color.green
+
+      specs = []
+      Dir.entries(working_dir).each do |sub|
+        specs.push(sub) if File.directory?(sub) && !sub.include?('.') && changes.include?("#{sub}/#{sub}")
       end
 
-      puts Color.color_text('Current version = ', Color.white) + Color.color_text(cur_version.to_s, Color.green)
-
-      # 自定义版本号
-      if @arguments.count == 1
-
-        input_version = @arguments.first
-        puts Color.color_text "不输入时默认自增。本次已输入，版本号：#{input_version}", Color.white
-
-        # 判断输入的version是否>当前的版本号
-        input_v_s = input_version.to_s.split('.')
-        cur_v_s = cur_version.split('.')
-        # 比较的位置，从最左边开始
-        v_index = 0
-        # 输入的version是否有效
-        input_valid = false
-        while v_index < cur_v_s.count && v_index < input_v_s.count do
-          if input_v_s[v_index].to_i > cur_v_s[v_index].to_i
-            # 说明用户输入的version比当前的大
-            input_valid = true
-            break
-          elsif input_v_s[v_index].to_i == cur_v_s[v_index].to_i
-            v_index += 1
-          else
-            break
-          end
-        end
-
-        puts Color.color_text "版本号 #{input_version} 无效，默认自增", Color.natural if input_valid == false
-      end
-
-      system("touch #{temp_podspec_path}") unless File.exist? temp_podspec_absolute_path
-
-      new_version = ''
-      git_source = ''
-
-      File.open(temp_podspec_absolute_path, 'r+') do |t|
-        File.open(podspec_absolute_path) do |f|
-          f.each_line do |line|
-            # # 查找.version
-            # s.version      = "0.0.2"
-            # 需要注意的是，版本号可以是''，也可以是""
-            write_line = line
-            version_desc = /.*\.version\s*=.*/.match line
-            unless version_desc.nil?
-              version_comes = version_desc.to_s.split('=')
-              if (input_valid == true) && (@arguments.count == 1)
-                new_version = input_version.to_s
-              else
-                version_num = version_comes.last.to_s.gsub("'", '').gsub('"', '').gsub(' ', '')
-                v_s = version_num.split('.')
-                # 处理版本号 0.0.1
-                (0...v_s.count).each do |i|
-                  new_version += if i == v_s.count - 1
-                                   (v_s[i].to_i + 1).to_s
-                                 else
-                                   "#{v_s[i]}."
-                                 end
-                end
+      puts Color.color_text "开始更新组件列表：#{specs}", Color.red
+
+      # 更新组件源码版本号
+      specs.each do |spec|
+        # 读取 podspec 文件
+        podspec_path = working_dir + spec + "#{spec}.podspec"
+        # 修改当前podspec文件的版本
+        File.open(podspec_path, 'r+') do |t|
+          File.open(podspec_path) do |f|
+            f.each_line do |line|
+              # 查找.version
+              # s.version      = "0.0.2"
+              # 需要注意的是，版本号可以是''，也可以是""
+              write_line = line
+              version_desc = /.*\.version\s*=.*/.match line
+              unless version_desc.nil?
+                version_comes = version_desc.to_s.split('=')
+                puts Color.color_text('New Tag Name = ', Color.white) + Color.color_text(new_tag_name.to_s, Color.green)
+                write_line = "#{version_comes.first}= '#{new_tag_name}'\n"
               end
-              puts Color.color_text('New version = ', Color.white) + Color.color_text(new_version.to_s, Color.green)
-              write_line = "#{version_comes.first}= '#{new_version}'\n"
+              t.write write_line
             end
-            source_desc = /.*\.source\s*=.*/.match line
-            unless source_desc.nil?
-              source_desc = /:git.*,/.match source_desc.to_s
-              source_desc = /'.*'/.match source_desc.to_s
-              git_source = source_desc.to_s.gsub("'", '')
-              puts "git source is #{git_source}"
-            end
-            t.write write_line
           end
         end
+        puts Color.color_text('当前版本号 = ', Color.white) + Color.color_text(last_tag_name, Color.green)
       end
 
-      puts Color.color_text('Update version from ',
-                            Color.white) + Color.color_text(cur_version.to_s,
-                                                            Color.green) + Color.color_text(' to ', Color.white) + Color.color_text(new_version.to_s, Color.green)
-
-      # 将新数据反写回到原始podspec中
-      system("cp -f #{temp_podspec_path} #{podspec_path}")
-      system("rm -f #{temp_podspec_path}")
-
-      # pod_repo_name = 'third_specs'
-      # pod_repo_name = ''
-      pod_repo_source = 'ssh://git@office.hellotalk.net:7999/third/third_specs.git'
-      #pod_repo_source = 'ssh://git@172.16.6.10:7999/third/third_specs.git'
-
-      # 处理正式 repo 逻辑，解析当前 repos
-      # pod_repos = `pod repo list`
-      #
-      # # pod_repos = Array.new
-      # # pod_repo = Array.new
-      # curren_pod_name = ''
-      # temp_pod_name = ''
-      # last_line = ''
-      # pod_repos.each_line do |line|
-      #   continue if line == '\n'
-      #
-      #   line = line.gsub(/\n/, '')
-      #
-      #   if line.include?('- Type:')
-      #     temp_pod_name = last_line
-      #   elsif line.include?('- URL:')
-      #     repo_url = line.split('- URL:').last.gsub(/ /, '')
-      #     if repo_url == pod_repo_source
-      #       pod_repo_name = temp_pod_name
-      #       break
-      #     end
-      #   end
-      #   last_line = line
-      # end
-      #
-      # if pod_repo_name == ''
-      pod_repo_name = pod_repo_source.split('/').last.split('.').first
-      #   puts Color.color_text("Add pod repo named '#{pod_repo_name}' with source: #{pod_repo_source}", Color.white)
-      #   system("pod repo add #{pod_repo_name} #{pod_repo_source}")
-      # end
-
-      # 提交代码到远程仓库
-      puts Color.color_text('Start upload code to remote', Color.white)
-
-      system("git commit -am 'update version to #{new_version}'")
-      Color.die_log('[!] git push code error') if system('git push origin master') == false
-      system("git tag #{new_version}")
-      if system('git push origin --tags') == false
-        Color.die_log('[!] git push tags error')
-        return
+      # 更新组件版本号私有库
+      unless File.exists? pod_spec_path
+        puts Color.color_text("Init Spec Repo... ☕️! Current tag = #{last_tag_name}", Color.green)
+        Git.clone(pod_repo_url, podspec_path, tag: last_tag_name)
       end
 
-      # 获取当前 repo 缓存路径，建立新版本 spec 的文件夹
-      home_dir ||= Pathname.new(ENV['CP_HOME_DIR'] || '~/.cocoapods').expand_path
-      specs_git_syn = Pathname.new("#{home_dir}/specs_git_syn").expand_path
-      FileUtils.mkdir_p(specs_git_syn) unless specs_git_syn.exist?
-
-      pod_spec_dir = Pathname.new("#{specs_git_syn}/#{pod_repo_name}").expand_path
-
-      Dir.chdir(specs_git_syn) do
-        # 同步文件夹中，没有当前源则克隆
-
-        system("git clone #{pod_repo_source} #{pod_spec_dir}") unless pod_spec_dir.exist?
-
-        pod_repo_dir = Pathname.new("#{pod_spec_dir}/#{project_name}").expand_path
-
-        # 添加最新版本文件夹
-        version_dir = Pathname.new("#{pod_repo_dir}/#{new_version.to_s}").expand_path
-        FileUtils.mkdir_p(version_dir, mode: 0o755)
-
-        # 将修改版本号的 spec 文件拷贝进去
-        spec_repo_path = Pathname.new("#{version_dir}/#{podspec_path}").expand_path
-        system("cp -f #{podspec_absolute_path} #{spec_repo_path}")
+      # 更新组件版本号私有库
+      Dir.chdir(pod_spec_path) do
+
+        pod_spec_git = Git.open(pod_spec_path)
+        # ruby open 会重置代码，下方操作没必要
+        # pod_spec_git.checkout('master', { f: true })
+        # pod_spec_git.pull
+
+        specs.each do |spec|
+          pod_repo_spec_sorce = working_dir + spec + "#{spec}.podspec"
+          pod_repo_path = pod_spec_path + spec
+          new_tag_path = pod_repo_path + new_tag_name
+          FileUtils.mkdir_p(pod_repo_path, mode: 0o755) unless pod_repo_path.exist?
+          Dir.chdir(pod_repo_path) do
+            if new_tag_path.exist?
+              Color.die_log("[!] #{spec}组件#{new_tag_name}版本已存在，请确认后继续执行。")
+              # 发布时打开
+              # return
+            else
+              FileUtils.mkdir_p(new_tag_path, mode: 0o755)
+            end
 
-        # 进入当前源对应的同步文件夹
-        Dir.chdir(pod_spec_dir) do
-          # git 提交到私有源
-          puts Color.color_text("Start push pod '#{pod_spec_dir}' to remote repo '#{pod_repo_name}'", Color.white)
-          system('git add .')
-          system("git commit -am 'update version to #{new_version}'")
-          Color.die_log('[!] git push code error') if system('git push origin master') == false
-          system("git tag #{new_version}")
-          if system('git push origin --tags') == false
-            Color.die_log('[!] git push tags error')
-            return
+            pod_repo_spec_dest = new_tag_path + "#{spec}.podspec"
+            if pod_repo_spec_dest.exist?
+              Color.die_log("[!] #{spec}组件#{new_tag_name}版本 podspec 已存在，请确认后继续执行。")
+              # 发布时打开
+              # return
+            else
+              FileUtils.copy_file(pod_repo_spec_sorce, pod_repo_spec_dest)
+            end
           end
-          puts Color.color_text("Update success ☕️! Current version = #{new_version}", Color.green)
-
         end
 
+        # git 提交到私有源
+        puts Color.color_text("Start push pod repo to remote repo '#{pod_spec_name}'", Color.white)
+        pod_spec_git.add
+        pod_spec_git.commit_all("组件库tag：#{new_tag_name}")
+        pod_spec_git.push
+        puts Color.color_text("Update success ☕️! Current version = #{new_tag_name}", Color.green)
       end
-    end
-
-    # system("pod repo update #{pod_repo_name}") unless specs_dir.exist?
-    # FileUtils.mkdir_p(specs_dir) unless specs_dir.exist?
-
-    # 验证podspec格式是否正确
-    # if verify_podspec_format == true
-    #   puts Color.color_text("Start verify podspec '#{podspec_path}'...", Color.white)
-    #   if system("pod lib lint #{podspec_path} --allow-warnings") == false
-    #     die_log("[!] pod spec' format invalid")
-    #     return
-    #   end
-    # end
 
-    # 提交pod spec到spec仓库
-    # puts Color.color_text("Start push pod '#{podspec_path}' to remote repo '#{pod_repo_name}'", Color.white)
-    # system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings")
-    # puts Color.color_text("Update success ☕️! Current version = #{new_version}", Color.green)
-
-    # if pod_repo_name == 'trunk'
-    #   if (is_static_lib == true ? system("pod trunk push #{podspec_path} --allow-warnings --use-libraries") : system("pod trunk push #{podspec_path} --allow-warnings")) == false
-    #     puts "If not timeout, you need to check your 'trunk' account like: 'pod trunk me', and register code is 'pod trunk register <your email> <your name>'"
-    #     return
-    #   end
-    # else
-    #   if (is_static_lib == true ? system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings --use-libraries") : system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings")) == false
-    #     return
-    #   end
-    # end
-    #
+      # 提交组件代码到远程仓库
+      puts Color.color_text('Start upload source code to remote', Color.white)
+      pod_source_git.add
+      pod_source_git.commit("组件库tag：#{new_tag_name}")
+      pod_source_git.push
+      pod_source_git.add_tag(new_tag_name)
+      puts Color.color_text("Update success ☕️! Current version = #{new_tag_name}", Color.green)
 
+    end
   end
 end

data/lib/cocoapods-tools/command/spec/tag_sigle.rb

@@ -0,0 +1,308 @@
+require 'cocoapods-tools/helper/color'
+require 'fileutils'
+
+module CocoapodsTools
+  # This command uses an argument for the extra parameter, instead of
+  # subcommands for each of the flavor.
+
+  class Tag < Spec
+
+    self.summary = 'cocoapods spec tag'
+
+    self.description = 'cocoapods spec tag'
+
+    self.arguments = [
+      # CLAide::Argument.new('TAG_VERSION', false, false),
+    ]
+
+    def self.options
+      []
+    end
+
+    def initialize(argv)
+      @arguments = argv.arguments!
+      super
+    end
+
+    def validate!
+      super
+      # puts Color.color_text('validate spec', Color.green)
+      help! '输入参数过多' if @arguments.count > 1
+    end
+
+    def run
+      super
+
+      # 搜索podspec路径
+      podspec_path = ''
+      find_podspec_path = Pathname.pwd
+
+      # 有可能存在多个 podspec，当用户没有指定时，需要给用户自主选择
+      pod_specs = find_podspec_path.children.select { |pn| pn.extname == '.podspec' }
+      example_path = Pathname.new("#{find_podspec_path}/Example").expand_path
+      project_path = example_path.children.select { |pn| pn.extname == '.xcodeproj' }.first
+      project_name = File.basename(project_path, '.*')
+      default_name = "#{project_name}.podspec"
+      podspec_path = default_name
+
+      # 默认为工程名同名的 spec
+      # default_name = "#{project_name}.podspec"
+      # spec_default = pod_specs.select { |path| path.basename.to_s == default_name }.first
+      spec_default = "#{project_name}.podspec"
+
+      if pod_specs.count > 1
+        input_tag = true
+        serial = 0
+        puts Color.color_text(
+          "Find #{pod_specs.count} podspec files, please enter the serial number selection:\n(default:#{spec_default})", Color.white)
+        while input_tag
+          (0...pod_specs.count).each do |i|
+            puts "#{i + 1}. #{pod_specs[i]}"
+          end
+          serial = $stdin.gets.chomp
+          input_tag = (serial.to_i > pod_specs.count || serial.to_i <= 0)
+          if serial.empty?
+            input_tag = false
+            podspec_path = spec_default
+          elsif input_tag
+            puts "Input serial = #{serial}, it's invalid and you need to input 1~#{pod_specs.count}:"
+          else
+            input_tag = false
+            podspec_path = pod_specs[serial.to_i - 1]
+          end
+        end
+      elsif pod_specs.count == 1
+        podspec_path = pod_specs.first.split.last
+      else
+        puts Color.color_text("Can't find any podspec file", Color.red)
+        return
+      end
+
+      if !File.exist?(podspec_path)
+        puts ("找不到 podspec 文件: #{podspec_path}, 请确认当前路径")
+        return
+      else
+        puts "Ready to deal with podspec named #{Color.color_text(podspec_path.to_s, Color.white)}"
+      end
+
+      # 在当前podspec目录下新建一个临时 need_delete_temp.podspec 文件
+      podspec_dir = File.dirname podspec_path
+      podspec_absolute_path = "#{find_podspec_path}/#{podspec_path}"
+      temp_podspec_path = "#{podspec_dir}/need_delete_temp.podspec"
+      temp_podspec_absolute_path = "#{find_podspec_path}/#{temp_podspec_path}"
+
+      cur_version = ''
+      # 读取当前podspec文件的版本
+      File.open(podspec_path, 'r+') do |f|
+        f.each_line do |line|
+          # 查找.version
+          version_desc = /.*\.version\s*=.*/.match line
+          next if version_desc.nil?
+
+          cur_version = version_desc.to_s.split('=').last.to_s.gsub("'", '')
+          cur_version = cur_version.gsub(' ', '')
+          break
+        end
+      end
+
+      puts Color.color_text('Current version = ', Color.white) + Color.color_text(cur_version.to_s, Color.green)
+
+      # 自定义版本号
+      if @arguments.count == 1
+
+        input_version = @arguments.first
+        puts Color.color_text "不输入时默认自增。本次已输入，版本号：#{input_version}", Color.white
+
+        # 判断输入的version是否>当前的版本号
+        input_v_s = input_version.to_s.split('.')
+        cur_v_s = cur_version.split('.')
+        # 比较的位置，从最左边开始
+        v_index = 0
+        # 输入的version是否有效
+        input_valid = false
+        while v_index < cur_v_s.count && v_index < input_v_s.count do
+          if input_v_s[v_index].to_i > cur_v_s[v_index].to_i
+            # 说明用户输入的version比当前的大
+            input_valid = true
+            break
+          elsif input_v_s[v_index].to_i == cur_v_s[v_index].to_i
+            v_index += 1
+          else
+            break
+          end
+        end
+
+        puts Color.color_text "版本号 #{input_version} 无效，默认自增", Color.natural if input_valid == false
+      end
+
+      system("touch #{temp_podspec_path}") unless File.exist? temp_podspec_absolute_path
+
+      new_version = ''
+      git_source = ''
+
+      File.open(podspec_path, 'r+') do |t|
+        File.open(podspec_path) do |f|
+          f.each_line do |line|
+            # # 查找.version
+            # s.version      = "0.0.2"
+            # 需要注意的是，版本号可以是''，也可以是""
+            write_line = line
+            version_desc = /.*\.version\s*=.*/.match line
+            unless version_desc.nil?
+              version_comes = version_desc.to_s.split('=')
+              if (input_valid == true) && (@arguments.count == 1)
+                new_version = input_version.to_s
+              else
+                version_num = version_comes.last.to_s.gsub("'", '').gsub('"', '').gsub(' ', '')
+                v_s = version_num.split('.')
+                # 处理版本号 0.0.1
+                (0...v_s.count).each do |i|
+                  new_version += if i == v_s.count - 1
+                                   (v_s[i].to_i + 1).to_s
+                                 else
+                                   "#{v_s[i]}."
+                                 end
+                end
+              end
+              puts Color.color_text('New version = ', Color.white) + Color.color_text(new_version.to_s, Color.green)
+              write_line = "#{version_comes.first}= '#{new_version}'\n"
+            end
+            source_desc = /.*\.source\s*=.*/.match line
+            unless source_desc.nil?
+              source_desc = /:git.*,/.match source_desc.to_s
+              source_desc = /'.*'/.match source_desc.to_s
+              git_source = source_desc.to_s.gsub("'", '')
+              puts "git source is #{git_source}"
+            end
+            t.write write_line
+          end
+        end
+      end
+
+      puts Color.color_text('Update version from ',
+                            Color.white) + Color.color_text(cur_version.to_s,
+                                                            Color.green) + Color.color_text(' to ', Color.white) + Color.color_text(new_version.to_s, Color.green)
+
+      # 将新数据反写回到原始podspec中
+      system("cp -f #{temp_podspec_path} #{podspec_path}")
+      system("rm -f #{temp_podspec_path}")
+
+      # pod_repo_name = 'third_specs'
+      # pod_repo_name = ''
+      pod_repo_source = 'ssh://git@office.hellotalk.net:7999/third/third_specs.git'
+      #pod_repo_source = 'ssh://git@172.16.6.10:7999/third/third_specs.git'
+
+      # 处理正式 repo 逻辑，解析当前 repos
+      # pod_repos = `pod repo list`
+      #
+      # # pod_repos = Array.new
+      # # pod_repo = Array.new
+      # curren_pod_name = ''
+      # temp_pod_name = ''
+      # last_line = ''
+      # pod_repos.each_line do |line|
+      #   continue if line == '\n'
+      #
+      #   line = line.gsub(/\n/, '')
+      #
+      #   if line.include?('- Type:')
+      #     temp_pod_name = last_line
+      #   elsif line.include?('- URL:')
+      #     repo_url = line.split('- URL:').last.gsub(/ /, '')
+      #     if repo_url == pod_repo_source
+      #       pod_repo_name = temp_pod_name
+      #       break
+      #     end
+      #   end
+      #   last_line = line
+      # end
+      #
+      # if pod_repo_name == ''
+      pod_repo_name = pod_repo_source.split('/').last.split('.').first
+      #   puts Color.color_text("Add pod repo named '#{pod_repo_name}' with source: #{pod_repo_source}", Color.white)
+      #   system("pod repo add #{pod_repo_name} #{pod_repo_source}")
+      # end
+
+      # 提交代码到远程仓库
+      puts Color.color_text('Start upload code to remote', Color.white)
+
+      system("git commit -am 'update version to #{new_version}'")
+      Color.die_log('[!] git push code error') if system('git push origin master') == false
+      system("git tag #{new_version}")
+      if system('git push origin --tags') == false
+        Color.die_log('[!] git push tags error')
+        return
+      end
+
+      # 获取当前 repo 缓存路径，建立新版本 spec 的文件夹
+      home_dir ||= Pathname.new(ENV['CP_HOME_DIR'] || '~/.cocoapods').expand_path
+      specs_git_syn = Pathname.new("#{home_dir}/specs_git_syn").expand_path
+      FileUtils.mkdir_p(specs_git_syn) unless specs_git_syn.exist?
+
+      pod_spec_dir = Pathname.new("#{specs_git_syn}/#{pod_repo_name}").expand_path
+
+      Dir.chdir(specs_git_syn) do
+        # 同步文件夹中，没有当前源则克隆
+
+        system("git clone #{pod_repo_source} #{pod_spec_dir}") unless pod_spec_dir.exist?
+
+        pod_repo_dir = Pathname.new("#{pod_spec_dir}/#{project_name}").expand_path
+
+        # 添加最新版本文件夹
+        version_dir = Pathname.new("#{pod_repo_dir}/#{new_version.to_s}").expand_path
+        FileUtils.mkdir_p(version_dir, mode: 0o755)
+
+        # 将修改版本号的 spec 文件拷贝进去
+        spec_repo_path = Pathname.new("#{version_dir}/#{podspec_path}").expand_path
+        system("cp -f #{podspec_absolute_path} #{spec_repo_path}")
+
+        # 进入当前源对应的同步文件夹
+        Dir.chdir(pod_spec_dir) do
+          # git 提交到私有源
+          puts Color.color_text("Start push pod '#{pod_spec_dir}' to remote repo '#{pod_repo_name}'", Color.white)
+          system('git add .')
+          system("git commit -am 'update version to #{new_version}'")
+          Color.die_log('[!] git push code error') if system('git push origin master') == false
+          system("git tag #{new_version}")
+          if system('git push origin --tags') == false
+            Color.die_log('[!] git push tags error')
+            return
+          end
+          puts Color.color_text("Update success ☕️! Current version = #{new_version}", Color.green)
+
+        end
+
+      end
+    end
+
+    # system("pod repo update #{pod_repo_name}") unless specs_dir.exist?
+    # FileUtils.mkdir_p(specs_dir) unless specs_dir.exist?
+
+    # 验证podspec格式是否正确
+    # if verify_podspec_format == true
+    #   puts Color.color_text("Start verify podspec '#{podspec_path}'...", Color.white)
+    #   if system("pod lib lint #{podspec_path} --allow-warnings") == false
+    #     die_log("[!] pod spec' format invalid")
+    #     return
+    #   end
+    # end
+
+    # 提交pod spec到spec仓库
+    # puts Color.color_text("Start push pod '#{podspec_path}' to remote repo '#{pod_repo_name}'", Color.white)
+    # system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings")
+    # puts Color.color_text("Update success ☕️! Current version = #{new_version}", Color.green)
+
+    # if pod_repo_name == 'trunk'
+    #   if (is_static_lib == true ? system("pod trunk push #{podspec_path} --allow-warnings --use-libraries") : system("pod trunk push #{podspec_path} --allow-warnings")) == false
+    #     puts "If not timeout, you need to check your 'trunk' account like: 'pod trunk me', and register code is 'pod trunk register <your email> <your name>'"
+    #     return
+    #   end
+    # else
+    #   if (is_static_lib == true ? system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings --use-libraries") : system("pod repo push #{pod_repo_name} #{podspec_path} --allow-warnings")) == false
+    #     return
+    #   end
+    # end
+    #
+
+  end
+end

data/lib/cocoapods-tools/command.rb

@@ -4,6 +4,7 @@ module CocoapodsTools
   class Command < CLAide::Command
 
     require 'cocoapods-tools/command/spec/spec'
+    require 'cocoapods-tools/command/git/gt'
 
     self.abstract_command = true
 

data/lib/cocoapods-tools/version.rb

@@ -1,3 +1,3 @@
 module CocoapodsTools
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - pandaleecn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -35,9 +35,14 @@ files:
 - bin/ht
 - lib/cocoapods-tools.rb
 - lib/cocoapods-tools/command.rb
+- lib/cocoapods-tools/command/git/component.rb
+- lib/cocoapods-tools/command/git/gt.rb
+- lib/cocoapods-tools/command/git/init.rb
+- lib/cocoapods-tools/command/git/merge.rb
 - lib/cocoapods-tools/command/spec/init.rb
 - lib/cocoapods-tools/command/spec/spec.rb
 - lib/cocoapods-tools/command/spec/tag.rb
+- lib/cocoapods-tools/command/spec/tag_sigle.rb
 - lib/cocoapods-tools/helper/color.rb
 - lib/cocoapods-tools/version.rb
 homepage: https://github.com/pandaleecn/cocoapods-tools