gct 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eacd230eb51e7c03f69df817172a1684c61a016b476ee9bede1a4490751084c
-  data.tar.gz: 4f9525f907f827cbe90806a0fc11b42c64bc4cdefda2f6982da2e2ce6d117e1d
+  metadata.gz: 61f99077edb53ba0cf05eca381a814b9f41a17ecc191cc68a1950c2402dff1b7
+  data.tar.gz: 3132fd74ec8fd026ea13921f717e68c8f7bbb4aba1ee1265ba057eef823cd8cd
 SHA512:
-  metadata.gz: d93d45b1ffee87733b11bc2f70fc4c35fb510c99bece66196d87b49dadb98f7a9648bb2a407cc78e98223ffbeafb1523f120ff8fec7b4ca127e9eb461a6dad24
-  data.tar.gz: 606a302705d5305cb8d5260d489d551794ffedabea91b7da81bc7ea66cc31042d2dad835a6fd6edccc82369b45d7e4ba5de55a35fceb3b520d29468a73a36115
+  metadata.gz: 92432f4c66aa5d9a19c27c0c5c22ceb53253ff118e34586934516790134474d3f0c9360ef8dad2b51e8c7cd737d0441e1c019942ff8d4f94d2449d33d109ec19
+  data.tar.gz: 83d92ca4f72529e5be6db516fc667bc9dbddc6783e29aa0eaac68f109d91df346545b0c52be5fc14759b2cd03603f86ea8fcd94320e4f6e00ed23f83dd7f569e

data/lib/gct/command.rb

@@ -52,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)
@@ -63,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

@@ -13,13 +13,18 @@ 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}"
+        name = argv.shift_argument
+        @project_id = "ios/#{name}"
+        @project_name = name
         @branch = argv.shift_argument
+        @version = argv.shift_argument
         @file = 'Podfile'
         super
       end
@@ -34,12 +39,14 @@ module Gct
         super
         help! '请输入项目名.' unless @project_id
         help! '请输入分支名.' unless @branch
+        help! '请输入版本号.' unless @version
       end
 
       def run
         FileBase.root_err
         puts "开始分析podfile文件".green
         puts ""
+        FileBase.write_version_message(@version, @project_name, @branch)
         exist_dep = FileBase.exist_dependency
         if exist_dep
           tmp_podspecs
@@ -62,6 +69,7 @@ module Gct
         # if check_branch_can_be_update('zeus')
         # if check_branch('ft/tag') # TODO: Test branch  
           contents = file_contents(@project_id, @file, @branch)
+          # puts contents
           contents.force_encoding('UTF-8')
           temp_local_file = TempLocalFile.new(contents, @file)
           temp_local_file.write
@@ -196,14 +204,17 @@ module Gct
       # 按优先级打tag, 触发第一个优先级，其他的上一优先级打完之后自动触发
       def create_tag_by_priority(priority_map)
         priority = get_current_need_tag_priority
+        puts "priority is #{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)
+            is_skip = val["status"].eql?(SpecPublishStatus::FAILED) || val["status"].eql?(SpecPublishStatus::CANCELED)  
             status = SpecPublishStatus::PENDING
             val["status"] = status
-            system "gct update dependency #{key} status #{status}"          
-            system "gct update tag #{key} --auto-tag"
+            system "gct update dependency #{key} status #{status}"       
+            puts "gct update tag #{key} --auto-tag #{is_skip ? "--skip-tag" : ""}"
+            system "gct update tag #{key} --auto-tag --update-ci #{is_skip ? "--skip-tag" : ""}"
           end
         end
       end

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

@@ -7,7 +7,7 @@ push_pod:
   script: 
     - gct robot start --test
     - echo "开始lint 和 push podspec"
-    - gct update dependency $CI_PROJECT_NAME "status" "发布中"
+    - gct update dependency $CI_PROJECT_NAME "status" "deploying"
     - gct clean lint $CI_PROJECT_NAME
     - gct repo update
     - gct repo push
@@ -23,7 +23,7 @@ on_failure:
   stage: failure
   script:
     - gct robot finish false --test
