gct 0.3.95 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a66d72b82441d12f72050bcb612ada7ed56a250b6f647eb7e8828f126dc1285
-  data.tar.gz: 793399e10ac9879a19a6088808f184ba2f1496749bee1b0d113c836bafa71047
+  metadata.gz: 706538e61e101d63b9718a329ba5fd7102b04b136bafe4c7fda01bc6c1d02ca9
+  data.tar.gz: bcba7c7cfef559c1fccf0c583a6c2a2bcf6f775eca9be2463812b1621bc81cc7
 SHA512:
-  metadata.gz: d9d2b0c7d925ec5f9fcb175615d87c9ca9440b836a003449d9afd70e295c46c6ea3ab91223b2cd4d98bef5c0d326c26c179bd1a9962754665a548aec9ae23138
-  data.tar.gz: ea22f65f15803aefaed9e8b447c9d113dc93d78409aa6af4de2c004ca218a1c3057d907af0d17ab6272a25cac976bf8f8a1f83d529e5d05299f5ba66e67b7529
+  metadata.gz: 1247a36c962b9fea025ba28ec47b8a27dbd3fd7d4e1da0b9e9ff4db14436961ab4fcd738b508c9e801e34f06f3746375f86b58c987eb179070087fdea6f55620
+  data.tar.gz: 7c715cec4e38bbc0150d1c5ebd658a2edb485ed15a72af7269e23b4f9912bddd7635b07d7f83566e9226eec89d9e887555c802ec54b4ae8d46fdb2bc3f7e52fa

data/lib/gct.rb

@@ -13,4 +13,8 @@ module Gct
     require "gct/generator/gct_file"
   end
 
+  module Database
+    require "gct/database/data"
+  end
+
 end

data/lib/gct/command.rb

@@ -52,8 +52,6 @@ module Gct
         Colored2.disable!
         String.send(:define_method, :colorize) { |string, _| string }
       end
-
-      config_gitlab 
     end
 
     def file_contents(project_id, file, branch)
@@ -63,7 +61,7 @@ module Gct
     end
 
     def config_gitlab
-      if FileBase.exist_root and token and Gitlab.endpoint.nil?
+      if FileBase.exist_root and token
         Gitlab.configure do |config|
           config.endpoint = 'https://gi-dev.ccrgt.com/api/v4' 
           config.private_token = token       

data/lib/gct/command/autotag.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'tmpdir'
 require 'parallel'
+require 'pp'
 
 module Gct
   class Command
@@ -13,20 +14,27 @@ module Gct
       self.arguments = [
         CLAide::Argument.new('PROJECT_ID', true),
         CLAide::Argument.new('BRANCH', true),
+        CLAide::Argument.new('VERSION', true),
       ]
 
       def initialize(argv)
         gitlab_error
+        config_gitlab
         @update_ci = argv.flag?('update-ci', false)
-        @project_id = "ios/#{argv.shift_argument}"
+        @pre = argv.flag?('pre', false)
+        name = argv.shift_argument
+        @project_id = "ios/#{name}"
+        @project_name = name
         @branch = argv.shift_argument
+        @version = argv.shift_argument
         @file = 'Podfile'
         super
       end
 
       def self.options
         [
-          ['--update-ci', '是否更新CI']
+          ['--update-ci', '是否更新CI'],
+          ['--pre', '是否为预发tag'],
         ].concat(super)
       end
 
@@ -34,11 +42,40 @@ module Gct
         super
         help! '请输入项目名.' unless @project_id
         help! '请输入分支名.' unless @branch
+        help! '请输入版本号.' unless @version
       end
 
       def run
         FileBase.root_err
-        analyze_dependencies
+        puts "开始分析podfile文件".green
+        puts ""
+        where_statement = "and is_pre = #{@pre ? 1 : 0}"
+        p_db = Database::Data.new
+        p_sql = "select * from project where version = '#{@version}' #{where_statement}"
+        p_res = p_db.query(p_sql)
+        
+        if !p_res.nil? && p_res.count > 0 
+          res_first = nil
+          p_res.each do |row|
+            res_first = row
+            break
+          end
+          if res_first["is_done"].to_i == 0
+            tmp_podspecs
+            create_tag_by_priority()
+          else
+            raise "#{@project_name} #{@version} 版本已经打完tag了！！！".red
+          end
+        else
+          keys = "(version, name, branch" + (@pre ? ", is_pre)" : ")")
+          values = "('#{@version}', '#{@project_name}', '#{@branch}'" + (@pre ? ", 1)" : ")")
+          db = Database::Data.new
+          sql = "insert into project #{keys} values #{values}"
+          res = db.query(sql)
+          untagged_specs = analyze_dependencies
+          priority_rank(untagged_specs)
+          create_tag_by_priority()
+        end
       end
 
       def check_branch(branch)
