gct 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488e91b7f75828fcc37243173f3ddc60840055aca8ebaae02dfcb481e2e3cd2b
-  data.tar.gz: 4ecd7fe5bce7c4106dff22ca33a7f739bf94f5b8fb793215c59b146e3411a6d3
+  metadata.gz: 6f1fa1bfdef36014094f04261577c467883fb368aacff3ea91192db2d67eef5c
+  data.tar.gz: 39b2963ca209c21d721f48e7321a89ebd485127fea2d44796af08d6d194e9826
 SHA512:
-  metadata.gz: 4ea825c59c3a47d1fa0b4f1e4e46295fd8089b4e602070fb15db6125704268241b2bcd56291170140d4ed26b648fa74479c116a29a40ab1585755df36018a23b
-  data.tar.gz: fb94c302f1147c6ea23620c2a5ea816dfe8df1a169faf0edf5394792d612f9c223a316462a2614bc66b2182087298f03924bb3d43f5e8e89030e88a4d9950465
+  metadata.gz: 2b032dc2ac61e470c5c9a70abad2c59cd17608212a99122591015e74709ddf8964868aafb97087f29a6bf50c2e9169d1d76cc5002f4b3a599d7771d0796dd80f
+  data.tar.gz: 898ac353d9712903fe11852c029a0349a9b1c4655efd6d0ffbfd594274b6fc18f5f94cf31d80acb727fdaa33e758898e1516f6e31c6cc170d179b6056f41e666

data/lib/gct/command.rb

@@ -28,6 +28,8 @@ module Gct
     require 'gct/command/update'
     require 'gct/command/robot'
     require 'gct/command/clean'
+    require 'gct/command/skip'
+    require 'gct/command/unskip'
 
     self.abstract_command = true
     self.command = 'gct'
@@ -93,6 +95,7 @@ module Gct
 
     def auto_add_tag(tag)
       tag_points = tag.to_s.split('.')
+      raise "tag is nil" if tag_points.length <= 0
       index = tag_points.length - 1
       need_add_point = tag_points[index].to_i + 1
       tag_points[index] = need_add_point == 10 ? 0 : need_add_point

data/lib/gct/command/autotag.rb

@@ -47,6 +47,13 @@ module Gct
 
       def run
         FileBase.root_err
+
+        # 检查远端是否存在分支
+        is_exist_branch = check_remote_branch
+        if !is_exist_branch
+          raise "远端未找到 #{@branch} 分支".red
+        end
+
         puts "开始分析podfile文件".green
         puts ""
         where_statement = "and is_pre = #{@pre ? 1 : 0}"
@@ -67,20 +74,22 @@ module Gct
             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)
-        ret = @branch.include?(branch)
-        raise "当前不是发布分支".red if !ret
+      def check_remote_branch
+        remote_branches = Gitlab.branches(@project_id, per_page: 1000)
+        branches = Array.new()
+        remote_branches.each do |item|
+          hash_branch = item.to_hash
+          branch_name = hash_branch["name"]
+          branches.push(branch_name)
+        end
+        is_exist_branch = branches.include?(@branch)
+        is_exist_branch
       end
       
       def podfile
@@ -101,7 +110,16 @@ module Gct
         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}"
+          # 取出组名
+          source = dep.external_source[:git]
+          left1 = "https://gi-dev.ccrgt.com/"
+          left2 = "http://gi-dev.ccrgt.com/"
+          right = "/"
+          source_regex = /(?<=#{left1}|#{left2}).*(?=#{right})/
+          group_name = source_regex.match(source).to_s
+          raise "gitlab中找不到#{dep.name}所在的group".red if group_name.nil? || group_name.empty?
+
+          project_name = "#{group_name}/#{dep.name}"
           branch = Constant.DefaultTagFromBranch
           if @pre
             branch = Constant.PreTagFromBranch
@@ -232,7 +250,9 @@ module Gct
             end
           end
         end
-
+        # 写入project
+        write_project
+        # 写入tag
         values = ""
         temp_spec_map.each do |key, value| 
           values.concat("('#{@version}', '#{key}', '#{@project_name}', '#{value.tag}', '#{value.status}', #{value.priority}" + (@pre ? ", 1)," : "),"))
@@ -244,12 +264,20 @@ module Gct
         db.query(sql)
       end
 
+      def write_project
+        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)
+      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) and project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}"
+        sql = "select * from tag where priority = (select MAX(priority) from tag where tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}) and project_version = '#{@version}'" 
         result = db.query(sql)
         vals = ""
         ins = ""
@@ -258,11 +286,8 @@ module Gct
             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"]
-              puts "pod name is " + name
               vals.concat("when pod_name = '#{name}' then '#{status}' ")     
