gct 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f99077edb53ba0cf05eca381a814b9f41a17ecc191cc68a1950c2402dff1b7
-  data.tar.gz: 3132fd74ec8fd026ea13921f717e68c8f7bbb4aba1ee1265ba057eef823cd8cd
+  metadata.gz: 2543169b03dd0c5d196ea4af9fb3214efccfd54165fb5418c3fb36e9f04c0b88
+  data.tar.gz: a17f7e2f676904a9c8c6b0acd7ffc08fe0d8db6f07f974f8825e90a120ffa2cb
 SHA512:
-  metadata.gz: 92432f4c66aa5d9a19c27c0c5c22ceb53253ff118e34586934516790134474d3f0c9360ef8dad2b51e8c7cd737d0441e1c019942ff8d4f94d2449d33d109ec19
-  data.tar.gz: 83d92ca4f72529e5be6db516fc667bc9dbddc6783e29aa0eaac68f109d91df346545b0c52be5fc14759b2cd03603f86ea8fcd94320e4f6e00ed23f83dd7f569e
+  metadata.gz: 8c620629c7a89a8758a44c45635ed470cc42330f954c05a2bb7caf0adf2892215f7b40833f702a1378e18e648ec7ce383e5f81520622a5bd4677899ea74c7687
+  data.tar.gz: c1ad60709ac0c069086abccd377cf30a106f34f93ca224ca6541a0bcbf6010f521503beff69ee035648d1b74de8f73b751c7e819b638ea84928182d46970faff

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/autotag.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'tmpdir'
 require 'parallel'
+require 'pp'
 
 module Gct
   class Command
@@ -20,6 +21,7 @@ module Gct
         gitlab_error
         config_gitlab
         @update_ci = argv.flag?('update-ci', false)
+        @pre = argv.flag?('pre', false)
         name = argv.shift_argument
         @project_id = "ios/#{name}"
         @project_name = name
@@ -31,7 +33,8 @@ module Gct
 
       def self.options
         [
-          ['--update-ci', '是否更新CI']
+          ['--update-ci', '是否更新CI'],
+          ['--pre', '是否为预发tag'],
         ].concat(super)
       end
 
@@ -46,17 +49,32 @@ module Gct
         FileBase.root_err
         puts "开始分析podfile文件".green
         puts ""
-        FileBase.write_version_message(@version, @project_name, @branch)
-        exist_dep = FileBase.exist_dependency
-        if exist_dep
-          tmp_podspecs
-          priority_map = FileBase.yaml_dependency_read
-          create_tag_by_priority(priority_map)
+        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_map = priority_rank(untagged_specs)
-          generate_dependency_file(priority_map)
-          create_tag_by_priority(priority_map)
+          priority_rank(untagged_specs)
+          create_tag_by_priority()
         end
       end
 
@@ -66,34 +84,76 @@ 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)
-          # puts contents
-          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
+        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 tmp_podspecs
-        untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagBranch}
+        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
 
         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
-          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| 
@@ -172,72 +232,55 @@ module Gct
             end
           end
         end
-        dependency_map = Hash.new()
-        priority_map = Hash.new()
+
+        values = ""
         temp_spec_map.each do |key, value| 
-          dependency_map[key] = {"priority" => value.priority, "tag" => value.tag, "status" => value.status}
+          values.concat("('#{@version}', '#{key}', '#{@project_name}', '#{value.tag}', '#{value.status}', #{value.priority}" + (@pre ? ", 1)," : "),"))
         end
-        priority = 1000
-        while priority <= 1000 do
-          tmp_hash = Hash.new()
-          dependency_map.each do |key, value|
-            if (value["priority"] == priority)
-                tmp_hash.store(key, {"tag" => value["tag"], "status" => value["status"]})
-                dependency_map.delete(value)
-            end
-          end
-          if (tmp_hash.keys.count == 0)
-              priority = 1001
-          else
-              priority_map[priority.to_s] = tmp_hash
-              priority -= 1
-          end
-        end
-        priority_map
-      end
-
-      def generate_dependency_file(priority_map)
-        yaml_path = "#{Generator::GctFile.temp_folder_path}/#{Constant.DependencyName}"
-        FileBase.yaml_write_map(yaml_path, priority_map)
+        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(priority_map)
-        priority = get_current_need_tag_priority
-        puts "priority is #{priority}"
-        value = priority_map[priority.to_s]
-        raise "没有需要打tag的库".red if value.keys.count == 0
-        value.each do |key, val|
-          if val["status"].eql?(SpecPublishStatus::WAITING) || val["status"].eql?(SpecPublishStatus::CANCELED) || val["status"].eql?(SpecPublishStatus::FAILED)
-            is_skip = val["status"].eql?(SpecPublishStatus::FAILED) || val["status"].eql?(SpecPublishStatus::CANCELED)  
-            status = SpecPublishStatus::PENDING
-            val["status"] = status
-            system "gct update dependency #{key} status #{status}"       
-            puts "gct update tag #{key} --auto-tag #{is_skip ? "--skip-tag" : ""}"
-            system "gct update tag #{key} --auto-tag --update-ci #{is_skip ? "--skip-tag" : ""}"
-          end
-        end
-      end
-
-      # 当前优先级是否已打完
-      def get_current_need_tag_priority
-        priority = 1000
-        content_map = FileBase.yaml_dependency_read
-        priority_map = content_map[priority.to_s]
-        is_all_done = true
-        while is_all_done do
-          priority_map.each do |k, v|
-            if !v["status"].eql?(SpecPublishStatus::SUCCESS)
-              is_all_done = false
-              break
+      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
-          if is_all_done
-              priority -= 1
-              priority_map = content_map[priority.to_s]
+          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
-        priority
       end
     end
   end

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

