gct 0.3.93 → 0.4.2

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

@@ -17,21 +17,30 @@ module Gct
           [
             ['--skip-tag', '是否忽略tag，直接触发ci'],
             ['--update-ci', '是否更新CI'],
+            ['--auto-tag', '自动化'],
+            ['--pre', '是否预发tag']
           ].concat(super)
         end
 
         def initialize(argv)
-            @update_version_branch = 'develop'
+            config_gitlab
             @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)
+            @pre = argv.flag?('pre', false)
+            @name = argv.shift_argument
             @tag = argv.shift_argument
+            @pre_tag_suffix = Constant.PreHuffix
+            @update_version_branch = @pre ? Constant.PreTagFromBranch : Constant.DefaultTagFromBranch
+            @update_to_branch = @pre ? Constant.PreTagToBranch : Constant.DefaultTagToBranch
+            @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 
@@ -42,10 +51,45 @@ module Gct
         end
 
         def skip_tag_method 
+          if !@update_ci
+            isEmptyMR = mr_to_master
+            if !isEmptyMR
+              accept_merge_request
+            end
+          end
+          remove_and_create_tag
+        end
+
+        def remove_and_create_tag
           @new_tag = @spec.version
+          puts "new tag"
+          puts @new_tag
+          if @pre
+            @new_tag = "#{@new_tag}" + @pre_tag_suffix
+          end
           puts "tag == #{@new_tag}"
-          delete_tag  # remove tag
-          create_tag  # create tag
+          # remove 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
+
+        def check_ci
+          is_exist_ci = false
+          res = Gitlab.tree("#{Constant.NameSpace}#{@name}")
+          res.each do |g|
+              if g["name"].eql?('.gitlab-ci.yml')
+                is_exist_ci = true
+                break
+              end
+          end
+          is_exist_ci
         end
 
         def update_ci_method
@@ -53,17 +97,30 @@ module Gct
           temp_local_file = TempLocalFile.new()
           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
+          if check_ci
+            edit_file('.gitlab-ci.yml', ci_content, 'update ci')
+          else 
+            create_file('.gitlab-ci.yml', ci_content, 'init ci')
+          end
         end
 
         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?
-
-            @spec = Pod::Specification.from_file(spec_file)
-            spec_file
+          end
+          @spec = Pod::Specification.from_file(full_path)
+          spec_file
         end
 
         def update_podspec_version 
@@ -75,6 +132,9 @@ module Gct
           tag = tag_regex.match(version_match)
           @now_tag = tag
           @new_tag = @tag || auto_add_tag(tag.to_s)
+          if @pre
+            @new_tag = "#{@new_tag}" + @pre_tag_suffix
+          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
@@ -88,29 +148,50 @@ module Gct
           Gitlab.edit_file(@project_id, file, @update_version_branch, content, commit_message)
         end
 
+        def create_file(file, content, commit_message)
+          Gitlab.create_file(@project_id, file, @update_version_branch, content, commit_message)
+        end
+
         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' })
+          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}" })
           @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)
+          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
           mr_result = Gitlab.accept_merge_request("#{@project_id}", @id)
           if mr_result.state == 'merged'
-            puts "成功合并到master分支".green
+            puts "成功合并到#{@update_to_branch}分支".green
           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 remove_tag
+          tags = Gitlab.tags("#{@project_id}")
+          puts "remove tag is " + "#{@new_tag}"
+          tags.each do |t|
+            if t["name"].eql?("#{@new_tag}")
+              Gitlab.delete_tag("#{@project_id}", "#{@new_tag}")
+              break
+            end
+          end
         end
 
         def create_tag
-          Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "master")
+          Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "#{@update_to_branch}")
+          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
         end
       end

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/constant.rb

@@ -21,9 +21,25 @@ module Gct
         "ios-third/"
       end
 
-      def DefaultTagBranch
+      def DefaultTagFromBranch
         "develop"
       end
+
+      def PreTagFromBranch
+        "pre_develop"
+      end
+
+      def DefaultTagToBranch
+        "master"
+      end
+
+      def PreTagToBranch
+        "pre_master"
+      end
+
+      def PreHuffix
+        "-pre"
+      end
     end
   end
 end

data/lib/gct/database/data.rb

@@ -0,0 +1,28 @@
+require 'mysql2'
+
+module Gct
+  module Database
+    class Data
+      def initialize
+        @host = FileBase.get_config("host")
+        @password = FileBase.get_config("password")
+        raise "请设置数据库ip地址！".red if @host.nil? 
+        raise "请设置数据库密码！".red if @password.nil?
+      end
+
+      def query(sql)
+        client = nil
+        puts "current sql is 👇👇👇"
+        puts sql
+        begin
+          client = Mysql2::Client.new(:host => @host, :username => "root", :database => "ios_db", :password => @password, :encoding => "utf8")
+          client.query(sql)
+        rescue => exception
+          puts exception
+        ensure
+          client.close
+        end
+      end
+    end
+  end
+end

data/lib/gct/file_base.rb

@@ -7,6 +7,21 @@ 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_write(key, value)
         begin
           config_map = YAML.load(File.open(@path, "r"))
@@ -21,6 +36,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,6 +85,14 @@ module Gct
         "#{Generator::GctFile.config_file_path}"
       end
 
+      def version_path
+        "#{Generator::GctFile.temp_folder_path}/version"
+      end 
+
+      def tmp_path
+        "#{Generator::GctFile.temp_folder_path}"
+      end
+
       def exist_root
         root_exist = File.exist?(Generator::GctFile.root_folder_path)
         root_exist

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.3.93".freeze unless defined? Gct::VERSION
+  VERSION = "0.4.2".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,15 +30,12 @@ module Gct
 end
 
 module SpecPublishStatus
-  CREATED       = '待分析'
-  ANALYZING     = '分析中'
-  PREPARING     = '准备中'
-  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.3.93
+  version: 0.4.2
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,20 @@ 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
@@ -149,6 +163,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 +181,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
@@ -171,14 +190,20 @@ 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/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
+- lib/gct/database/data.rb
 - lib/gct/file_base.rb
 - lib/gct/gct_version.rb
 - lib/gct/generator/gct_file.rb
@@ -204,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: '"gct ios 自动化脚本工具"'