gct 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c7ac5d299bdcd12bcf268d4f7d703d3cc928ec1bdf68a6a7607eb88776bfa1
-  data.tar.gz: ec3a3e19a4934758f25b7782b18033a6b5ae7b4011fe7f72a9a0600c6e31ca52
+  metadata.gz: 055d14cb22dd17241143aa9e423db5a5a1adbb5cfd7a86696989aa0d6f305cf7
+  data.tar.gz: 89dcaf76ca8b178ddfcf87bc89249a1064f1f4fd2647dce364416870fd957d88
 SHA512:
-  metadata.gz: 8ee1ec1276911016661047a4e3b85a78e51fbc8fee6d08531075bd26c43d598e4cf066a33712e9af51e9c6a317b5621e76d964a4c931a131f4952295696b4a2d
-  data.tar.gz: 3a10b473568f55e49de457f50f367010db7742eaf2ecde4684703a66835cbc7a7d10b1dcf8f33c41721a286c660b0aa9c682018e8db0585d4043f5b43f57ff3e
+  metadata.gz: e546f36acd76bd852755a04d432f8612c5ea7736a81d6d886fefd500ea6b8248e73e1b7a751bf3dcf6003c74610ce29fe7e44d864e0362955b2abdde240f42ab
+  data.tar.gz: b5d76987185599b11c99c2c79ee293cabcef4d59281808540835287114eed7cf261b18bd2882602fee076e1ee7481b636a2ada0b5095865a034441c0196e2cfd

data/lib/gct/command.rb

@@ -68,7 +68,7 @@ module Gct
             config.private_token = token       
           end
         else
-          raise "请先运行命令：gct set token xxx，参考文档:http://febase.crgt.xyz/docs/app_ios/base".red
+          raise "请先运行命令：gct config set token GITLAB_TOKEN，参考文档:http://febase.crgt.xyz/docs/app_ios/base".red
         end
       end
     end

data/lib/gct/command/update.rb

@@ -14,6 +14,20 @@ module Gct
         super
         config_gitlab
       end
+
+      def current_branch
+        branch = "#{`git branch | awk  '$1 == "*" {print $2}'`}".rstrip
+        raise "该文件夹不是一个git仓库".red if branch.empty?
+        branch
+      end
+
+      def check_branch_can_be_update(branch)
+        can_be_update = current_branch.include?(branch)
+
+        puts "当前不是#{branch}分支".red if !can_be_update
+
+        can_be_update
+      end
     end
   end
 end

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

@@ -14,6 +14,9 @@ module Gct
 
         def initialize(argv)
             @tag = argv.shift_argument
+            @update_version_branch = 'develop'
+            @file = get_spec_file
+            @project_id = "#{Constant.NameSpace}#{@spec.name}"
             super
         end
 
@@ -22,28 +25,60 @@ module Gct
         end
 
         def run
-            get_now_tag
-            add_push_new_tag
+          update_podspec_version
         end
 
-        def update_tag_podspec
-            # 更新podspec的版本号 @new_tag  创建MR推送到远端
-    
-        end
-
-        def get_now_tag
+        def get_spec_file
             spec_file = Pathname.glob('*.podspec').first
             raise "在 #{Dir.pwd} 目录下找不到podspec文件".red if spec_file.nil?
 
