pixab 1.9.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefa3c5d3ed4fd4331affe5c8cc8523ed0403efb88aa98d78257617a4973ea89
-  data.tar.gz: 01df65aa135899324a2819dc0a85bd2b5fdc2196862d445180c73fd45c677c82
+  metadata.gz: 6e343b6bb118ca7dea7ba7a5f1a09f925c662b60104c3cc1cec9f0903e257857
+  data.tar.gz: d05148fe7149a47ae7c06eeec57de5276c2f2ded8148a2bb675a72cc4d216eda
 SHA512:
-  metadata.gz: c8370d3b0c946b4603104da4f1795ec34af95175a3241a1cb203b1d45b38292ec122aecbf75639259b1d91bc7b72ec21ff66d96190d2e01765bc8f17529ddb5e
-  data.tar.gz: 856d429275f5217345ea86dcdc5c59be67b8fdc2ab9d1c641f550b407362763582dfdea098e54576613da728d3faf6ecc202926bfa724f90ea21046b0b2634d5
+  metadata.gz: bd5d261253f3b36eb5b5f7b4f7123ddfd922e36b8dfc5bab1afceebda3ea0ceec81a9f86a566f3ba7def345263b147b9dd9a0676d7fcfdbd9b38337a370f827c
+  data.tar.gz: c71932134caaa9fc477f1a8e4186ddd6758905b27970af104b3aef0e4f44d8e704c6e3507a896f6dd87d7e571f5db8563048b39a4abaec05a8320ec63cd0746a

data/exe/pixab

@@ -11,6 +11,7 @@ require_relative '../lib/LocalizationSmartcat.rb'
 require_relative '../lib/LocalizationSmartcatImport.rb'
 require_relative '../lib/LocalizationSmartcatMerge.rb'
 require_relative '../lib/mbox/Mbox.rb'
+require_relative '../lib/gitlab/GitlabMRManager.rb'
 
 case ARGV[0]
 when '--version'
@@ -55,6 +56,8 @@ when 'localize'
   end
 when 'mbox'
   Pixab::Mbox.new.run(ARGV[1..-1])
+when 'mr'
+  Pixab::GitlabMRManager.new.run(ARGV[1..-1])
 else
   puts "Invalid command".red
 end

data/lib/GitUtils.rb

@@ -99,7 +99,11 @@ module Pixab
 
     # 获取当前分支的远程分支
     def current_remote_branch
-      local_branch = current_branch
+      return remote_branch(current_branch)
+    end
+
+    # 获取指定分支的远程分支
+    def remote_branch(local_branch)
       return nil if local_branch.nil?
 
       remote_branch, status = Open3.capture2("git for-each-ref --format='%(upstream:short)' refs/heads/#{local_branch}")

data/lib/Platform.rb

@@ -0,0 +1,21 @@
+module Pixab
+
+  class Platform
+
+    attr_reader :platform
+
+    def initialize(platform)
+      @platform = platform
+    end
+
+    def is_iOS 
+      platform == 'iOS'
+    end
+
+    def is_android
+      platform == 'android'
+    end
+
+  end
+
+end

data/lib/gitlab/GitRepoInfo.rb

@@ -0,0 +1,58 @@
+require 'colored2'
+require_relative '../GitUtils.rb'
+
+module Pixab
+
+  class GitRepoInfo
+
+    attr_reader :branch, :remote_branch, :target_branch, :remote_target_branch 
+
+    def initialize
+      if !GitUtils.is_git_repo
+        puts "当前目录不是 Git 仓库！, path: #{Dir.pwd}".red
+        return
+      end
+
+      `git fetch origin`
+
+      @branch = GitUtils.current_branch
+      @target_branch = get_target_branch(@branch)
+      @remote_branch = GitUtils.remote_branch(@branch)
+      @remote_target_branch = GitUtils.remote_branch(@target_branch)
+    end
+
+    def get_target_branch(branch)
+      splited_branchs = branch.split('/')
+      feature_name = splited_branchs[-1]
+      version = get_version(feature_name)
+
+      if version.nil?
+        puts "无法获取目标分支，分支：#{branch}".red
+        return
+      end
+   
+      if splited_branchs.length > 1 
+        return "#{splited_branchs[0]}/#{version}"
+      else
+        return version
+      end
+    end
+
+    def get_version(feature_name)
+      parts = feature_name.split('_')
+      parts.map do |part|
+        is_numeric = part.match?(/^\d+$/) # 检查是否为纯数字
+        if is_numeric 
+          return part
+        end
+      end
+    end
+
+    # 判断远程分支是否代码是否同步到远程目标分支
+    def is_remote_branch_synced
+      GitUtils.is_branch_synced(@remote_branch, @remote_target_branch)
+    end
+
+  end
+
+end

