gct 0.3.91 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2544c8db653759d99e1ddc1007090e03db770c715f30d9e5f5f770076226ddd0
-  data.tar.gz: aee1cfc33e68777d545884cdb0025c2018821d83ecb2668ea33a3e8b51cad34f
+  metadata.gz: 8eacd230eb51e7c03f69df817172a1684c61a016b476ee9bede1a4490751084c
+  data.tar.gz: 4f9525f907f827cbe90806a0fc11b42c64bc4cdefda2f6982da2e2ce6d117e1d
 SHA512:
-  metadata.gz: ec1ef12cfdf4ff81fa1fb7678da36d05a50657d5dbf4453718270657755330bed58eba1492ea42ca4ad9ce8c829a6083ac92101ce892ae2f0809741eb464fbdd
-  data.tar.gz: dd8d0bbf4646aca64790eae2c21aa9910f7912ee202f0a9547048978190813c1bcca6a19e338ce6865d3c73931e72bb0875ad8ae5783dfda8ca8d11b8002c29c
+  metadata.gz: d93d45b1ffee87733b11bc2f70fc4c35fb510c99bece66196d87b49dadb98f7a9648bb2a407cc78e98223ffbeafb1523f120ff8fec7b4ca127e9eb461a6dad24
+  data.tar.gz: 606a302705d5305cb8d5260d489d551794ffedabea91b7da81bc7ea66cc31042d2dad835a6fd6edccc82369b45d7e4ba5de55a35fceb3b520d29468a73a36115

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'

data/lib/gct/command/autotag.rb

@@ -38,7 +38,19 @@ module Gct
 
       def run
         FileBase.root_err
-        analyze_dependencies
+        puts "开始分析podfile文件".green
+        puts ""
+        exist_dep = FileBase.exist_dependency
+        if exist_dep
+          tmp_podspecs
+          priority_map = FileBase.yaml_dependency_read
+          create_tag_by_priority(priority_map)
+        else
+          untagged_specs = analyze_dependencies
+          priority_map = priority_rank(untagged_specs)
+          generate_dependency_file(priority_map)
+          create_tag_by_priority(priority_map)
+        end
       end
 
       def check_branch(branch)
@@ -48,10 +60,9 @@ module Gct
       
       def podfile
         # if check_branch_can_be_update('zeus')
-        if check_branch('ft/tag') # TODO: Test branch  
+        # 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
@@ -60,25 +71,30 @@ module Gct
             podfile = Pod::Podfile.from_ruby(full_path, contents)
             podfile
           end
-        end
+        # end
       end
 
-      def analyze_dependencies 
+      def tmp_podspecs
         untagged_git_dependencies = podfile.dependencies.select { |dependency| dependency.external? && dependency.external_source[:tag].nil? && dependency.external_source[:branch] == Constant.DefaultTagBranch}
 
-        untagged_specs = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
+        spec_files = Parallel.map(untagged_git_dependencies, in_threads: 1) do |dep| 
           file_name = "#{dep.name}.podspec"
           podspec_contents = file_contents("#{Constant.NameSpace}#{dep.name}", file_name, Constant.DefaultTagBranch)
           temp_local_spec_file = TempLocalFile.new(podspec_contents, file_name)
           temp_local_spec_file.write
-          spec_file = temp_local_spec_file.full_path
+          temp_local_spec_file.full_path
+        end
+        spec_files
+      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 +102,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 +113,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 +124,7 @@ module Gct
           gct_spec.dependencySpecs = dependencySpecs
           gct_spec
         end
-
-        priority_rank(untagged_specs)
+        untagged_specs
       end
 
       def eqlBetweenHash(hash1, hash2) 
@@ -133,12 +148,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,11 +163,70 @@ module Gct
               end
             end
           end
-          count += 1
-          temp_spec_map.each { |key, value| 
-            puts "#{key} => #{value.priority}"
-          }
         end