-              puts vals
               ins.concat("'#{name}',")
-              puts ins
               system "gct update dependency #{name} tag_status #{status}"
               skip_tag = ""
               if row["is_tag"].to_i == 1 

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

@@ -21,7 +21,7 @@ module Gct
 
         def run
           puts "init ci".green
-          cp_path = Pathname.new(__FILE__).parent + 'gitlab-ci.rb'
+          cp_path = Pathname.new(__FILE__).parent + 'ios-ci.rb'
           system "cp #{cp_path} .gitlab-ci.yml"
         end
       end

data/lib/gct/command/init/{gitlab-ci.rb → ios-ci.rb}

@@ -8,8 +8,8 @@ push_pod:
     - 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 repo update 
+    - gct repo push $CI_PROJECT_NAME
     - gct update dependency $CI_PROJECT_NAME "tag_version" $CI_COMMIT_REF_NAME
     - gct update next
   only:

data/lib/gct/command/init/ios-thirdpart-ci.rb

@@ -0,0 +1,29 @@
+stages:
+  - push
+  - failure
+
+push_pod:
+  stage: push
+  script: 
+    - 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 $CI_PROJECT_NAME
+    - gct update dependency $CI_PROJECT_NAME "tag_version" $CI_COMMIT_REF_NAME
+    - gct update next
+  only:
+    - tags
+  tags:
+    - ios-third
+
+on_failure:
+  stage: failure
+  script:
+    - gct robot finish false
+    - gct update dependency $CI_PROJECT_NAME "tag_status" "failed"
+  when: on_failure
+  only: 
+    - tags
+  tags:
+    - ios-third

data/lib/gct/command/repo/push.rb

@@ -9,9 +9,11 @@ module Gct
         DESC
 
         self.arguments = [
+          CLAide::Argument.new('POD_NAME', true),
         ]
 
         def initialize(argv)
+          @pod_name = argv.shift_argument
           super
         end
 
@@ -24,9 +26,18 @@ module Gct
         end
 
         def pushRepo
-          puts "pod 命令为：pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings --use-modular-headers".green
+          db = Database::Data.new
+          sql = "select * from modular_headers where pod_name = '#{@pod_name}'"
+          res = db.query(sql)
+          modular_code = "--use-modular-headers" 
+          if !res.nil? && res.count > 0
+            modular_code = ""
+          end
+          command_code = "pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings #{modular_code}"
+
+          puts "pod 命令为：#{command_code}".green
           # exception: ruby 2.6 以上生效
-          system "pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings --use-modular-headers", exception: true
+          system "#{command_code}", exception: true
         end
       end
     end

data/lib/gct/command/robot.rb

@@ -1,7 +1,6 @@
 require 'gct/command/robot/start'
 require 'gct/command/robot/finish'
 require 'gct/command/robot/podfile'
-require 'gct/command/robot/summary'
 require 'net/https'
 require 'json'
 

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

@@ -28,7 +28,17 @@ module Gct
         end
 
         def run
-          message = " <font color=\"info\">podfile 更新完毕</font>"
+          db = Database::Data.new
+          sql = "select * from project where is_done = 1 order by create_time DESC limit 1"
+          res = db.query(sql)
+          message = "<font color=\"info\">podfile 更新完毕</font>"
+          if !res.nil? && res.count > 0 
+            res.each do |row|
+              branch = row["branch"]
+              message = "<font color=\"info\">#{branch} podfile 更新完毕</font>"
+            end
+          end
+          
           content = "#{message}"
           robot_send(content)
         end

data/lib/gct/command/skip.rb

@@ -0,0 +1,14 @@
+require 'gct/command/skip/modular'
+require 'gct/command/skip/tag'
+
+module Gct
+  class Command
+    class Skip < Command
+      self.abstract_command = true
+      self.summary = '初始化'
+      self.description =  <<-DESC
+        跳过modular或跳过tag
+      DESC
+    end
+  end
+end

data/lib/gct/command/skip/modular.rb

