gct 0.3.93 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90278a27edf99a940f703b359f26160c3534f51bb8e3ad7dc2b9af240209fe1
-  data.tar.gz: 9a62537fadb1678a6d8c1969e1b487c844117b1e58c9089038ccc9bbcaba8328
+  metadata.gz: 2543169b03dd0c5d196ea4af9fb3214efccfd54165fb5418c3fb36e9f04c0b88
+  data.tar.gz: a17f7e2f676904a9c8c6b0acd7ffc08fe0d8db6f07f974f8825e90a120ffa2cb
 SHA512:
-  metadata.gz: acfa21c1c8cc42efc63f2d06fd49799146e8a17f6fcbcefc7480a9d2579db448280cdd78ea035bcb9906ab0facaa00926452fe429f7733c35c54b035ca6c411d
-  data.tar.gz: feafb9b42ecdbc68b5dd91ef4415ebb6d0b0f871a0e70f11fe49537ecfa1319ad282bf1dca09c5c42974ff203c6123dbb3a0bf78b3c749657f0be9fcfff9801c
+  metadata.gz: 8c620629c7a89a8758a44c45635ed470cc42330f954c05a2bb7caf0adf2892215f7b40833f702a1378e18e648ec7ce383e5f81520622a5bd4677899ea74c7687
+  data.tar.gz: c1ad60709ac0c069086abccd377cf30a106f34f93ca224ca6541a0bcbf6010f521503beff69ee035648d1b74de8f73b751c7e819b638ea84928182d46970faff

data/lib/gct.rb

@@ -13,4 +13,8 @@ module Gct
     require "gct/generator/gct_file"
   end
 
+  module Database
+    require "gct/database/data"
+  end
+
 end

data/lib/gct/command.rb

@@ -27,6 +27,7 @@ module Gct
     require 'gct/command/setup'
     require 'gct/command/update'
     require 'gct/command/robot'
+    require 'gct/command/clean'
 
     self.abstract_command = true
     self.command = 'gct'
@@ -51,8 +52,6 @@ module Gct
         Colored2.disable!
         String.send(:define_method, :colorize) { |string, _| string }
       end
-
-      config_gitlab 
     end
 
     def file_contents(project_id, file, branch)
@@ -62,7 +61,7 @@ module Gct
     end
 
     def config_gitlab
-      if FileBase.exist_root and token and Gitlab.endpoint.nil?
+      if FileBase.exist_root and token
         Gitlab.configure do |config|
           config.endpoint = 'https://gi-dev.ccrgt.com/api/v4' 
           config.private_token = token       

data/lib/gct/command/autotag.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'tmpdir'
 require 'parallel'
+require 'pp'
 
 module Gct
   class Command
@@ -13,20 +14,27 @@ module Gct
       self.arguments = [
         CLAide::Argument.new('PROJECT_ID', true),
         CLAide::Argument.new('BRANCH', true),
+        CLAide::Argument.new('VERSION', true),
       ]
 
       def initialize(argv)
         gitlab_error
+        config_gitlab
         @update_ci = argv.flag?('update-ci', false)
-        @project_id = "ios/#{argv.shift_argument}"
+        @pre = argv.flag?('pre', false)
+        name = argv.shift_argument
+        @project_id = "ios/#{name}"
+        @project_name = name
         @branch = argv.shift_argument
+        @version = argv.shift_argument
         @file = 'Podfile'
         super
       end
 
       def self.options
         [
-          ['--update-ci', '是否更新CI']
+          ['--update-ci', '是否更新CI'],
+          ['--pre', '是否为预发tag'],
         ].concat(super)
       end
 
@@ -34,11 +42,40 @@ module Gct
         super
         help! '请输入项目名.' unless @project_id
         help! '请输入分支名.' unless @branch
+        help! '请输入版本号.' unless @version
       end
 
       def run
         FileBase.root_err
-        analyze_dependencies
+        puts "开始分析podfile文件".green
+        puts ""
+        where_statement = "and is_pre = #{@pre ? 1 : 0}"
+        p_db = Database::Data.new
+        p_sql = "select * from project where version = '#{@version}' #{where_statement}"
+        p_res = p_db.query(p_sql)
+        
+        if !p_res.nil? && p_res.count > 0 
+          res_first = nil
+          p_res.each do |row|
+            res_first = row
+            break
+          end
+          if res_first["is_done"].to_i == 0
+            tmp_podspecs
+            create_tag_by_priority()
+          else
+            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)
@@ -47,38 +84,85 @@ module Gct
       end
       
       def podfile