@@ -5,14 +5,14 @@ stages:
 push_pod:
   stage: push
   script: 
-    - gct robot start --test
+    - gct robot start
     - echo "开始lint 和 push podspec"
-    - gct update dependency $CI_PROJECT_NAME "status" "deploying"
+    - 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 --test
-    - gct update dependency $CI_PROJECT_NAME "tag" $CI_COMMIT_REF_NAME
+    - gct robot finish true
+    - gct update dependency $CI_PROJECT_NAME "tag_version" $CI_COMMIT_REF_NAME
     - gct update next
   only:
     - tags
@@ -22,8 +22,8 @@ push_pod:
 on_failure:
   stage: failure
   script:
-    - gct robot finish false --test
-    - gct update dependency $CI_PROJECT_NAME "status" "failed"
+    - gct robot finish false
+    - gct update dependency $CI_PROJECT_NAME "tag_status" "failed"
   when: on_failure
   only: 
     - tags

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/dependency.rb

@@ -1,3 +1,4 @@
+require 'mysql2'
 module Gct
   class Command
     class Update < Command
@@ -9,16 +10,14 @@ module Gct
         DESC
 
         self.arguments = [
-          # CLAide::Argument.new('PRIORITY', false),
           CLAide::Argument.new('POD_NAME', false),
-          CLAide::Argument.new('KEY', false),
+          CLAide::Argument.new('FIELD', false),
           CLAide::Argument.new('VALUE', false),
         ]
 
         def initialize(argv)
-          # @priority = argv.shift_argument
           @pod_name = argv.shift_argument
-          @key = argv.shift_argument
+          @field = argv.shift_argument
           @value = argv.shift_argument
           super
         end
@@ -28,7 +27,15 @@ module Gct
         end
 
         def run
-          FileBase.yaml_dependency_update(@pod_name, @key, @value)
+          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

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

@@ -14,58 +14,52 @@ module Gct
         end
 
         def run
-          batch_tag
+          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 
-          specs = next_specs
-          if specs.nil? 
-            return
-          end
-          if specs.keys.count == 0
+          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
-            specs.each do |key, val|
-              if val["status"].eql?(SpecPublishStatus::WAITING) || val["status"].eql?(SpecPublishStatus::CANCELED) || val["status"].eql?(SpecPublishStatus::FAILED)
+            result.each do |row|
+              if row["tag_status"].eql?(SpecPublishStatus::WAITING) || row["tag_status"].eql?(SpecPublishStatus::CANCELED)
                 status = SpecPublishStatus::PENDING
-                val["status"] = status
-                system "gct update dependency #{key} status #{status}" 
-                system "gct update tag #{key} --auto-tag --update-ci"
+                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
-
-        def next_specs
-          content_map = FileBase.yaml_dependency_read
-          if content_map.nil?
-            return nil
-          end
-          priority = 1000
-          content_map.each do |k, v|
-            if v.keys.include?(@project_name)
-              priority = k
-              break
-            end
-          end
-
-          priority_map = content_map[priority.to_s]
-          is_all_done = true
-          priority_map.each do |k, v|
-            if !v["status"].eql?(SpecPublishStatus::SUCCESS)
-              is_all_done = false
-              break
-            end
-          end 
-
-          if is_all_done
-            content_map[(priority.to_i - 1).to_s]
-          else
-            nil
-          end
-        end
       end
     end
   end

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

@@ -22,57 +22,61 @@ module Gct
         end
 
         def run
-          version_map = FileBase.read_version
-          @name = "ios/#{version_map["name"]}"
-          @branch = version_map["branch"]
-          @verison = version_map["version"]
-          @file = "Podfile"
-          puts @version
+          initParams
           update_podfile