-    - gct update dependency $CI_PROJECT_NAME "status" "发布失败"
+    - gct update dependency $CI_PROJECT_NAME "status" "failed"
   when: on_failure
   only: 
     - tags

data/lib/gct/command/robot.rb

@@ -1,5 +1,6 @@
 require 'gct/command/robot/start'
 require 'gct/command/robot/finish'
+require 'gct/command/robot/podfile'
 require 'net/https'
 require 'json'
 

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

@@ -0,0 +1,38 @@
+require 'net/https'
+require 'json'
+
+module Gct
+  class Command
+    class Robot < Command
+      class Podfile < Robot
+
+        self.summary = 'podfile更新通知'
+        self.description = <<-DESC
+            podfile更新通知
+        DESC
+
+        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
+          message = " <font color=\"info\">podfile 更新完毕</font>"
+          content = "#{message}"
+          robot_send(content)
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Gct
         DESC
 
         def initialize(argv)
+          config_gitlab
           @project_name = ENV['CI_PROJECT_NAME']
           super
         end
@@ -17,16 +18,16 @@ module Gct
         end
 
         def batch_tag 
-          value = next_specs
-          if val.nil? 
+          specs = next_specs
+          if specs.nil? 
             return
           end
-          if value.keys.count == 0
+          if specs.keys.count == 0
             puts "tag已全部打完！！！".green
             # 执行更新podfile的操作
-            # system "gct update podfile"
+            system "gct update podfile"
           else
-            value.each do |key, val|
+            specs.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
@@ -38,34 +39,33 @@ module Gct
         end
 
         def next_specs
-          priority = get_current_project_priority
           content_map = FileBase.yaml_dependency_read
+          if content_map.nil?
+            return nil
+          end
+          priority = 1000
+          content_map.each do |k, v|
+            if v.keys.include?(@project_name)
+              priority = k
+              break
+            end
+          end
+
           priority_map = content_map[priority.to_s]
           is_all_done = true
           priority_map.each do |k, v|
-            if !v["status"].eql?("发布成功")
+            if !v["status"].eql?(SpecPublishStatus::SUCCESS)
               is_all_done = false
               break
             end
           end 
+
           if is_all_done
-            content_map[(priority - 1).to_s]
+            content_map[(priority.to_i - 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

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

@@ -9,10 +9,10 @@ module Gct
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('VERSION', true),
-      ]
+        ]
 
         def initialize(argv)
+          config_gitlab
           @version = argv.shift_argument
           super
         end
@@ -22,7 +22,45 @@ module Gct
         end
 
         def run
+          version_map = FileBase.read_version
+          @name = "ios/#{version_map["name"]}"
+          @branch = version_map["branch"]
+          @verison = version_map["version"]
+          @file = "Podfile"
+          puts @version
+          update_podfile
+          remove_and_backup
+        end
+
+        def update_podfile
+          podspec_content = file_contents(@name, @file, @branch)
+
+          remove_regex = /dev_pod .*/
+          podspec_content = podspec_content.gsub!(remove_regex, "")
+          
+          # dependency
+          dependency_map = FileBase.yaml_dependency_read
+          dependencies = Array.new()
+          dependency_map.each do |k, v|  
+            dependencies << v
+          end 
+
+          dependencies.each { |dep|
+            dep.keys.each { |k|
+              value = dep[k]
+              tag = value["tag"]
+              update_regex = /.*#{k}.*/
+              update_match = update_regex.match(podspec_content).to_s
+              podspec_content = podspec_content.gsub!(update_match, "  pod '#{k}', '#{tag}'")
+            }
+          }
+
+          edit_file(podspec_content)
+          system "gct robot podfile"
+        end
 
+        def edit_file(content)
+          Gitlab.edit_file(@name, @file, @branch, content, "@config #{@version}版本 podfile更新")
         end
 
         # 删除和备份

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

@@ -22,6 +22,7 @@ module Gct
         end
 
         def initialize(argv)