data/lib/gitlab/GitlabInfo.rb

@@ -0,0 +1,63 @@
+module Pixab
+
+  class GitlabInfo
+
+    # Gitlab API endpoint
+    API_ENDPOINT = 'https://techgit.meitu.com/api/v4'
+
+    # Gitlab private token
+    TOKEN = 'glpat-BZWgys9gsAQ8mnGYTajr'
+
+  end
+
+  class << GitlabInfo
+
+    def iOS_reviewers
+      ['廖再润', '吴子琰', '黄丕臻', '唐竞全', '杜思保', '黄子汕', '庄善志']
+    end
+
+    def android_reviewers
+      ['朱乾', '张珂', '林朴', '容子钧', '李明杰', '李明邦', '陈全满']
+    end
+
+    def iOS_reviewer_id(reviewer)
+      case reviewer
+      when '吴子琰'
+        979
+      when '黄丕臻'
+        1385
+      when '廖再润'
+        1569
+      when '唐竞全'
+        1807
+      when '杜思保'
+        1922
+      when '黄子汕'
+        1926
+      when '庄善志'
+        2056
+      end
+    end
+
+    def android_reviewer_id(reviewer)
+      case reviewer
+      when '林朴'
+        1139
+      when '朱乾'
+        1284
+      when '张珂'
+        1993
+      when '陈全满'
+        2031
+      when '容子钧'
+        2073
+      when '李明杰'
+        2130
+      when '李明邦'
+        2213
+      end
+    end
+
+  end
+
+end

data/lib/gitlab/GitlabMR.rb

@@ -0,0 +1,114 @@
+require 'net/http'
+require 'uri'
+require 'json'
+require 'colored2'
+require_relative './GitlabInfo.rb'
+require_relative './GitRepoInfo.rb'
+
+module Pixab
+
+  class GitlabMR
+
+    def run(path, reviewers_ids)
+      unless Dir.exist?(path)
+        puts "当前目录不存在: #{path}".red
+        return
+      end
+
+      Dir.chdir(path) do
+        create_merge_request(path, reviewers_ids)
+      end
+    end
+
+    # 创建 Merge Request 方法
+    def create_merge_request(path, reviewers_ids)
+      # 获取项目 ID
+      project_id = get_project_id
+      if project_id.nil?
+        return
+      end
+
+      # 获取 git 分支信息
+      git_repo_info = GitRepoInfo.new
+      if git_repo_info.branch.nil?
+        return 
+      end
+
+      if git_repo_info.is_remote_branch_synced # 远程分支代码已经同步到远程目标分支，无需创建 Merge Request
+        puts "#{File.basename(path)}：代码已同步。\n".green
+        return
+      end
+
+      title = "Merge branch #{git_repo_info.branch} into #{git_repo_info.target_branch}."
+
+      uri = URI("#{GitlabInfo::API_ENDPOINT}/projects/#{project_id}/merge_requests")
+
+      # 构建 HTTP 请求
+      request = Net::HTTP::Post.new(uri)
+      request['PRIVATE-TOKEN'] = GitlabInfo::TOKEN
+      request['Content-Type'] = 'application/json'
+
+      body = {
+        source_branch: git_repo_info.branch,
+        target_branch: git_repo_info.target_branch,
+        title: title,
+      }
+
+      if reviewers_ids.length > 0 
+        body[:assignee_id] = reviewers_ids[0]
+      end
+
+      if reviewers_ids.length > 1
+        body[:reviewer_ids] = reviewers_ids[1..-1]
+      end
+
+      # 设置请求体
+      request.body = body.to_json
+
+      # 发送请求
+      http = Net::HTTP.new(uri.hostname, uri.port)
+      http.use_ssl = (uri.scheme == 'https') # 如果是 HTTPS，启用 SSL
+      response = http.request(request)
+
+      # 处理响应
+      if response.is_a?(Net::HTTPSuccess)
+        puts "#{File.basename(path)}：MR已创建，#{JSON.parse(response.body)['web_url']}\n".green
+      else
+        puts "创建 Merge Request 失败！".red
+        puts "错误信息: #{response.body}".red
+      end
+
+    
+    end
+
+    # 获取项目 ID 方法
+    def get_project_id
+      git_url = `git remote get-url origin`.strip
+
+      project_path = nil
+      if git_url =~ %r{(?:https?:\/\/.*?\.com\/|git@.*?:)(.+?)(\.git)?$}
+        project_path = $1
+      else
+        puts "无法解析地址: #{git_url}".red
+      end
+
+      uri = URI("#{GitlabInfo::API_ENDPOINT}/projects/#{URI.encode_www_form_component(project_path)}")
+      request = Net::HTTP::Get.new(uri)
+      request['PRIVATE-TOKEN'] = GitlabInfo::TOKEN
+
+      http = Net::HTTP.new(uri.hostname, uri.port)
+      http.use_ssl = (uri.scheme == 'https') # 如果是 HTTPS，启用 SSL
+      response = http.request(request)
+
+      if response.is_a?(Net::HTTPSuccess)
+        data = JSON.parse(response.body)
+        return data['id']
+      else
+        puts "获取项目 ID 失败！错误信息: #{response.body}".red
+        return nil
+      end
+    end
+
+  end
+
+end