@@ -47,38 +84,85 @@ module Gct
       end
       
       def podfile
-        # if check_branch_can_be_update('zeus')
-        if check_branch('ft/tag') # TODO: Test branch  
-          contents = file_contents(@project_id, @file, @branch)
-          contents.force_encoding('UTF-8')
-          puts contents
-          temp_local_file = TempLocalFile.new(contents, @file)
-          temp_local_file.write
-          full_path = temp_local_file.full_path
-
-          @podfile ||= begin
-            podfile = Pod::Podfile.from_ruby(full_path, contents)
-            podfile
-          end
+        contents = file_contents(@project_id, @file, @branch)
+        contents.force_encoding('UTF-8')
+        temp_local_file = TempLocalFile.new(contents, @file)
+        temp_local_file.write
+        full_path = temp_local_file.full_path
+
+        @podfile ||= begin
+          podfile = Pod::Podfile.from_ruby(full_path, contents)
+          podfile
         end
       end
 
-      def analyze_dependencies 
-        untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagBranch}
+      def tmp_podspecs
+        untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagFromBranch}
+        raise "没有需要打tag的库".red if untagged_git_dependencies.count == 0
 
-        untagged_specs = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
+        spec_files = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
+          project_name = "#{Constant.NameSpace}#{dep.name}"
+          branch = Constant.DefaultTagFromBranch
+          if @pre
+            branch = Constant.PreTagFromBranch
+            create_pre_branch(branch, project_name)
+          end
           file_name = "#{dep.name}.podspec"
-          podspec_contents = file_contents("#{Constant.NameSpace}#{dep.name}", file_name, Constant.DefaultTagBranch)
+          podspec_contents = file_contents(project_name, file_name, branch)
           temp_local_spec_file = TempLocalFile.new(podspec_contents, file_name)
           temp_local_spec_file.write
-          spec_file = temp_local_spec_file.full_path
+          path = temp_local_spec_file.full_path
+          spec = Pod::Specification.from_file(path)
+          remove_tag(auto_add_tag(spec.version.to_s), project_name)
+          path
+        end
+        spec_files
+      end
+      
+      def create_pre_branch(branch, project_name)
+        puts "正在创建#{project_name}预发分支!".green
+        bs = Gitlab.branches(project_name)
+        to_b = Constant.DefaultTagToBranch
+        pre_to_b = Constant.PreTagToBranch
+        from_b = Constant.DefaultTagFromBranch
+        bs.each do |b|
+          if b["name"].eql?(branch)
+            Gitlab.delete_branch(project_name, branch)
+          end
+          if b["name"].eql?(pre_to_b)
+            Gitlab.delete_branch(project_name, pre_to_b)
+          end
+        end
+        Gitlab.create_branch(project_name, branch, from_b)
+        Gitlab.create_branch(project_name, pre_to_b, to_b)
+      end
 
+      def remove_tag(tag, name)
+        # 判断是否有这个tag
+        tag = "#{tag}#{Constant.PreHuffix}"
+        command = `git rev-parse --is-inside-work-tree`
+        if command.eql?("true")
+          `git tag -d #{tag}`
+          `git push origin :refs/tags/#{tag}`  
+        else
+          tags = Gitlab.tags("#{name}")
+          tags.each do |t|
+            if t["name"].eql?("#{tag}")
+              Gitlab.delete_tag("#{name}", "#{tag}")
+              break
+            end
+          end
+        end
+      end
+
+      def analyze_dependencies 
+        untagged_specs = tmp_podspecs.map do |spec_file| 
           # 创建podspec对象
           spec = Pod::Specification.from_file(spec_file)
           gct_spec = Specification.new()
           gct_spec.name = spec.name
           gct_spec.priority = 1000
-          gct_spec.status = SpecPublishStatus::CREATED
+          gct_spec.status = SpecPublishStatus::WAITING
           gct_spec.tag = "0"
           dependencySpecs = Array.new()
           if spec.subspecs.length == 0
@@ -86,7 +170,7 @@ module Gct
               sub_spec = Specification.new()
               sub_spec.name = dep.root_name
               sub_spec.priority = 1000
-              sub_spec.status = SpecPublishStatus::CREATED
+              sub_spec.status = SpecPublishStatus::WAITING
               sub_spec.tag = "0"
               sub_spec
             end 
@@ -97,7 +181,7 @@ module Gct
                 sub_spec = Specification.new()
                 sub_spec.name = dep.root_name
                 sub_spec.priority = 1000
-                sub_spec.status = SpecPublishStatus::CREATED
+                sub_spec.status = SpecPublishStatus::WAITING
                 sub_spec.tag = "0"
                 sub_spec
               end 
@@ -108,8 +192,7 @@ module Gct
           gct_spec.dependencySpecs = dependencySpecs
           gct_spec
         end