+        dependency_map = Hash.new()
+        priority_map = Hash.new()
+        temp_spec_map.each do |key, value| 
+          dependency_map[key] = {"priority" => value.priority, "tag" => value.tag, "status" => value.status}
+        end
+        priority = 1000
+        while priority <= 1000 do
+          tmp_hash = Hash.new()
+          dependency_map.each do |key, value|
+            if (value["priority"] == priority)
+                tmp_hash.store(key, {"tag" => value["tag"], "status" => value["status"]})
+                dependency_map.delete(value)
+            end
+          end
+          if (tmp_hash.keys.count == 0)
+              priority = 1001
+          else
+              priority_map[priority.to_s] = tmp_hash
+              priority -= 1
+          end
+        end
+        priority_map
+      end
+
+      def generate_dependency_file(priority_map)
+        yaml_path = "#{Generator::GctFile.temp_folder_path}/#{Constant.DependencyName}"
+        FileBase.yaml_write_map(yaml_path, priority_map)
+      end
+
+      # 按优先级打tag, 触发第一个优先级，其他的上一优先级打完之后自动触发
+      def create_tag_by_priority(priority_map)
+        priority = get_current_need_tag_priority
+        value = priority_map[priority.to_s]
+        raise "没有需要打tag的库".red if value.keys.count == 0
+        value.each do |key, val|
+          if val["status"].eql?(SpecPublishStatus::WAITING) || val["status"].eql?(SpecPublishStatus::CANCELED) || val["status"].eql?(SpecPublishStatus::FAILED)
+            status = SpecPublishStatus::PENDING
+            val["status"] = status
+            system "gct update dependency #{key} status #{status}"          
+            system "gct update tag #{key} --auto-tag"
+          end
+        end
+      end
+
+      # 当前优先级是否已打完
+      def get_current_need_tag_priority
+        priority = 1000
+        content_map = FileBase.yaml_dependency_read
+        priority_map = content_map[priority.to_s]
+        is_all_done = true
+        while is_all_done do
+          priority_map.each do |k, v|
+            if !v["status"].eql?(SpecPublishStatus::SUCCESS)
+              is_all_done = false
+              break
+            end
+          end
+          if is_all_done
+              priority -= 1
+              priority_map = content_map[priority.to_s]
+          end
+        end
+        priority
       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

@@ -5,11 +5,15 @@ stages:
 push_pod:
   stage: push
   script: 
-    - gct robot start
+    - gct robot start --test
     - echo "开始lint 和 push podspec"
+    - gct update dependency $CI_PROJECT_NAME "status" "发布中"
+    - gct clean lint $CI_PROJECT_NAME
     - gct repo update
     - gct repo push
-    - gct robot finish true
+    - gct robot finish true --test
+    - gct update dependency $CI_PROJECT_NAME "tag" $CI_COMMIT_REF_NAME
+    - gct update next
   only:
     - tags
   tags:
@@ -18,7 +22,10 @@ push_pod:
 on_failure:
   stage: failure
   script:
-    - gct robot finish false
+    - gct robot finish false --test
+    - gct update dependency $CI_PROJECT_NAME "status" "发布失败"
   when: on_failure
+  only: 
+    - tags
   tags:
     - iOS

data/lib/gct/command/op.rb

@@ -2,6 +2,7 @@ require 'gct/command/op/gems'
 require 'gct/command/op/gitconf'
 require 'gct/command/op/xcache'
 require 'gct/command/op/root'
+require 'gct/command/op/lint'
 
 module Gct
   class Command

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

@@ -0,0 +1,35 @@
+module Gct
+  class Command
+    class Op < Command
+      class Lint < Op
+
+        self.summary = '打开lint 缓存文件夹'
+        self.description = <<-DESC
+        打开lint 缓存文件夹
+      DESC
+
+        self.arguments = [
+        ]
+
+        def initialize(argv)
+          super
+        end
+
+        def validate!
+          super
+        end
+
+        def run
+          openLintCache
+        end
+
+        def openLintCache
+          lintCache = '~/Library/Caches/CocoaPods/Pods/External/'
+          puts "Xcode缓存路径为：#{lintCache}".green
+          system "open #{lintCache}"
+        end
+      end
+    end
+  end
+end
+

data/lib/gct/command/robot.rb

@@ -1,5 +1,7 @@
 require 'gct/command/robot/start'
 require 'gct/command/robot/finish'
+require 'net/https'
+require 'json'
 
 module Gct
   class Command
@@ -9,6 +11,43 @@ module Gct
       self.description =  <<-DESC
         发送jenkins和gitlab机器人消息
       DESC