data/lib/gitlab/GitlabMRManager.rb

@@ -0,0 +1,72 @@
+require 'colored2'
+require_relative '../Platform.rb'
+require_relative './GitlabInfo.rb'
+require_relative '../Utilities.rb'
+require_relative './GitlabMR.rb'
+
+module Pixab
+
+  class GitlabMRManager
+
+    def run(commands = nil)
+      platform = nil
+
+      if not commands.nil?
+        commands.each_index do |index|
+          command = commands[index]
+          case command
+          when '--android'
+            platform = Platform.new('android')
+          when '--iOS'
+            platform = Platform.new('iOS')
+          end
+        end
+      end
+
+      if platform.nil?
+        platform = Platform.new('iOS')
+      end
+
+      git_repos = Pixab::GitlabMRManager.new.find_git_repos(Dir.pwd)
+
+      if git_repos.empty?
+        puts "No Git repositories found.".red
+        return
+      end
+
+      is_iOS = platform.is_iOS
+      reviewers = is_iOS ? GitlabInfo.iOS_reviewers : GitlabInfo.android_reviewers
+      selected_reviewers = Utilities.display_choose_list(reviewers, nil, "审核人员", "请选择审核人员：", nil, nil, true)
+
+      if selected_reviewers.empty?
+        puts "未选择审核人员".red
+        return
+      end
+      
+      reviewer_ids = []
+      if is_iOS
+        selected_reviewers.each do |reviewer|
+          reviewer_ids << GitlabInfo.iOS_reviewer_id(reviewer)
+        end
+      else
+        selected_reviewers.each do |reviewer|
+          reviewer_ids << GitlabInfo.android_reviewer_id(reviewer)
+        end
+      end
+
+      gitlab_mr = GitlabMR.new 
+      git_repos.each do |repo|
+        gitlab_mr.run(repo, reviewer_ids)
+      end
+
+    end
+
+    # 查找包含 Git 仓库的目录
+    def find_git_repos(root_dir)
+      # 使用 Dir.glob 匹配所有包含 .git 子目录的目录
+      Dir.glob("#{root_dir}/**/.git").map { |git_dir| File.dirname(File.expand_path(git_dir)) }
+    end
+
+  end
+
+end

data/lib/pixab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixab
-  VERSION = "1.9.2"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 2.0.0
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2024-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -91,8 +91,13 @@ files:
 - lib/LocalizationSmartcatMerge.rb
 - lib/MergeRequest.rb
 - lib/Package.rb
+- lib/Platform.rb
 - lib/RepoManager.rb
 - lib/Utilities.rb
+- lib/gitlab/GitRepoInfo.rb
+- lib/gitlab/GitlabInfo.rb
+- lib/gitlab/GitlabMR.rb
+- lib/gitlab/GitlabMRManager.rb
 - lib/mbox/AirBrushProjectInfo.rb
 - lib/mbox/Mbox.rb
 - lib/mbox/MboxAdd.rb