gct 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 706538e61e101d63b9718a329ba5fd7102b04b136bafe4c7fda01bc6c1d02ca9
-  data.tar.gz: bcba7c7cfef559c1fccf0c583a6c2a2bcf6f775eca9be2463812b1621bc81cc7
+  metadata.gz: 49d023707cc751bfa181d6d9d8cd1d4b9f11bfae9fdf097973ebe9c5d3b3f067
+  data.tar.gz: e1c26e29bcd95c1c6d6e903477b3bacf0c25af3fe8fd783665d8fa8f90d720c4
 SHA512:
-  metadata.gz: 1247a36c962b9fea025ba28ec47b8a27dbd3fd7d4e1da0b9e9ff4db14436961ab4fcd738b508c9e801e34f06f3746375f86b58c987eb179070087fdea6f55620
-  data.tar.gz: 7c715cec4e38bbc0150d1c5ebd658a2edb485ed15a72af7269e23b4f9912bddd7635b07d7f83566e9226eec89d9e887555c802ec54b4ae8d46fdb2bc3f7e52fa
+  metadata.gz: e384f9650e17242e54ac542fbc567a873d5bcd8d0a128961c948acd562a8c3bc6b4ac5568b65738bef6ec2172274c76c1a8256f568171b565396840fd6e1715b
+  data.tar.gz: 9c4651b176232bd7e57e4a33bd08f6dc3dbbf09fbfb99263b067e13136017dee7b87be14c827396550cf6fe10cba59e0946e1510eb4f5f2baff62fb440421fc0

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

@@ -51,11 +51,9 @@ 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
           end
           remove_and_create_tag
         end
@@ -93,15 +91,32 @@ 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
@@ -141,7 +156,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
@@ -196,7 +211,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.3".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.1".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.3
+  version: 0.5.1
 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