-
-        priority_rank(untagged_specs)
+        untagged_specs
       end
 
       def eqlBetweenHash(hash1, hash2) 
@@ -133,12 +216,10 @@ module Gct
           temp_spec_map[spec.name] = spec
         end
         temp_spec_map_copy = Hash.new()
-        count = 1
 
         while !(eqlBetweenHash(temp_spec_map, temp_spec_map_copy)) do
           # 深拷贝
           temp_spec_map_copy = Marshal.load(Marshal.dump(temp_spec_map))
-          puts "--- times == #{count} ---"
           specs.map do |spec| 
             temp_spec = temp_spec_map[spec.name]
             spec.dependencySpecs.map do |subspec| 
@@ -150,10 +231,55 @@ module Gct
               end
             end
           end
-          count += 1
-          temp_spec_map.each { |key, value| 
-            puts "#{key} => #{value.priority}"
-          }
+        end
+
+        values = ""
+        temp_spec_map.each do |key, value| 
+          values.concat("('#{@version}', '#{key}', '#{@project_name}', '#{value.tag}', '#{value.status}', #{value.priority}" + (@pre ? ", 1)," : "),"))
+        end
+        val = values[0, values.length - 1]
+        keys = "(project_version, pod_name, project_name, tag_version, tag_status, priority" + (@pre ? ", is_pre)" : ")")
+        sql = "insert into tag #{keys} values #{val}"
+        db = Database::Data.new
+        db.query(sql)
+      end
+
+      # 按优先级打tag, 触发第一个优先级，其他的上一优先级打完之后自动触发
+      def create_tag_by_priority()
+        db = Database::Data.new
+        # 查询优先级最高的为完成打tag的数据
+        where_statement = "and is_pre = " + (@pre ? "1" : "0")
+        sql = "select * from tag where priority = (select MAX(priority) from tag where project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement})"
+        result = db.query(sql)
+        vals = ""
+        ins = ""
+        if !result.nil? && result.count > 0
+          result.each do |row|
+            if row["tag_status"].eql?(SpecPublishStatus::WAITING) || row["tag_status"].eql?(SpecPublishStatus::CANCELED) || row["tag_status"].eql?(SpecPublishStatus::FAILED)
+              status = SpecPublishStatus::PENDING
+              name = row["pod_name"]
+              vals.concat("when pod_name = '#{name}' then '#{status}' ")     
+              ins.concat("'#{name}',")
+              system "gct update dependency #{name} tag_status #{status}"
+              skip_tag = ""
+              if row["is_tag"].to_i == 1 
+                skip_tag = "--skip-tag"
+              end
+              pre = ""
+              if row["is_pre"].to_i == 1
+                pre = "--pre"
+              end
+              system "gct update tag #{name} --auto-tag --update-ci #{skip_tag} #{pre}"
+            end
+          end
+          f_ins = ins[0, ins.length - 1]
+          sql = "update tag set tag_status = (
+          case 
+          #{vals}
+          end
+          ) where pod_name in (#{f_ins}) and project_version = '#{@version}'"
+          update_db = Database::Data.new
+          update_db.query(sql)
         end
       end
     end

data/lib/gct/command/init/gitlab-ci.rb

@@ -7,10 +7,13 @@ push_pod:
   script: 
     - gct robot start
     - echo "开始lint 和 push podspec"
+    - gct update dependency $CI_PROJECT_NAME "tag_status" "deploying"
     - gct clean lint $CI_PROJECT_NAME
     - gct repo update
     - gct repo push
     - gct robot finish true
+    - gct update dependency $CI_PROJECT_NAME "tag_version" $CI_COMMIT_REF_NAME
+    - gct update next
   only:
     - tags
   tags:
@@ -20,6 +23,7 @@ on_failure:
   stage: failure
   script:
     - gct robot finish false
+    - gct update dependency $CI_PROJECT_NAME "tag_status" "failed"
   when: on_failure
   only: 
     - tags

data/lib/gct/command/robot.rb

@@ -1,5 +1,8 @@
 require 'gct/command/robot/start'
 require 'gct/command/robot/finish'
+require 'gct/command/robot/podfile'
+require 'net/https'
+require 'json'
 
 module Gct
   class Command
@@ -9,6 +12,43 @@ module Gct
       self.description =  <<-DESC
         发送jenkins和gitlab机器人消息
       DESC
+
+      def self.options
+        [
+          ['--test', '测试机器人，测试webhook'],
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @test = argv.flag?('test', false)
+        super
+      end
+
+      def robot_send(content)
+        if @test
+          webhook = FileBase.get_config("gitlab-robot-webhook-test")
+        else
+          webhook = FileBase.get_config("gitlab-robot-webhook")
+        end
+        raise "请先设置webhook --> gct config set gitlab-robot-webhook WEBHOOK_URL" if webhook.nil? || webhook.empty? 
+        url = URI(webhook)
+          
+        http = Net::HTTP.new(url.host, url.port)
+        if url.scheme == "https"
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+        end
+        
+        data = {
+          "msgtype": "markdown",
+          "markdown": {
+            "content": "#{content}"
+          }
+        }.to_json
+        
+        header = {'content-type':'application/json'}
+        response = http.post(url, data, header)
+      end
     end
   end
 end

data/lib/gct/command/robot/finish.rb

@@ -1,5 +1,4 @@
-require 'net/https'
-require 'json'
+
 
 module Gct
   class Command
@@ -33,33 +32,17 @@ module Gct
         end
 
         def run
+          puts @build_status.class
           puts "build_status == #{@build_status}"
-          build_text = @build_status ? "<font color=\"info\">CI运行成功</font>" : "<font color=\"comment\">CI运行失败</font>，请相关人员注意"
-          ci_text = "[点击跳转](#{@ci_url})"
-          
-          if @test
-            webhook = FileBase.get_config("gitlab-robot-webhook-test")
-          elsif
-            webhook = FileBase.get_config("gitlab-robot-webhook")
-          end
-          raise "请先设置webhook --> gct config set gitlab-robot-webhook WEBHOOK_URL" if webhook.nil? || webhook.empty? 
-          url = URI(webhook)
-          
-          http = Net::HTTP.new(url.host, url.port)
-          if url.scheme == "https"
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+          if @build_status.eql?("false")
+            build_text = "<font color=\"comment\">CI运行失败</font>，请相关人员注意"
+          elsif @build_status.eql?("true")
+            build_text = "<font color=\"info\">CI运行成功</font>"
           end
-          
-          data = {
-            "msgtype": "markdown",
-            "markdown": {
-              "content": "**#{@project_name}   #{build_text}**\n\n\n>触发人：#{@user_name}\n\n>tag：#{@tag}\n\n>commitid：#{@commit_sha}\n\n>流水线地址：#{ci_text}"
-            }
-          }.to_json
-          
-          header = {'content-type':'application/json'}
-          response = http.post(url, data, header)
+          ci_text = "[点击跳转](#{@ci_url})" 
+
+          content = "**#{@project_name}   #{build_text}**\n\n\n>触发人：#{@user_name}\n\n>tag：#{@tag}\n\n>commitid：#{@commit_sha}\n\n>流水线地址：#{ci_text}"
+          robot_send(content)
         end
       end
     end

data/lib/gct/command/robot/podfile.rb

@@ -0,0 +1,38 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Robot < Command
+      class Podfile < Robot
+
+        self.summary = 'podfile更新通知'
+        self.description = <<-DESC
+            podfile更新通知
+        DESC
+
+        self.arguments = [
+        ]
+
+        def self.options
+          [
+            ['--test', '测试机器人，测试webhook'],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @project_name = ENV['CI_PROJECT_NAME']
+          @tag = ENV['CI_COMMIT_REF_NAME']
+          @test = argv.flag?('test', false)
+          super
+        end
+
+        def run
+          message = " <font color=\"info\">podfile 更新完毕</font>"
+          content = "#{message}"
+          robot_send(content)
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/robot/start.rb

@@ -28,30 +28,9 @@ module Gct
         end
 
         def run
-          if @test
-            webhook = FileBase.get_config("gitlab-robot-webhook-test")
-          elsif
-            webhook = FileBase.get_config("gitlab-robot-webhook")
-          end
-          raise "请先设置webhook --> gct config set gitlab-robot-webhook WEBHOOK_URL" if webhook.nil? || webhook.empty? 
-          url = URI(webhook)
-          
-          http = Net::HTTP.new(url.host, url.port)
-          if url.scheme == "https"
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
-          end
-          
           message = " <font color=\"info\">#{@tag}</font>  开始打tag"
-          data = {
-            "msgtype": "markdown",
-            "markdown": {
-              "content": "**#{@project_name}** #{message}"
-            }
-          }.to_json
-          
-          header = {'content-type':'application/json'}
-          response = http.post(url, data, header)
+          content = "**#{@project_name}** #{message}"
+          robot_send(content)
         end
       end
     end

data/lib/gct/command/setup.rb

@@ -15,9 +15,18 @@ module Gct
         create_root_folder
         create_temp_folder
         create_config_file
+        create_backup_folder
         puts "setup success!".green
       end
 
+      def create_backup_folder
+        backup_path = Generator::GctFile.backup_folder_path
+        if !File.exist?(backup_path) 
+          system "mkdir #{backup_path}", exception: true
+          puts "#{backup_path} 创建成功!".green
+        end
+      end
+
       def create_root_folder
         gct_path = Generator::GctFile.root_folder_path
         if !File.exist?(gct_path) 

data/lib/gct/command/spec/lint.rb

@@ -22,8 +22,8 @@ module Gct
         end
 
         def run
-          system "pod lib lint --sources=#{Constant.GitURL}iOSCRGTPodSource.git --allow-warnings --verbose --skip-import-validation --use-libraries", exception: true
-          # lint_spec
+          # system "pod lib lint --sources=#{Constant.GitURL}iOSCRGTPodSource.git --allow-warnings --verbose --skip-import-validation --use-libraries", exception: true
+          lint_spec
         end
 
         def generate_podfile(pod_name, spec_path)

data/lib/gct/command/update.rb

@@ -1,5 +1,8 @@
-require 'gct/command/update/tag'
+require 'gct/command/update/dependency'
+require 'gct/command/update/podfile'
 require 'gct/command/update/version'
+require 'gct/command/update/next'
+require 'gct/command/update/tag'
 
 module Gct
   class Command

data/lib/gct/command/update/analyze.rb

@@ -0,0 +1,22 @@
+module Gct
+  class Command
+    class Update < Command
+      class Analyze < Update
+        self.summary = '编译'
+        self.description =  <<-DESC
+          下一个优先级打tag
+        DESC
+
+        def initialize(argv)
+
+          super
+        end
+
+        def run
+          
+        end
+        
+      end
+    end
+  end
+end

data/lib/gct/command/update/dependency.rb

@@ -0,0 +1,43 @@
+require 'mysql2'
+module Gct
+  class Command
+    class Update < Command
+      class Dependency < Update
+
+        self.summary = '更新依赖文件'
+        self.description = <<-DESC
+            更新依赖文件
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', false),
+          CLAide::Argument.new('FIELD', false),
+          CLAide::Argument.new('VALUE', false),
+        ]
+
+        def initialize(argv)
+          @pod_name = argv.shift_argument
+          @field = argv.shift_argument
+          @value = argv.shift_argument
+          super
+        end
+
+        def validate!
+            super
+        end
+
+        def run
+          db = Database::Data.new
+          set_val = ""
+          if (@field.eql?("tag_version"))
+            set_val = "t.#{@field} = '#{@value}', t.tag_status = '#{SpecPublishStatus::SUCCESS}'"
+          else 
+            set_val = "t.#{@field} = '#{@value}'"
+          end
+          sql = "update tag t left join project p on t.project_version = p.version set #{set_val} where t.pod_name = '#{@pod_name}' and p.is_done = 0"
+          db.query(sql)
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/update/next.rb

@@ -0,0 +1,66 @@
+module Gct
+  class Command
+    class Update < Command
+      class Next < Update
+        self.summary = '编译'
+        self.description =  <<-DESC
+          下一个优先级打tag
+        DESC
+
+        def initialize(argv)
+          config_gitlab
+          @project_name = ENV['CI_PROJECT_NAME']
+          super
+        end
+
+        def run
+          db = Database::Data.new
+          sql = "select * from project where is_done = 0 limit 1"
+          res = db.query(sql)
+          if !res.nil? && res.count > 0
+            res.each do |row|
+              @project_name = row["name"]
+              @branch = row["branch"]
+              @version = row["version"]
+              puts "pre is #{row["is_pre"].to_i == 1}"
+              @pre = row["is_pre"].to_i == 1
+              break
+            end
+            batch_tag
+          end
+        end
+
+        def batch_tag 
+          db = Database::Data.new
+          # 查询优先级最高的为完成打tag的数据
+          where_statement = "and is_pre = " + (@pre ? "1" : "0")
+          sql = "select * from tag where priority = (select MAX(priority) from tag where project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement})"
+          result = db.query(sql)
+          puts result.count
+          if result.count == 0
+            puts "tag已全部打完！！！".green
+            # 执行更新podfile的操作
+            system "gct update podfile"
+          else
+            result.each do |row|
+              if row["tag_status"].eql?(SpecPublishStatus::WAITING) || row["tag_status"].eql?(SpecPublishStatus::CANCELED)
+                status = SpecPublishStatus::PENDING
+                name = row["pod_name"]
+                skip_tag = ""
+                if row["is_tag"].to_i == 1 
+                  skip_tag = "--skip-tag"
+                end
+                pre = ""
+                if row["is_pre"].to_i == 1 
+                  pre = "--pre"
+                end
+                system "gct update dependency #{name} status #{status}" 
+                system "gct update tag #{name} --auto-tag --update-ci #{skip_tag} #{pre}"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/update/podfile.rb

@@ -0,0 +1,83 @@
+module Gct
+  class Command
+    class Update < Command
+      class Podfile < Update
+
+        self.summary = '更新podfile文件'
+        self.description = <<-DESC
+          更新podfile文件
+        DESC
+
+        self.arguments = [
+        ]
+
+        def initialize(argv)
+          config_gitlab
+          @version = argv.shift_argument
+          super
+        end
+
+        def validate!
+            super
+        end
+
+        def run
+          initParams
+          update_podfile
+        end
+
+        def initParams
+          db = Database::Data.new
+          sql = "select * from project where is_done = 0 order by 'create_time' desc"
+          result = db.query(sql)
+          result.each do |row|
+            @name = "ios/#{row["name"]}"
+            @branch = row["branch"]
+            @version = row["version"]
+            @file = "Podfile"
+            break
+          end
+        end
+
+        def update_podfile
+          podspec_content = file_contents(@name, @file, @branch)
+          remove_regex = /dev_pod .*/
+          podspec_content = podspec_content.gsub!(remove_regex, "")
+
+          db = Database::Data.new
+          sql = "select * from tag where project_version = '#{@version}'"
+          result = db.query(sql)
+          if result.count == 0
+            puts "ERROR: 没有tag库".red
+            return
+          end
+          result.each do |row|
+            name = row["pod_name"]
+            tag = row["tag_version"]
+            update_regex = /.*#{name}.*/
+            update_match = update_regex.match(podspec_content).to_s
+            update_str = "  pod '#{name}', '#{tag}'"
+            if update_match.empty?
+              empty_match = "# Pods for iLife"
+              podspec_content = podspec_content.gsub!(empty_match, "#{empty_match} \n#{update_str}")  # Pods for iLife
+            else 
+              podspec_content = podspec_content.gsub!(update_match, update_str)
+            end
+          end
+
+          edit_file(podspec_content)
+
+          u_db = Database::Data.new
+          u_sql = "update project set is_done = 1 where version = '#{@version}'"
+          u_db.query(u_sql)
+
+          system "gct robot podfile"
+        end
+
+        def edit_file(content)
+          Gitlab.edit_file(@name, @file, @branch, content, "@config #{@version}版本 podfile更新")
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/update/tag.rb

@@ -17,17 +17,26 @@ module Gct
           [
             ['--skip-tag', '是否忽略tag，直接触发ci'],
             ['--update-ci', '是否更新CI'],
+            ['--auto-tag', '自动化'],
+            ['--pre', '是否预发tag']
           ].concat(super)
         end
 
         def initialize(argv)
-            @update_version_branch = 'develop'
+            config_gitlab
             @skip_tag = argv.flag?('skip-tag', false)
             @update_ci = argv.flag?('update-ci', false)
-            @file = get_spec_file
-            name = argv.shift_argument
-            @name = name.nil? ? @spec.name : name
+            @auto_tag = argv.flag?('auto-tag', false)
+            @pre = argv.flag?('pre', false)
+            @name = argv.shift_argument
             @tag = argv.shift_argument
+            @pre_tag_suffix = Constant.PreHuffix
+            @update_version_branch = @pre ? Constant.PreTagFromBranch : Constant.DefaultTagFromBranch
+            @update_to_branch = @pre ? Constant.PreTagToBranch : Constant.DefaultTagToBranch
+            @file = get_spec_file
+            if @name.nil?
+              @name = @spec.name
+            end
             @project_id = "#{Constant.NameSpace}#{@name}"
             super
         end
@@ -42,27 +51,57 @@ module Gct
         end
 
         def skip_tag_method 
-          @new_tag = @spec.version
-          puts "tag == #{@new_tag}"
           if !@update_ci
             isEmptyMR = mr_to_master
             if !isEmptyMR
               accept_merge_request
             end
           end
+          remove_and_create_tag
+        end
+
+        def remove_and_create_tag
+          @new_tag = @spec.version
+          puts "new tag"
+          puts @new_tag
+          if @pre
+            @new_tag = "#{@new_tag}" + @pre_tag_suffix
+          end
+          puts "tag == #{@new_tag}"
           # remove tag
-          `git tag -d #{@new_tag}`
-          `git push origin :refs/tags/#{@new_tag}`  
+          command = `git rev-parse --is-inside-work-tree`
+          if command.eql?("true")
+            `git tag -d #{@new_tag}`
+            `git push origin :refs/tags/#{@new_tag}`  
+          else
+            remove_tag
+          end
           # create tag
           create_tag
         end
 
+        def check_ci
+          is_exist_ci = false
+          res = Gitlab.tree("#{Constant.NameSpace}#{@name}")
+          res.each do |g|
+              if g["name"].eql?('.gitlab-ci.yml')
+                is_exist_ci = true
+                break
+              end
+          end
+          is_exist_ci
+        end
+
         def update_ci_method
           puts "更新ci文件".green
           temp_local_file = TempLocalFile.new()
           path = File.expand_path("../../init", __FILE__)
           ci_content = temp_local_file.read_path_file(path, "gitlab-ci.rb")
-          edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+          if check_ci
+            edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+          else 
+            create_file('.gitlab-ci.yml', ci_content, 'init ci')
+          end
           isEmptyMR = mr_to_master
           if !isEmptyMR
             accept_merge_request
@@ -70,11 +109,22 @@ module Gct
         end
 
         def get_spec_file
+          spec_file = nil
+          full_path = nil
+          if @auto_tag 
+            raise "podspec名不能为空！！！".red if spec_file.nil? if @name.nil?
+            Dir.chdir(FileBase.tmp_path) do
+              spec_file = Pathname.glob("#{@name}.podspec").first
+              full_path = spec_file.realpath
+              raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
+            end
+          else
             spec_file = Pathname.glob('*.podspec').first
+            full_path = spec_file
             raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
-
-            @spec = Pod::Specification.from_file(spec_file)
-            spec_file
+          end
+          @spec = Pod::Specification.from_file(full_path)
+          spec_file
         end
 
         def update_podspec_version 
@@ -86,6 +136,9 @@ module Gct
           tag = tag_regex.match(version_match)
           @now_tag = tag
           @new_tag = @tag || auto_add_tag(tag.to_s)
+          if @pre
+            @new_tag = "#{@new_tag}" + @pre_tag_suffix
+          end
           replace_string = version_match.gsub(tag_regex, @new_tag)
           updated_podspec_content = podspec_content.gsub(version_match, replace_string)
           puts "修改podpsec版本号成功！版本号为：#{@new_tag}".green
@@ -99,15 +152,16 @@ module Gct
           Gitlab.edit_file(@project_id, file, @update_version_branch, content, commit_message)
         end
 
+        def create_file(file, content, commit_message)
+          Gitlab.create_file(@project_id, file, @update_version_branch, content, commit_message)
+        end
+
         def mr_to_master
-          puts "正在创建MR请求将develop分支合并到master！".green
-          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "mr", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
-          # puts mr.to_hash
+          puts "正在创建MR请求将#{@update_version_branch}分支合并到#{@update_to_branch}分支！".green
+          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "mr", { source_branch: "#{@update_version_branch}", target_branch: "#{@update_to_branch}" })
           @id = mr.iid
           puts mr.merge_status
           isEmptyMR = mr.diff_refs.base_sha.eql?(mr.diff_refs.head_sha)
-          # puts mr.diff_refs.base_sha
-          # puts mr.diff_refs.head_sha
           close_mr if isEmptyMR
           if mr.merge_status == 'cannot_be_merged' && !isEmptyMR
             raise "Merge有冲突，请前往 https://gi-dev.ccrgt.com/#{Constant.NameSpace}#{@name}/merge_requests/#{@id} 解决".red
@@ -118,7 +172,7 @@ module Gct
         def accept_merge_request
           mr_result = Gitlab.accept_merge_request("#{@project_id}", @id)
           if mr_result.state == 'merged'
-            puts "成功合并到master分支".green
+            puts "成功合并到#{@update_to_branch}分支".green
           end
         end
 
@@ -126,8 +180,22 @@ module Gct
           Gitlab.update_merge_request("#{@project_id}", @id, {state_event: 'close'})
         end
 
+        def remove_tag
+          tags = Gitlab.tags("#{@project_id}")
+          puts "remove tag is " + "#{@new_tag}"
+          tags.each do |t|
+            if t["name"].eql?("#{@new_tag}")
+              Gitlab.delete_tag("#{@project_id}", "#{@new_tag}")
+              break
+            end
+          end
+        end
+
         def create_tag
-          Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "master")
+          Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "#{@update_to_branch}")
+          db = Database::Data.new
+          sql = "update tag t left join project p on t.project_version = p.version set t.is_tag = 1 where t.pod_name = '#{@name}' and t.is_tag != 1 and p.is_done = 0"
+          db.query(sql)
           puts "打tag成功，开始上传podspec...".green
         end
       end