@@ -0,0 +1,31 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Skip < Command
+      class Modular < Skip
+
+        self.summary = '跳过modular_headers 验证的pod'
+        self.description = <<-DESC
+          跳过modular_headers 验证的pod
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', true),
+        ]
+
+        def initialize(argv)
+          @pod_name = argv.shift_argument
+          super
+        end
+
+        def run
+          db = Database::Data.new
+          sql = "insert into modular_headers (pod_name) values ('#{@pod_name}')"
+          res = db.query(sql)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Skip < Command
+      class Tag < Skip
+
+        self.summary = '跳过打tag'
+        self.description = <<-DESC
+          跳过打tag
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('PROJECT_VERSION', true),
+          CLAide::Argument.new('POD_NAME', true),
+          CLAide::Argument.new('Tag', false),
+        ]
+
+        def self.options
+        end
+
+        def initialize(argv)
+          @project_version = argv.shift_argument
+          @pod_name = argv.shift_argument
+          @tag = argv.shift_argument
+          super
+        end
+
+        def run
+          db = Database::Data.new
+          if !@tag.nil?
+            tag_set = ", tag_version = '#{@tag}'"
+          end
+          update_code = "is_skip_tag = 1, tag_status = 'success'#{tag_set}"
+          sql = "update tag set #{update_code} where pod_name = '#{@pod_name}' and project_version = '#{@project_version}'"
+          res = db.query(sql)
+        end
+      end
+    end
+  end
+end

data/lib/gct/command/unskip.rb

@@ -0,0 +1,14 @@
+require 'gct/command/unskip/modular'
+require 'gct/command/unskip/tag'
+
+module Gct
+  class Command
+    class Unskip < Command
+      self.abstract_command = true
+      self.summary = '初始化'
+      self.description =  <<-DESC
+        移除跳过modular或跳过tag
+      DESC
+    end
+  end
+end

data/lib/gct/command/unskip/modular.rb

@@ -0,0 +1,31 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Unskip < Command
+      class Modular < Unskip
+
+        self.summary = '移除跳过modular_headers 验证'
+        self.description = <<-DESC
+          移除跳过modular_headers 验证
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', true),
+        ]
+
+        def initialize(argv)
+          @pod_name = argv.shift_argument
+          super
+        end
+
+        def run
+          db = Database::Data.new
+          sql = "delete from modular_headers where pod_name = '#{@pod_name}'"
+          res = db.query(sql)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Unskip < Command
+      class Tag < Unskip
+
+        self.summary = '移除跳过打tag'
+        self.description = <<-DESC
+          移除跳过打tag
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('PROJECT_VERSION', true),
+          CLAide::Argument.new('POD_NAME', true),
+          CLAide::Argument.new('Tag', false),
+        ]
+
+        def self.options
+        end
+
+        def initialize(argv)
+          @project_version = argv.shift_argument
+          @pod_name = argv.shift_argument
+          @tag = argv.shift_argument
+          super
+        end
+
+        def run
+          db = Database::Data.new
+          if !@tag.nil?
+            tag_set = ", tag_version = '#{@tag}'"
+          end
+          update_code = "is_skip_tag = 0, tag_status = 'waiting'#{tag_set}"
+          sql = "update tag set #{update_code} where pod_name = '#{@pod_name}' and project_version = '#{@project_version}'"
+          res = db.query(sql)
+        end
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Gct
           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})"
+          sql = "select * from tag where priority = (select MAX(priority) from tag where tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}) and project_version = '#{@version}'" 
           result = db.query(sql)
           puts result.count
           if result.count == 0
@@ -54,7 +54,7 @@ module Gct
                 if row["is_pre"].to_i == 1 
                   pre = "--pre"
                 end
-                system "gct update dependency #{name} status #{status}" 
+                system "gct update dependency #{name} tag_status #{status}" 
                 system "gct update tag #{name} --auto-tag --update-ci #{skip_tag} #{pre}"
               end
             end

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

@@ -39,6 +39,13 @@ module Gct
           end
         end
 
+        def skip_modular_headers_pods
+          db = Database::Data.new
+          sql = "select * from modular_headers"
+          result = db.query(sql)
+          return result
+        end
+
         def update_podfile
           podspec_content = file_contents(@name, @file, @branch)
           remove_regex = /dev_pod .*/
@@ -51,12 +58,20 @@ module Gct
             puts "ERROR: 没有tag库".red
             return
           end
+
+          skip_pods = Array.new()
+          skip_modular_headers_pods.each do |row| 
+            skip_pods.push(row["pod_name"])
+          end
+
           result.each do |row|
             name = row["pod_name"]
             tag = row["tag_version"]
+            is_skip_modular_headers = skip_pods.include?(name)
+            modular_headers = is_skip_modular_headers ? ", :modular_headers => false" : ""
             update_regex = /.*#{name}.*/
             update_match = update_regex.match(podspec_content).to_s
-            update_str = "  pod '#{name}', '#{tag}'"
+            update_str = "  pod '#{name}', '#{tag}'#{modular_headers}"
             if update_match.empty?
               empty_match = "# Pods for iLife"
               podspec_content = podspec_content.gsub!(empty_match, "#{empty_match} \n#{update_str}")  # Pods for iLife
@@ -72,7 +87,6 @@ module Gct
           u_db.query(u_sql)
 
           system "gct robot podfile"