-          remove_and_backup
+        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, "")
-          
-          # dependency
-          dependency_map = FileBase.yaml_dependency_read
-          dependencies = Array.new()
-          dependency_map.each do |k, v|  
-            dependencies << v
-          end 
 
-          dependencies.each { |dep|
-            dep.keys.each { |k|
-              value = dep[k]
-              tag = value["tag"]
-              update_regex = /.*#{k}.*/
-              update_match = update_regex.match(podspec_content).to_s
-              podspec_content = podspec_content.gsub!(update_match, "  pod '#{k}', '#{tag}'")
-            }
-          }
+          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
-
-        # 删除和备份
-        def remove_and_backup
-          d_name = Constant.DependencyName
-          Dir.chdir(FileBase.tmp_path) do
-            # 备份dependency文件到backup文件夹下
-            system "cp #{d_name} ../backup/#{d_name}-#{@version}"
-            # 删除tmp文件夹下所有文件
-            system "rm -rf *"
-          end
-        end
       end
     end
   end

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

@@ -18,17 +18,21 @@ module Gct
             ['--skip-tag', '是否忽略tag，直接触发ci'],
             ['--update-ci', '是否更新CI'],
             ['--auto-tag', '自动化'],
+            ['--pre', '是否预发tag']
           ].concat(super)
         end
 
         def initialize(argv)
             config_gitlab
-            @update_version_branch = 'develop'
             @skip_tag = argv.flag?('skip-tag', false)
             @update_ci = argv.flag?('update-ci', false)
             @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
@@ -47,14 +51,23 @@ 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
           command = `git rev-parse --is-inside-work-tree`
           if command.eql?("true")
@@ -67,15 +80,27 @@ module Gct
           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')
-          isEmptyMR = mr_to_master
-          if !isEmptyMR
-            accept_merge_request
+          if check_ci
+            edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+          else 
+            create_file('.gitlab-ci.yml', ci_content, 'init ci')
           end
         end
 
@@ -107,6 +132,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
@@ -120,15 +148,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
@@ -139,7 +168,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
 
@@ -148,11 +177,21 @@ module Gct
         end
 
         def remove_tag
-          Gitlab.delete_tag("#{@project_id}", "#{@new_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/constant.rb

@@ -21,12 +21,24 @@ module Gct
         "ios-third/"
       end
 
-      def DefaultTagBranch
+      def DefaultTagFromBranch
         "develop"
       end
 
-      def DependencyName
-        "dependency"
+      def PreTagFromBranch
+        "pre_develop"
+      end
+
+      def DefaultTagToBranch
+        "master"
+      end
+
+      def PreTagToBranch
+        "pre_master"
+      end
+
+      def PreHuffix
+        "-pre"
       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

@@ -22,42 +22,6 @@ module Gct
         yaml_write_map(yaml_path, content_map)
       end
 
-      def yaml_dependency_read
-        path = dependency_path
-        if !File.exist?(path) 
-          return nil
-        end
-        config_map = YAML.load(File.open(path, "r"))
-        config_map
-      end
-
-      def yaml_dependency_update(pod_name, key, value)
-        path = dependency_path
-        if !File.exist?(dependency_path)
-          return
-        end
-        begin
-          config_map = YAML.load(File.open(path, "r"))
-          config_map = Hash.new() if !config_map
-          config_map.each do |k, v|
-            v.each do |sk, sv|
-              if sk.eql?(pod_name)  
-                sv[key] = value
-                if key.eql?("tag")
-                  sv["status"] = SpecPublishStatus::SUCCESS
-                end
-              end
-            end
-          end
-          yaml_file = File.open(path, "w")
-          YAML::dump(config_map, yaml_file)
-        rescue IOError => e
-          raise e.message
-        ensure
-          yaml_file.close unless yaml_file.nil?
-        end
-      end
-
       def yaml_write(key, value)
         begin
           config_map = YAML.load(File.open(@path, "r"))
@@ -121,10 +85,6 @@ module Gct
         "#{Generator::GctFile.config_file_path}"
       end
 
-      def dependency_path
-        "#{Generator::GctFile.temp_folder_path}/#{Constant.DependencyName}"
-      end 
-
       def version_path
         "#{Generator::GctFile.temp_folder_path}/version"
       end 
@@ -138,11 +98,6 @@ module Gct
         root_exist
       end
 
-      def exist_dependency
-        root_exist = File.exist?(dependency_path)
-        root_exist
-      end
-
       def root_err
         raise "请先运行命令：gct setup".red if !exist_root
       end

data/lib/gct/gct_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 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
@@ -189,6 +203,7 @@ files:
 - 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