+
+      def self.options
+        [
+          ['--test', '测试机器人，测试webhook'],
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @test = argv.flag?('test', false)
+        super
+      end
+
+      def robot_send(content)
+        if @test
+          webhook = FileBase.get_config("gitlab-robot-webhook-test")
+        else
+          webhook = FileBase.get_config("gitlab-robot-webhook")
+        end
+        raise "请先设置webhook --> gct config set gitlab-robot-webhook WEBHOOK_URL" if webhook.nil? || webhook.empty? 
+        url = URI(webhook)
+          
+        http = Net::HTTP.new(url.host, url.port)
+        if url.scheme == "https"
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+        end
+        
+        data = {
+          "msgtype": "markdown",
+          "markdown": {
+            "content": "#{content}"
+          }
+        }.to_json
+        
+        header = {'content-type':'application/json'}
+        response = http.post(url, data, header)
+      end
     end
   end
 end

data/lib/gct/command/robot/finish.rb

@@ -1,5 +1,4 @@
-require 'net/https'
-require 'json'
+
 
 module Gct
   class Command
@@ -15,6 +14,12 @@ module Gct
           CLAide::Argument.new('BUILD_STATUS', true),
         ]
 
+        def self.options
+          [
+            ['--test', '测试机器人，测试webhook'],
+          ].concat(super)
+        end
+
         def initialize(argv)
           @project_name = ENV['CI_PROJECT_NAME']
           @user_name = ENV['GITLAB_USER_NAME']
@@ -22,31 +27,22 @@ module Gct
           @build_status = argv.shift_argument
           @commit_sha = ENV['CI_COMMIT_SHA'] 
           @ci_url = ENV['CI_PIPELINE_URL']
+          @test = argv.flag?('test', false)
           super
         end
 
         def run
-          build_text = @build_status ? "<font color=\"info\">CI运行成功</font>" : "<font color=\"comment\">CI运行失败</font>，请相关人员注意"
-          ci_text = "[点击跳转](#{@ci_url})"
-          
-          webhook = FileBase.get_config("gitlab-robot-webhook")
-          url = URI(webhook)
-          
-          http = Net::HTTP.new(url.host, url.port)
-          if url.scheme == "https"
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+          puts @build_status.class
+          puts "build_status == #{@build_status}"
+          if @build_status.eql?("false")
+            build_text = "<font color=\"comment\">CI运行失败</font>，请相关人员注意"
+          elsif @build_status.eql?("true")
+            build_text = "<font color=\"info\">CI运行成功</font>"
           end
-          
-          data = {
-            "msgtype": "markdown",
-            "markdown": {
-              "content": "**#{@project_name}   #{build_text}**\n\n\n>触发人：#{@user_name}\n\n>tag：#{@tag}\n\n>commitid：#{@commit_sha}\n\n>流水线地址：#{ci_text}"
-            }
-          }.to_json
-          
-          header = {'content-type':'application/json'}
-          response = http.post(url, data, header)
+          ci_text = "[点击跳转](#{@ci_url})" 
+
+          content = "**#{@project_name}   #{build_text}**\n\n\n>触发人：#{@user_name}\n\n>tag：#{@tag}\n\n>commitid：#{@commit_sha}\n\n>流水线地址：#{ci_text}"
+          robot_send(content)
         end
       end
     end

data/lib/gct/command/robot/start.rb

@@ -14,33 +14,23 @@ module Gct
         self.arguments = [
         ]
 
+        def self.options
+          [
+            ['--test', '测试机器人，测试webhook'],
+          ].concat(super)
+        end
+
         def initialize(argv)
           @project_name = ENV['CI_PROJECT_NAME']
           @tag = ENV['CI_COMMIT_REF_NAME']
+          @test = argv.flag?('test', false)
           super
         end
 
         def run
-          webhook = FileBase.get_config("gitlab-robot-webhook")
-          raise "请先设置webhook --> gct config set gitlab-robot-webhook WEBHOOK_URL" if webhook.nil? || webhook.empty? 
-          url = URI(webhook)
-          
-          http = Net::HTTP.new(url.host, url.port)
-          if url.scheme == "https"
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
-          end
-          
           message = " <font color=\"info\">#{@tag}</font>  开始打tag"
-          data = {
-            "msgtype": "markdown",
-            "markdown": {
-              "content": "**#{@project_name}** #{message}"
-            }
-          }.to_json
-          
-          header = {'content-type':'application/json'}
-          response = http.post(url, data, header)
+          content = "**#{@project_name}** #{message}"
+          robot_send(content)
         end
       end
     end

data/lib/gct/command/setup.rb

@@ -15,9 +15,18 @@ module Gct
         create_root_folder
         create_temp_folder
         create_config_file
+        create_backup_folder
         puts "setup success!".green
       end
 