-          system "gct robot summary"
         end
 
         def edit_file(content)

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

@@ -37,7 +37,7 @@ module Gct
             if @name.nil?
               @name = @spec.name
             end
-            @project_id = "#{Constant.NameSpace}#{@name}"
+            @project_id = "#{@group_name}/#{@name}"
             super
         end
         
@@ -80,7 +80,7 @@ module Gct
 
         def check_ci
           is_exist_ci = false
-          res = Gitlab.tree("#{Constant.NameSpace}#{@name}")
+          res = Gitlab.tree("#{@group_name}/#{@name}")
           res.each do |g|
               if g["name"].eql?('.gitlab-ci.yml')
                 is_exist_ci = true
@@ -94,10 +94,10 @@ module Gct
           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")
+          ci_content = temp_local_file.read_path_file(path, "#{@group_name}-ci.rb")
           if check_ci
             # 检查 ci 文件是否有变化
-            remote_content = file_contents("#{Constant.NameSpace}#{@name}", '.gitlab-ci.yml', @update_version_branch)
+            remote_content = file_contents("#{@group_name}/#{@name}", '.gitlab-ci.yml', @update_version_branch)
             remote_content.force_encoding('UTF-8')
             strip_remote_content = remote_content.gsub(/\s/,'')
             ci_content.force_encoding('UTF-8')
@@ -139,6 +139,14 @@ module Gct
             raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
           end
           @spec = Pod::Specification.from_file(full_path)
+          # 取出组名
+          source = @spec.source[:git]
+          left1 = "https://gi-dev.ccrgt.com/"
+          left2 = "http://gi-dev.ccrgt.com/"
+          right = "/"
+          source_regex = /(?<=#{left1}|#{left2}).*(?=#{right})/
+          @group_name = source_regex.match(source).to_s
+          raise "gitlab中找不到#{@spec.name}所在的group".red if @group_name.nil? || @group_name.empty?
           spec_file
         end
 
@@ -147,7 +155,7 @@ module Gct
           podspec_content = file_contents(@project_id, @file, @update_version_branch)
           version_regex = /.*version.*/
           version_match = version_regex.match(podspec_content).to_s
-          tag_regex = /(?<=')\w.*(?=')/
+          tag_regex = /(?<="|')\w.*(?="|')/
           tag = tag_regex.match(version_match)
           @now_tag = tag
           @new_tag = @tag || auto_add_tag(tag.to_s)
@@ -173,13 +181,13 @@ module Gct
 
         def mr_to_master
           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}" })
+          mr = Gitlab.create_merge_request("#{@group_name}/#{@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)
           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
+            raise "Merge有冲突，请前往 https://gi-dev.ccrgt.com/#{@group_name}/#{@name}/merge_requests/#{@id} 解决".red
           end
           isEmptyMR
         end

data/lib/gct/gct_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,7 +176,8 @@ files:
 - lib/gct/command/create/third.rb
 - lib/gct/command/init.rb
 - lib/gct/command/init/ci.rb
-- lib/gct/command/init/gitlab-ci.rb
+- lib/gct/command/init/ios-ci.rb
+- lib/gct/command/init/ios-thirdpart-ci.rb
 - lib/gct/command/init/unit.rb
 - lib/gct/command/op.rb
 - lib/gct/command/op/gems.rb
@@ -192,10 +193,15 @@ files:
 - lib/gct/command/robot/finish.rb
 - lib/gct/command/robot/podfile.rb
 - lib/gct/command/robot/start.rb
-- lib/gct/command/robot/summary.rb
 - lib/gct/command/setup.rb
+- lib/gct/command/skip.rb
+- lib/gct/command/skip/modular.rb
+- lib/gct/command/skip/tag.rb
 - lib/gct/command/spec.rb
 - lib/gct/command/spec/lint.rb
+- lib/gct/command/unskip.rb
+- lib/gct/command/unskip/modular.rb
+- lib/gct/command/unskip/tag.rb
 - lib/gct/command/update.rb
 - lib/gct/command/update/analyze.rb
 - lib/gct/command/update/dependency.rb

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

@@ -1,34 +0,0 @@
-require 'net/https'
-require 'json'
-
-module Gct
-  class Command
-    class Robot < Command
-      class Summary < Robot
-
-        self.summary = '汇总'
-        self.description = <<-DESC
-        汇总
-        DESC
-
-        self.arguments = [
-        ]
-
-        def self.options
-          [
-            ['--test', '测试机器人，测试webhook'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @test = argv.flag?('test', false)
-          super
-        end
-
-        def run
-
-        end
-      end
-    end
-  end
-end