-        # if check_branch_can_be_update('zeus')
-        if check_branch('ft/tag') # TODO: Test branch  
-          contents = file_contents(@project_id, @file, @branch)
-          contents.force_encoding('UTF-8')
-          puts contents
-          temp_local_file = TempLocalFile.new(contents, @file)
-          temp_local_file.write
-          full_path = temp_local_file.full_path
-
-          @podfile ||= begin
-            podfile = Pod::Podfile.from_ruby(full_path, contents)
-            podfile
-          end
+        contents = file_contents(@project_id, @file, @branch)
+        contents.force_encoding('UTF-8')
+        temp_local_file = TempLocalFile.new(contents, @file)
+        temp_local_file.write
+        full_path = temp_local_file.full_path
+
+        @podfile ||= begin
+          podfile = Pod::Podfile.from_ruby(full_path, contents)
+          podfile
         end
       end
 
-      def analyze_dependencies 
-        untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagBranch}
+      def tmp_podspecs
+        untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagFromBranch}
+        raise "没有需要打tag的库".red if untagged_git_dependencies.count == 0
 
-        untagged_specs = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
+        spec_files = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
+          project_name = "#{Constant.NameSpace}#{dep.name}"
+          branch = Constant.DefaultTagFromBranch
+          if @pre
+            branch = Constant.PreTagFromBranch
+            create_pre_branch(branch, project_name)
+          end
           file_name = "#{dep.name}.podspec"
-          podspec_contents = file_contents("#{Constant.NameSpace}#{dep.name}", file_name, Constant.DefaultTagBranch)
+          podspec_contents = file_contents(project_name, file_name, branch)
           temp_local_spec_file = TempLocalFile.new(podspec_contents, file_name)
           temp_local_spec_file.write
-          spec_file = temp_local_spec_file.full_path
+          path = temp_local_spec_file.full_path
+          spec = Pod::Specification.from_file(path)
+          remove_tag(auto_add_tag(spec.version.to_s), project_name)
+          path
+        end
+        spec_files
+      end
+      
+      def create_pre_branch(branch, project_name)
+        puts "正在创建#{project_name}预发分支!".green
+        bs = Gitlab.branches(project_name)
+        to_b = Constant.DefaultTagToBranch
+        pre_to_b = Constant.PreTagToBranch
+        from_b = Constant.DefaultTagFromBranch
+        bs.each do |b|
+          if b["name"].eql?(branch)
+            Gitlab.delete_branch(project_name, branch)
+          end
+          if b["name"].eql?(pre_to_b)
+            Gitlab.delete_branch(project_name, pre_to_b)
+          end
+        end
+        Gitlab.create_branch(project_name, branch, from_b)
+        Gitlab.create_branch(project_name, pre_to_b, to_b)
+      end
 
+      def remove_tag(tag, name)
+        # 判断是否有这个tag
+        tag = "#{tag}#{Constant.PreHuffix}"
+        command = `git rev-parse --is-inside-work-tree`
+        if command.eql?("true")
+          `git tag -d #{tag}`
+          `git push origin :refs/tags/#{tag}`  
+        else
+          tags = Gitlab.tags("#{name}")
+          tags.each do |t|
+            if t["name"].eql?("#{tag}")
+              Gitlab.delete_tag("#{name}", "#{tag}")
+              break
+            end
+          end
+        end
+      end
+
+      def analyze_dependencies 
+        untagged_specs = tmp_podspecs.map do |spec_file| 
           # 创建podspec对象
           spec = Pod::Specification.from_file(spec_file)
           gct_spec = Specification.new()
           gct_spec.name = spec.name
           gct_spec.priority = 1000
-          gct_spec.status = SpecPublishStatus::CREATED
+          gct_spec.status = SpecPublishStatus::WAITING
           gct_spec.tag = "0"
           dependencySpecs = Array.new()
           if spec.subspecs.length == 0
@@ -86,7 +170,7 @@ module Gct
               sub_spec = Specification.new()
               sub_spec.name = dep.root_name
               sub_spec.priority = 1000
-              sub_spec.status = SpecPublishStatus::CREATED
+              sub_spec.status = SpecPublishStatus::WAITING
               sub_spec.tag = "0"
               sub_spec
             end 
@@ -97,7 +181,7 @@ module Gct
                 sub_spec = Specification.new()
                 sub_spec.name = dep.root_name
                 sub_spec.priority = 1000
-                sub_spec.status = SpecPublishStatus::CREATED
+                sub_spec.status = SpecPublishStatus::WAITING
                 sub_spec.tag = "0"
                 sub_spec
               end 
@@ -108,8 +192,7 @@ module Gct
           gct_spec.dependencySpecs = dependencySpecs
           gct_spec
         end
-
-        priority_rank(untagged_specs)
+        untagged_specs
       end
 
       def eqlBetweenHash(hash1, hash2) 
