gct 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8c2d1eee0e3de12793d740b4b85285d7ef4aa94748b6c8f8dad352a17b2d06
-  data.tar.gz: e0f6650f0f55f6e065b625f692f6409df5ed1d7fdd65f9fa056b36f191bbf344
+  metadata.gz: 95e191b1ed5ae2ce3b7cb3c7801ed0902d300ee77a19cfcc1ce455630a1f47b8
+  data.tar.gz: 4c6d74e11b168ebe5a5629ff6ea647f23fb7c28a26442224ef05c27e3b83e7d6
 SHA512:
-  metadata.gz: 82c58652b0e9ac64ebd3872637827a80e15dcc7b037d746e896dc6b955e3b3e26521c2035aaf0b6ea9f5bbc61fe242221ad637f3bb55961965f4a0a6b6de1b8c
-  data.tar.gz: d90e059df0b133c6e42a6db11b8a960b9241b8821700ce1b69a331edad10b4bffbb898eadd15851163b8ad1b706e1f2112a442992f7ef0491a3b1b83ec20fd56
+  metadata.gz: 3049ea6bc870721c728a226f8e07465ffe7b7d919a9a2aa1cfeab750d7f6aabf0eb6fd38a9b630962988a7acdb0beb0c973d90319d50ca7818ca16fb12deb351
+  data.tar.gz: ab44e1b3569ec632f1da15c3d904eff2f50eab20104ac1219d6665e322d91fae4ac828e7331d21f149a10c376dcebdc164d915be7682e8bf49c7a3d746bb38aa

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'
@@ -92,6 +94,7 @@ module Gct
     end
 
     def auto_add_tag(tag)
+      puts "current tag = #{tag}"
       tag_points = tag.to_s.split('.')
       index = tag_points.length - 1
       need_add_point = tag_points[index].to_i + 1

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}"
@@ -78,9 +85,16 @@ module Gct
         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
@@ -249,7 +263,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) 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,8 +272,11 @@ 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/gitlab-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/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/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

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

@@ -51,12 +51,6 @@ module Gct
         end
 
         def skip_tag_method 
-          if !@update_ci
-            isEmptyMR = mr_to_master
-            if !isEmptyMR
-              accept_merge_request
-            end
-
           isEmptyMR = mr_to_master
           if !isEmptyMR
             accept_merge_request
@@ -119,6 +113,7 @@ module Gct
             create_file('.gitlab-ci.yml', ci_content, 'init ci')
             mr_to_master_if_need
           end
+          
         end
 
         def mr_to_master_if_need 

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.5.0".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.5".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.0
+  version: 0.5.5
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,10 +192,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