-            spec = Pod::Specification.from_file(spec_file)
-            @now_tag = spec.version
+            @spec = Pod::Specification.from_file(spec_file)
+            spec_file
+        end
+
+        def update_podspec_version 
+          puts "开始读取podspec文件...".green
+          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 = tag_regex.match(version_match)
+          @now_tag = tag
+          @new_tag = @tag || auto_add_tag(tag.to_s)
+          replace_string = version_match.gsub(tag_regex, @new_tag)
+          @updated_podspec_content = podspec_content.gsub(version_match, replace_string)
+          puts "修改podpsec版本号成功！版本号为：#{@now_tag}".green
+          edit_file
+          mr_to_master
+        end
+
+        def edit_file
+          Gitlab.edit_file(@project_id, @file, @update_version_branch, @updated_podspec_content, "@config 更新版本号：#{@new_tag}")
+        end
+
+        def mr_to_master
+          puts "正在创建MR请求将develop分支合并到master！".green
+          mr = Gitlab.create_merge_request("#{Constant.NameSpace}#{@spec.name}", "更新版本podpesc版本号", { source_branch: "#{@update_version_branch}", target_branch: 'master' })
+          @id = mr.iid
+          puts mr.merge_status
+          if mr.merge_status == 'cannot_be_merged' 
+            raise "Merge有冲突，请前往 https://gi-dev.ccrgt.com/#{Constant.NameSpace}#{@spec.name}/merge_requests/#{@id} 解决".red
+          end
+          
+          mr_result = accept_merge_request
+          if mr_result.state == 'merged'
+            puts "成功合并到master分支".green
+            create_tag
+          end
+        end
+  
+        def accept_merge_request
+          Gitlab.accept_merge_request("#{@project_id}", @id)
         end
 
-        def add_push_new_tag
-            @new_tag = @tag || auto_add_tag(@now_tag.to_s)
-            update_tag_podspec
-            `git tag #{@new_tag}`
-            `git push origin #{@new_tag} || { exit 1; }`
+        def create_tag
+          Gitlab.create_tag("#{@project_id}", "#{@new_tag}", "master")
+          puts "打tag成功，开始上传podspec...".green
         end
       end
     end

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

@@ -9,8 +9,8 @@ module Gct
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('NAME', false),
           CLAide::Argument.new('VERSION', false),
+          CLAide::Argument.new('NAME', false),
         ]
 
         def initialize(argv)
@@ -32,7 +32,12 @@ module Gct
         end
 
         def update_version
-          if check_branch_can_be_update
+          puts @project_id
+          puts @file
+          puts @branch
+          content = file_contents(@project_id, @file, @branch)
+          puts content
+          if check_branch_can_be_update('release')
             content = file_contents(@project_id, @file, @branch)
             version_var_name = 'MARKETING_VERSION = '
             version_regex = /(?<=#{version_var_name})\w.*(?=;)/
@@ -40,24 +45,12 @@ module Gct
             version = @version ||= auto_add_tag(version_match)
             updated_content = content.gsub(version_regex, version)
             edit_file(updated_content, version)
-          else 
-            puts "当前不是release分支".red
           end
         end
 
         def edit_file(content, version)
           Gitlab.edit_file(@project_id, @file, @branch, content, "@config 更新版本号：#{version}")
         end
-        
-        def check_branch_can_be_update
-          current_branch.include?('release')
-        end
-
-        def current_branch
-          branch = "#{`git branch | awk  '$1 == "*" {print $2}'`}".rstrip
-          raise "该文件夹不是一个git仓库".red if branch.empty?
-          branch
-        end
       end
     end
   end

data/lib/gct/gct_version.rb

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

data/lib/gct/generator/gct_file.rb

@@ -1,17 +1,16 @@
 module Gct
   module Generator
     class GctFile
-
       def self.root_folder_path
-        "/Users/#{get_system_user_name.rstrip}/.gct"
+        "#{get_system_home_path.rstrip}/.gct"
       end
 
       def self.temp_folder_path
-        "/Users/#{get_system_user_name.rstrip}/.gct/tmp"
+        "#{get_system_home_path.rstrip}/.gct/tmp"
       end
 
       def self.config_file_path
-        "/Users/#{get_system_user_name.rstrip}/.gct/config"
+        "#{get_system_home_path.rstrip}/.gct/config"
       end
 
       # 获取系统用户名
@@ -27,6 +26,10 @@ module Gct
         end
       end
 
+      def self.get_system_home_path
+        "#{`echo ~`}"
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - jieming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: '"gct ios 自动化脚本工具"'