+            config_gitlab
             @update_version_branch = 'develop'
             @skip_tag = argv.flag?('skip-tag', false)
             @update_ci = argv.flag?('update-ci', false)
@@ -55,8 +56,13 @@ module Gct
             end
           end
           # remove tag
-          `git tag -d #{@new_tag}`
-          `git push origin :refs/tags/#{@new_tag}`  
+          command = `git rev-parse --is-inside-work-tree`
+          if command.eql?("true")
+            `git tag -d #{@new_tag}`
+            `git push origin :refs/tags/#{@new_tag}`  
+          else
+            remove_tag
+          end
           # create tag
           create_tag
         end
@@ -75,17 +81,20 @@ module Gct
 
         def get_spec_file
           spec_file = nil
+          full_path = 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
+              full_path = spec_file.realpath
               raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
             end
           else
             spec_file = Pathname.glob('*.podspec').first
+            full_path = spec_file
             raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
           end
-          @spec = Pod::Specification.from_file(spec_file)
+          @spec = Pod::Specification.from_file(full_path)
           spec_file
         end
 
@@ -138,6 +147,10 @@ module Gct
           Gitlab.update_merge_request("#{@project_id}", @id, {state_event: 'close'})
         end
 
+        def remove_tag
+          Gitlab.delete_tag("#{@project_id}", "#{@new_tag}")
+        end
+
         def create_tag
           Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "master")
           puts "打tag成功，开始上传podspec...".green

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

@@ -14,6 +14,7 @@ module Gct
         ]
 
         def initialize(argv)
+          config_gitlab
           @name = argv.shift_argument
           @version = argv.shift_argument
           name = @name ||= "iLife"

data/lib/gct/file_base.rb

@@ -7,17 +7,37 @@ module Gct
         @path = path
       end
 
+      def read_version
+        path = version_path
+        if !File.exist?(path) 
+          return nil
+        end
+        config_map = YAML.load(File.open(path, "r"))
+        config_map
+      end
+
+      def write_version_message(verison, name, branch)
+        yaml_path = "#{Generator::GctFile.temp_folder_path}/version"
+        content_map = {"version" => verison, "name" => name, "branch" => branch}
+        yaml_write_map(yaml_path, content_map)
+      end
+
       def yaml_dependency_read
         path = dependency_path
+        if !File.exist?(path) 
+          return nil
+        end
         config_map = YAML.load(File.open(path, "r"))
         config_map
       end
 
       def yaml_dependency_update(pod_name, key, value)
+        path = dependency_path
+        if !File.exist?(dependency_path)
+          return
+        end
         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|
@@ -105,6 +125,10 @@ module Gct
         "#{Generator::GctFile.temp_folder_path}/#{Constant.DependencyName}"
       end 
 
+      def version_path
+        "#{Generator::GctFile.temp_folder_path}/version"
+      end 
+
       def tmp_path
         "#{Generator::GctFile.temp_folder_path}"
       end

data/lib/gct/gct_version.rb

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

data/lib/gct/specification.rb

@@ -30,12 +30,12 @@ module Gct
 end
 
 module SpecPublishStatus
-  PENDING       = '队列中'
-  WAITING       = '待发布'
-  SKIPPED       = '已忽略'
-  MERGED        = '已合并'
-  DEPLOYING     = '发布中'
-  SUCCESS       = '发布成功'
-  FAILED        = '发布失败'
-  CANCELED      = '已取消'
+  PENDING       = 'pending'
+  WAITING       = 'waiting'
+  SKIPPED       = 'skipped'
+  MERGED        = 'merged'
+  DEPLOYING     = 'deploying'
+  SUCCESS       = 'success'
+  FAILED        = 'failed'
+  CANCELED      = 'canceled'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,11 +176,11 @@ files:
 - lib/gct/command/repo/update.rb
 - lib/gct/command/robot.rb
 - lib/gct/command/robot/finish.rb
+- lib/gct/command/robot/podfile.rb
 - lib/gct/command/robot/start.rb
 - 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

data/lib/gct/command/tag.rb

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