+      def create_backup_folder
+        backup_path = Generator::GctFile.backup_folder_path
+        if !File.exist?(backup_path) 
+          system "mkdir #{backup_path}", exception: true
+          puts "#{backup_path} 创建成功!".green
+        end
+      end
+
       def create_root_folder
         gct_path = Generator::GctFile.root_folder_path
         if !File.exist?(gct_path) 

data/lib/gct/command/tag.rb

@@ -0,0 +1,13 @@
+require 'gct/command/tag/next'
+
+module Gct
+  class Command
+    class Tag < Command
+      self.abstract_command = true
+      self.summary = 'tag 相关操作'
+      self.description =  <<-DESC
+        tag 相关操作
+      DESC
+    end
+  end
+end

data/lib/gct/command/update.rb

@@ -1,5 +1,8 @@
-require 'gct/command/update/tag'
+require 'gct/command/update/dependency'
+require 'gct/command/update/podfile'
 require 'gct/command/update/version'
+require 'gct/command/update/next'
+require 'gct/command/update/tag'
 
 module Gct
   class Command

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

@@ -0,0 +1,22 @@
+module Gct
+  class Command
+    class Update < Command
+      class Analyze < Update
+        self.summary = '编译'
+        self.description =  <<-DESC
+          下一个优先级打tag
+        DESC
+
+        def initialize(argv)
+
+          super
+        end
+
+        def run
+          
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Gct
+  class Command
+    class Update < Command
+      class Dependency < Update
+
+        self.summary = '更新依赖文件'
+        self.description = <<-DESC
+            更新依赖文件
+        DESC
+
+        self.arguments = [
+          # CLAide::Argument.new('PRIORITY', false),
+          CLAide::Argument.new('POD_NAME', false),
+          CLAide::Argument.new('KEY', false),
+          CLAide::Argument.new('VALUE', false),
+        ]
+
+        def initialize(argv)
+          # @priority = argv.shift_argument
+          @pod_name = argv.shift_argument
+          @key = argv.shift_argument
+          @value = argv.shift_argument
+          super
+        end
+
+        def validate!
+            super
+        end
+
+        def run
+          FileBase.yaml_dependency_update(@pod_name, @key, @value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+module Gct
+  class Command
+    class Update < Command
+      class Next < Update
+        self.summary = '编译'
+        self.description =  <<-DESC
+          下一个优先级打tag
+        DESC
+
+        def initialize(argv)
+          @project_name = ENV['CI_PROJECT_NAME']
+          super
+        end
+
+        def run
+          batch_tag
+        end
+
+        def batch_tag 
+          value = next_specs
+          if val.nil? 
+            return
+          end
+          if value.keys.count == 0
+            puts "tag已全部打完！！！".green
+            # 执行更新podfile的操作
+            # system "gct update podfile"
+          else
+            value.each do |key, val|
+              if val["status"].eql?(SpecPublishStatus::WAITING) || val["status"].eql?(SpecPublishStatus::CANCELED) || val["status"].eql?(SpecPublishStatus::FAILED)
+                status = SpecPublishStatus::PENDING
+                val["status"] = status
+                system "gct update dependency #{key} status #{status}" 
+                system "gct update tag #{key} --auto-tag --update-ci"
+              end
+            end
+          end
+        end
+
+        def next_specs
+          priority = get_current_project_priority
+          content_map = FileBase.yaml_dependency_read
+          priority_map = content_map[priority.to_s]
+          is_all_done = true
+          priority_map.each do |k, v|
+            if !v["status"].eql?("发布成功")
+              is_all_done = false
+              break
+            end
+          end 
+          if is_all_done
+            content_map[(priority - 1).to_s]
+          else
+            nil
+          end
+        end
+
+        def get_current_project_priority 
+          content_map = FileBase.yaml_dependency_read
+          priority = 1000
+          content_map.each do |k, v|
+            if v.keys.include?(@project_name)
+              priority = k
+              break
+            end
+          end
+          priority
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Gct
+  class Command
+    class Update < Command
+      class Podfile < Update
+
+        self.summary = '更新podfile文件'
+        self.description = <<-DESC
+          更新podfile文件
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('VERSION', true),
+      ]
+
+        def initialize(argv)
+          @version = argv.shift_argument
+          super
+        end
+
+        def validate!
+            super
+        end
+
+        def run
+
+        end
+
+        # 删除和备份
+        def remove_and_backup
+          d_name = Constant.DependencyName
+          Dir.chdir(FileBase.tmp_path) do
+            # 备份dependency文件到backup文件夹下
+            system "cp #{d_name} ../backup/#{d_name}-#{@version}"
+            # 删除tmp文件夹下所有文件
+            system "rm -rf *"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,7 @@ module Gct
           [
             ['--skip-tag', '是否忽略tag，直接触发ci'],
             ['--update-ci', '是否更新CI'],
+            ['--auto-tag', '自动化'],
           ].concat(super)
         end
 
