gct 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2543169b03dd0c5d196ea4af9fb3214efccfd54165fb5418c3fb36e9f04c0b88
-  data.tar.gz: a17f7e2f676904a9c8c6b0acd7ffc08fe0d8db6f07f974f8825e90a120ffa2cb
+  metadata.gz: aa8c2d1eee0e3de12793d740b4b85285d7ef4aa94748b6c8f8dad352a17b2d06
+  data.tar.gz: e0f6650f0f55f6e065b625f692f6409df5ed1d7fdd65f9fa056b36f191bbf344
 SHA512:
-  metadata.gz: 8c620629c7a89a8758a44c45635ed470cc42330f954c05a2bb7caf0adf2892215f7b40833f702a1378e18e648ec7ce383e5f81520622a5bd4677899ea74c7687
-  data.tar.gz: c1ad60709ac0c069086abccd377cf30a106f34f93ca224ca6541a0bcbf6010f521503beff69ee035648d1b74de8f73b751c7e819b638ea84928182d46970faff
+  metadata.gz: 82c58652b0e9ac64ebd3872637827a80e15dcc7b037d746e896dc6b955e3b3e26521c2035aaf0b6ea9f5bbc61fe242221ad637f3bb55961965f4a0a6b6de1b8c
+  data.tar.gz: d90e059df0b133c6e42a6db11b8a960b9241b8821700ce1b69a331edad10b4bffbb898eadd15851163b8ad1b706e1f2112a442992f7ef0491a3b1b83ec20fd56

data/lib/gct/command/autotag.rb

@@ -249,7 +249,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) and project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement}"
         result = db.query(sql)
         vals = ""
         ins = ""

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

@@ -5,13 +5,11 @@ stages:
 push_pod:
   stage: push
   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:

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

@@ -24,9 +24,9 @@ module Gct
         end
 
         def pushRepo
-          puts "pod 命令为：pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings".green
+          puts "pod 命令为：pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings --use-modular-headers".green
           # exception: ruby 2.6 以上生效
-          system "pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings", exception: true
+          system "pod repo push iOSCRGTPodSource --sources=#{Constant.GitURL}iOSCRGTPodSource.git --verbose --skip-import-validation --use-libraries --allow-warnings --use-modular-headers", exception: true
         end
       end
     end

data/lib/gct/command/robot.rb

@@ -1,6 +1,7 @@
 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/summary.rb

@@ -0,0 +1,34 @@
+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

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

@@ -72,6 +72,7 @@ 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

@@ -56,6 +56,10 @@ module Gct
             if !isEmptyMR
               accept_merge_request
             end
+
+          isEmptyMR = mr_to_master
+          if !isEmptyMR
+            accept_merge_request
           end
           remove_and_create_tag
         end
@@ -93,14 +97,34 @@ module Gct
         end
 
         def update_ci_method
-          puts "更新ci文件".green
+          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")
           if check_ci
-            edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+            # 检查 ci 文件是否有变化
+            remote_content = file_contents("#{Constant.NameSpace}#{@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')
+            strip_ci_content = ci_content.gsub(/\s/,'')
+
+            if strip_ci_content.eql?strip_remote_content
+              puts "无需更新CI文件".green
+            else 
+              edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+              mr_to_master_if_need
+            end
           else 
             create_file('.gitlab-ci.yml', ci_content, 'init ci')
+            mr_to_master_if_need
+          end
+        end
+
+        def mr_to_master_if_need 
+          isEmptyMR = mr_to_master
+          if !isEmptyMR
+            accept_merge_request
           end
         end
 
@@ -137,7 +161,7 @@ module Gct
           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
+          puts "#{@name} 更新版本号为：#{@new_tag}".green
           edit_file(@file, updated_podspec_content, "@config 更新版本号：#{@new_tag}")
           mr_to_master
           accept_merge_request
@@ -192,7 +216,7 @@ module Gct
           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
+          puts "开始上传podspec...  请在CI中查看结果".green
         end
       end
     end

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.4.2".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.0".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.2
+  version: 0.5.0
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -134,20 +148,6 @@ 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
@@ -192,6 +192,7 @@ 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/spec.rb
 - lib/gct/command/spec/lint.rb