data/lib/gct/command/update/version.rb

@@ -14,6 +14,7 @@ module Gct
         ]
 
         def initialize(argv)
+          config_gitlab
           @name = argv.shift_argument
           @version = argv.shift_argument
           name = @name ||= "iLife"

data/lib/gct/constant.rb

@@ -21,9 +21,25 @@ module Gct
         "ios-third/"
       end
 
-      def DefaultTagBranch
+      def DefaultTagFromBranch
         "develop"
       end
+
+      def PreTagFromBranch
+        "pre_develop"
+      end
+
+      def DefaultTagToBranch
+        "master"
+      end
+
+      def PreTagToBranch
+        "pre_master"
+      end
+
+      def PreHuffix
+        "-pre"
+      end
     end
   end
 end

data/lib/gct/database/data.rb

@@ -0,0 +1,28 @@
+require 'mysql2'
+
+module Gct
+  module Database
+    class Data
+      def initialize
+        @host = FileBase.get_config("host")
+        @password = FileBase.get_config("password")
+        raise "请设置数据库ip地址！".red if @host.nil? 
+        raise "请设置数据库密码！".red if @password.nil?
+      end
+
+      def query(sql)
+        client = nil
+        puts "current sql is 👇👇👇"
+        puts sql
+        begin
+          client = Mysql2::Client.new(:host => @host, :username => "root", :database => "ios_db", :password => @password, :encoding => "utf8")
+          client.query(sql)
+        rescue => exception
+          puts exception
+        ensure
+          client.close
+        end
+      end
+    end
+  end
+end