@@ -24,14 +25,17 @@ module Gct
             @update_version_branch = 'develop'
             @skip_tag = argv.flag?('skip-tag', false)
             @update_ci = argv.flag?('update-ci', false)
-            @file = get_spec_file
-            name = argv.shift_argument
-            @name = name.nil? ? @spec.name : name
+            @auto_tag = argv.flag?('auto-tag', false)
+            @name = argv.shift_argument
             @tag = argv.shift_argument
+            @file = get_spec_file
+            if @name.nil?
+              @name = @spec.name
+            end
             @project_id = "#{Constant.NameSpace}#{@name}"
             super
         end
-
+        
         def run
           update_ci_method if @update_ci
           if @skip_tag 
@@ -44,8 +48,17 @@ module Gct
         def skip_tag_method 
           @new_tag = @spec.version
           puts "tag == #{@new_tag}"
-          delete_tag  # remove tag
-          create_tag  # create tag
+          if !@update_ci
+            isEmptyMR = mr_to_master
+            if !isEmptyMR
+              accept_merge_request
+            end
+          end
+          # remove tag
+          `git tag -d #{@new_tag}`
+          `git push origin :refs/tags/#{@new_tag}`  
+          # create tag
+          create_tag
         end
 
         def update_ci_method
@@ -54,16 +67,26 @@ module Gct
           path = File.expand_path("../../init", __FILE__)
           ci_content = temp_local_file.read_path_file(path, "gitlab-ci.rb")
           edit_file('.gitlab-ci.yml', ci_content, 'update ci')
-          mr_to_master
-          accept_merge_request
+          isEmptyMR = mr_to_master
+          if !isEmptyMR
+            accept_merge_request
+          end
         end
 
         def get_spec_file
+          spec_file = nil
+          if @auto_tag 
+            raise "podspec名不能为空！！！".red if spec_file.nil? if @name.nil?
+            Dir.chdir(FileBase.tmp_path) do
+              spec_file = Pathname.glob("#{@name}.podspec").first
+              raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
+            end
+          else
             spec_file = Pathname.glob('*.podspec').first
             raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
-
-            @spec = Pod::Specification.from_file(spec_file)
-            spec_file
+          end
+          @spec = Pod::Specification.from_file(spec_file)
+          spec_file
         end
 
         def update_podspec_version 
@@ -90,12 +113,18 @@ module Gct
 
         def mr_to_master
           puts "正在创建MR请求将develop分支合并到master！".green
-          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "更新版本podpesc版本号", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
+          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@name}", "mr", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
+          # puts mr.to_hash
           @id = mr.iid
           puts mr.merge_status
-          if mr.merge_status == 'cannot_be_merged' 
+          isEmptyMR = mr.diff_refs.base_sha.eql?(mr.diff_refs.head_sha)
+          # puts mr.diff_refs.base_sha
+          # puts 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
           end
+          isEmptyMR
         end
   
         def accept_merge_request
@@ -105,8 +134,8 @@ module Gct
           end
         end
 
-        def delete_tag
-          Gitlab.delete_tag("#{@project_id}", "#{@new_tag}")
+        def close_mr 
+          Gitlab.update_merge_request("#{@project_id}", @id, {state_event: 'close'})
         end
 
         def create_tag

data/lib/gct/constant.rb

@@ -24,6 +24,10 @@ module Gct
       def DefaultTagBranch
         "develop"
       end
+
+      def DependencyName
+        "dependency"
+      end
     end
   end
 end

data/lib/gct/file_base.rb

@@ -7,10 +7,41 @@ module Gct
         @path = path
       end
 