@@ -133,12 +216,10 @@ module Gct
           temp_spec_map[spec.name] = spec
         end
         temp_spec_map_copy = Hash.new()
-        count = 1
 
         while !(eqlBetweenHash(temp_spec_map, temp_spec_map_copy)) do
           # 深拷贝
           temp_spec_map_copy = Marshal.load(Marshal.dump(temp_spec_map))
-          puts "--- times == #{count} ---"
           specs.map do |spec| 
             temp_spec = temp_spec_map[spec.name]
             spec.dependencySpecs.map do |subspec| 
@@ -150,10 +231,55 @@ module Gct
               end
             end
           end
-          count += 1
-          temp_spec_map.each { |key, value| 
-            puts "#{key} => #{value.priority}"
-          }
+        end
+
+        values = ""
+        temp_spec_map.each do |key, value| 
+          values.concat("('#{@version}', '#{key}', '#{@project_name}', '#{value.tag}', '#{value.status}', #{value.priority}" + (@pre ? ", 1)," : "),"))
+        end
+        val = values[0, values.length - 1]
+        keys = "(project_version, pod_name, project_name, tag_version, tag_status, priority" + (@pre ? ", is_pre)" : ")")
+        sql = "insert into tag #{keys} values #{val}"
+        db = Database::Data.new
+        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 where project_version = '#{@version}' and tag_status != '#{SpecPublishStatus::SUCCESS}' #{where_statement})"
+        result = db.query(sql)
+        vals = ""
+        ins = ""
+        if !result.nil? && result.count > 0
+          result.each do |row|
+            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"]
+              vals.concat("when pod_name = '#{name}' then '#{status}' ")     
+              ins.concat("'#{name}',")
+              system "gct update dependency #{name} tag_status #{status}"
+              skip_tag = ""
+              if row["is_tag"].to_i == 1 
+                skip_tag = "--skip-tag"
+              end
+              pre = ""
+              if row["is_pre"].to_i == 1
+                pre = "--pre"
+              end
+              system "gct update tag #{name} --auto-tag --update-ci #{skip_tag} #{pre}"
+            end
+          end
+          f_ins = ins[0, ins.length - 1]
+          sql = "update tag set tag_status = (
+          case 
+          #{vals}
+          end
+          ) where pod_name in (#{f_ins}) and project_version = '#{@version}'"
+          update_db = Database::Data.new
+          update_db.query(sql)
         end
       end
     end

data/lib/gct/command/clean.rb

@@ -0,0 +1,15 @@
+require 'gct/command/clean/cache'
+require 'gct/command/clean/ci'
+require 'gct/command/clean/lint'
+
+module Gct
+  class Command
+    class Clean < Command
+      self.abstract_command = true
+      self.summary = '清理缓存的相关操作'
+      self.description =  <<-DESC
+        清理lint缓存,Xcode build缓存,ci build 缓存
+      DESC
+    end
+  end
+end

data/lib/gct/command/clean/cache.rb

@@ -0,0 +1,26 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Cache < Clean
+
+        self.summary = '清理Xcode build缓存'
+        self.description = <<-DESC
+          清理Xcode build缓存
+        DESC
+
+        def initialize(argv)
+         
+          super
+        end
+
+        def run 
+          home_path = Generator::GctFile.get_system_home_path().rstrip
+          xcache_path = "#{home_path}/Library/Developer/Xcode/DerivedData/"
+          `rm -rf #{xcache_path}`
+        end
+
+      
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Ci < Clean
+
+        self.summary = '清除ci缓存'
+        self.description = <<-DESC
+          清除ci缓存，默认清除所有
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', false),
+        ]
+
+        def initialize(argv)
+          super
+        end
+
+      
+      end
+    end
+  end
+end

data/lib/gct/command/clean/lint.rb

@@ -0,0 +1,28 @@
+module Gct
+  class Command
+    class Clean < Command
+      class Lint < Clean
+
+        self.summary = '清除lint缓存'
+        self.description = <<-DESC
+          清除lint缓存，默认清除所有
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('POD_NAME', false),
+        ]
+
+        def initialize(argv)
+          @pod_name = argv.shift_argument
+          super
+        end
+
+        def run 
+          home_path = Generator::GctFile.get_system_home_path().rstrip
+          lintcahce_path = "#{home_path}/Library/Caches/CocoaPods/Pods/External/#{@pod_name}"
+          `rm -rf #{lintcahce_path}`
+        end
+      end
+    end
+  end
+end

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

@@ -7,9 +7,13 @@ push_pod:
   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:
     - tags
   tags:
@@ -19,6 +23,9 @@ 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