data/lib/gct/file_base.rb

@@ -7,6 +7,21 @@ module Gct
         @path = path
       end
 
+      def read_version
+        path = version_path
+        if !File.exist?(path) 
+          return nil
+        end
+        config_map = YAML.load(File.open(path, "r"))
+        config_map
+      end
+
+      def write_version_message(verison, name, branch)
+        yaml_path = "#{Generator::GctFile.temp_folder_path}/version"
+        content_map = {"version" => verison, "name" => name, "branch" => branch}
+        yaml_write_map(yaml_path, content_map)
+      end
+
       def yaml_write(key, value)
         begin
           config_map = YAML.load(File.open(@path, "r"))
@@ -21,6 +36,28 @@ module Gct
         end
       end
 
+      def yaml_write_map(path, content)
+        begin
+          yaml_file = File.open(path, "w")
+          YAML::dump(content, yaml_file)
+        rescue IOError => e
+          raise e.message
+        ensure
+          yaml_file.close unless yaml_file.nil?
+        end
+      end
+
+      def yaml_read_map(path, key)
+        begin
+          yaml_file = YAML.load(File.open(path, "r"))
+          if yaml_file
+            yaml_file[key]
+          end
+        rescue IOError => e
+          raise e.message
+        end
+      end
+
       def yaml_read(key)
         begin
           yaml_file = YAML.load(File.open(@path, "r"))