+      def yaml_dependency_read
+        path = dependency_path
+        config_map = YAML.load(File.open(path, "r"))
+        config_map
+      end
+
+      def yaml_dependency_update(pod_name, key, value)
+        begin
+          path = dependency_path
+          config_map = YAML.load(File.open(path, "r"))
+          puts config_map
+          config_map = Hash.new() if !config_map
+          config_map.each do |k, v|
+            v.each do |sk, sv|
+              if sk.eql?(pod_name)  
+                sv[key] = value
+                if key.eql?("tag")
+                  sv["status"] = SpecPublishStatus::SUCCESS
+                end
+              end
+            end
+          end
+          yaml_file = File.open(path, "w")
+          YAML::dump(config_map, yaml_file)
+        rescue IOError => e
+          raise e.message
+        ensure
+          yaml_file.close unless yaml_file.nil?
+        end
+      end
+
       def yaml_write(key, value)
         begin
           config_map = YAML.load(File.open(@path, "r"))
-          config_map = Hash.new() if config_map.nil? || config_map.empty?
+          config_map = Hash.new() if !config_map
           config_map[key] = value
           yaml_file = File.open(@path, "w")
           YAML::dump(config_map, yaml_file)
@@ -21,6 +52,28 @@ module Gct
         end
       end
 
+      def yaml_write_map(path, content)
+        begin
+          yaml_file = File.open(path, "w")
+          YAML::dump(content, yaml_file)
+        rescue IOError => e
+          raise e.message
+        ensure
+          yaml_file.close unless yaml_file.nil?
+        end
+      end
+
+      def yaml_read_map(path, key)
+        begin
+          yaml_file = YAML.load(File.open(path, "r"))
+          if yaml_file
+            yaml_file[key]
+          end
+        rescue IOError => e
+          raise e.message
+        end
+      end
+
       def yaml_read(key)
         begin
           yaml_file = YAML.load(File.open(@path, "r"))
@@ -48,11 +101,24 @@ module Gct
         "#{Generator::GctFile.config_file_path}"
       end
 
+      def dependency_path
+        "#{Generator::GctFile.temp_folder_path}/#{Constant.DependencyName}"
+      end 
+
+      def tmp_path
+        "#{Generator::GctFile.temp_folder_path}"
+      end
+
       def exist_root
         root_exist = File.exist?(Generator::GctFile.root_folder_path)
         root_exist
       end
 
+      def exist_dependency
+        root_exist = File.exist?(dependency_path)
+        root_exist
+      end
+
       def root_err
         raise "请先运行命令：gct setup".red if !exist_root
       end

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.3.91".freeze unless defined? Gct::VERSION
+  VERSION = "0.4.0".freeze unless defined? Gct::VERSION
 end

data/lib/gct/generator/gct_file.rb

@@ -13,6 +13,10 @@ module Gct
         "#{get_system_home_path.rstrip}/.gct/config"
       end
 
+      def self.backup_folder_path
+        "#{get_system_home_path.rstrip}/.gct/backup"
+      end
+
       # 获取系统用户名
       def self.get_system_user_name
         # windows

data/lib/gct/specification.rb

@@ -30,10 +30,7 @@ module Gct
 end
 
 module SpecPublishStatus
-  CREATED       = '待分析'
-  ANALYZING     = '分析中'
-  PREPARING     = '准备中'
-  PENDING       = '等待中'
+  PENDING       = '队列中'
   WAITING       = '待发布'
   SKIPPED       = '已忽略'
   MERGED        = '已合并'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.3.91
+  version: 0.4.0
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,10 @@ files:
 - lib/gct/command/autotag.rb
 - lib/gct/command/build.rb
 - lib/gct/command/build/r.rb
+- lib/gct/command/clean.rb
+- lib/gct/command/clean/cache.rb
+- lib/gct/command/clean/ci.rb
+- lib/gct/command/clean/lint.rb
 - lib/gct/command/config.rb
 - lib/gct/command/config/get.rb
 - lib/gct/command/config/set.rb
@@ -163,6 +167,7 @@ files:
 - lib/gct/command/op.rb
 - lib/gct/command/op/gems.rb
 - lib/gct/command/op/gitconf.rb
+- lib/gct/command/op/lint.rb
 - lib/gct/command/op/root.rb
 - lib/gct/command/op/xcache.rb
 - lib/gct/command/repo.rb
@@ -175,7 +180,12 @@ files:
 - lib/gct/command/setup.rb
 - lib/gct/command/spec.rb
 - lib/gct/command/spec/lint.rb
+- lib/gct/command/tag.rb
 - lib/gct/command/update.rb
+- lib/gct/command/update/analyze.rb
+- lib/gct/command/update/dependency.rb
+- lib/gct/command/update/next.rb
+- lib/gct/command/update/podfile.rb
 - lib/gct/command/update/tag.rb
 - lib/gct/command/update/version.rb
 - lib/gct/constant.rb