gct 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e191b1ed5ae2ce3b7cb3c7801ed0902d300ee77a19cfcc1ce455630a1f47b8
-  data.tar.gz: 4c6d74e11b168ebe5a5629ff6ea647f23fb7c28a26442224ef05c27e3b83e7d6
+  metadata.gz: 4e318b5c37b33f5817c365674563b449e2621357cc69f89baf3d4e4e32938d62
+  data.tar.gz: 205fe7fae1b93d40edb9ca032f3e39cf5f616351e2ea84df7bef4f246bbc882d
 SHA512:
-  metadata.gz: 3049ea6bc870721c728a226f8e07465ffe7b7d919a9a2aa1cfeab750d7f6aabf0eb6fd38a9b630962988a7acdb0beb0c973d90319d50ca7818ca16fb12deb351
-  data.tar.gz: ab44e1b3569ec632f1da15c3d904eff2f50eab20104ac1219d6665e322d91fae4ac828e7331d21f149a10c376dcebdc164d915be7682e8bf49c7a3d746bb38aa
+  metadata.gz: 91b755107f0c6e1c72d1b6d00318e20b6b0af5dd85f1a1e8216f6c8b242921f107b1b0979aad893d95c09ba0883aef86f7aca8ef7a2e3bfeb4f4660cf783e634
+  data.tar.gz: 413d382f1fd3c33c1fa753011f484105123028440ac91af06427466c975636cf069103854fa82970418c7f5dbdb32c4433cd59d95aa93eb43c90979b0def09c1

data/lib/gct/command.rb

@@ -94,8 +94,8 @@ module Gct
     end
 
     def auto_add_tag(tag)
-      puts "current 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

@@ -74,11 +74,6 @@ 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()
@@ -115,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
@@ -246,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)," : "),"))
@@ -258,6 +264,14 @@ 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
@@ -272,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/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/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/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.5".freeze unless defined? Gct::VERSION
+  VERSION = "0.5.6".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.5
+  version: 0.5.6
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-02 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