@@ -48,6 +85,14 @@ module Gct
         "#{Generator::GctFile.config_file_path}"
       end
 
+      def version_path
+        "#{Generator::GctFile.temp_folder_path}/version"
+      end 
+
+      def tmp_path
+        "#{Generator::GctFile.temp_folder_path}"
+      end
+
       def exist_root
         root_exist = File.exist?(Generator::GctFile.root_folder_path)
         root_exist

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.3.95".freeze unless defined? Gct::VERSION
+  VERSION = "0.4.3".freeze unless defined? Gct::VERSION
 end

data/lib/gct/generator/gct_file.rb

@@ -13,6 +13,10 @@ module Gct
         "#{get_system_home_path.rstrip}/.gct/config"
       end
 
+      def self.backup_folder_path
+        "#{get_system_home_path.rstrip}/.gct/backup"
+      end
+
       # 获取系统用户名
       def self.get_system_user_name
         # windows

data/lib/gct/specification.rb

@@ -30,15 +30,12 @@ module Gct
 end
 
 module SpecPublishStatus
-  CREATED       = '待分析'
-  ANALYZING     = '分析中'
-  PREPARING     = '准备中'
-  PENDING       = '等待中'
-  WAITING       = '待发布'
-  SKIPPED       = '已忽略'
-  MERGED        = '已合并'
-  DEPLOYING     = '发布中'
-  SUCCESS       = '发布成功'
-  FAILED        = '发布失败'
-  CANCELED      = '已取消'
+  PENDING       = 'pending'
+  WAITING       = 'waiting'
+  SKIPPED       = 'skipped'
+  MERGED        = 'merged'
+  DEPLOYING     = 'deploying'
+  SUCCESS       = 'success'
+  FAILED        = 'failed'
+  CANCELED      = 'canceled'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.3.95
+  version: 0.4.3
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: '"gct ios 自动化脚本工具"'
 email:
 - 307113345@qq.com
@@ -176,14 +190,20 @@ files:
 - lib/gct/command/repo/update.rb
 - lib/gct/command/robot.rb
 - lib/gct/command/robot/finish.rb
+- lib/gct/command/robot/podfile.rb
 - lib/gct/command/robot/start.rb
 - lib/gct/command/setup.rb
 - lib/gct/command/spec.rb
 - lib/gct/command/spec/lint.rb
 - lib/gct/command/update.rb
+- lib/gct/command/update/analyze.rb
+- lib/gct/command/update/dependency.rb
+- lib/gct/command/update/next.rb
+- lib/gct/command/update/podfile.rb
 - lib/gct/command/update/tag.rb
 - lib/gct/command/update/version.rb
 - lib/gct/constant.rb
+- lib/gct/database/data.rb
 - lib/gct/file_base.rb
 - lib/gct/gct_version.rb
 - lib/gct/generator/gct_file.rb