pixab 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2253162bf9e37eaaaa541ca25d978ee6ced4fdeda468101b90fc0758ecc805
-  data.tar.gz: 42237eb540beb23065e0ccc03f267cdaa03f82f27122b1f8e51c6d7f1ff247e2
+  metadata.gz: 7e4ecbfcfe6d0ab2d1d8ee3f3df1260f010a390779ebd217b7f277dd6fe62e40
+  data.tar.gz: d6545ec0fb08269c0454f3dda5606d45b2233d4a15ccc1c9b646ca7e4acc6885
 SHA512:
-  metadata.gz: d1a0f1839ea57b8e810a4ef2c019566b1b2b20d7c9923f160edf1a055f04af2d65d97e4c72d7a71c0482a688d2fb31b029a1cba0501b09164f7a98e3db5957d9
-  data.tar.gz: 76c95d7addbd2ce3425e3b5c975d775e4e87ea645e53e82d40bd7d08266f17abfe7fb3bc2488e74166d971a88381f9bc6eb24ac636f6b3def7323d9750b9b939
+  metadata.gz: 5a88385f99379bf784232c343f6e04b08a7d908eb8f29df0f8dc6aca21de69fba4f72b2b3d68124a6dfa35cb6948d06fd5792f6bda4779a22fd9e5a81ae3b271
+  data.tar.gz: 18b809e1f690cc39ae2b96b982c3f6bfb77e9971804b185f853bd9819938fffd86d5300bc8a3c5134f894ea9197ed70ed7676773c075e5c33c1ab02e27964dd8

data/lib/gitlab/GitRepoInfo.rb

@@ -16,9 +16,17 @@ module Pixab
       `git fetch origin`
 
       @branch = GitUtils.current_branch
+      if @branch.nil?
+        puts "无法获取当前分支".red
+      end
+
       @target_branch = get_target_branch(@branch)
-      @remote_branch = GitUtils.remote_branch(@branch)
-      @remote_target_branch = GitUtils.remote_branch(@target_branch)
+      if @target_branch.nil?
+        puts "无法获取目标分支，当前分支：#{@branch}".red
+      end
+
+      @remote_branch = "origin/#{@branch}"
+      @remote_target_branch = "origin/#{@target_branch}"
     end
 
     def get_target_branch(branch)
@@ -39,13 +47,22 @@ module Pixab
     end
 
     def get_version(feature_name)
+      # 用 '_' 分割字符串
       parts = feature_name.split('_')
-      parts.map do |part|
-        is_numeric = part.match?(/^\d+$/) # 检查是否为纯数字
-        if is_numeric 
+
+      # 遍历分割的部分
+      parts.each do |part|
+        # 判断是否为纯数字
+        if part.match?(/^\d+$/)
+          return part
+        # 判断是否为类似 7.5.0 的格式
+        elsif part.match?(/^\d+(\.\d+)*$/)
           return part
         end
       end
+
+      # 如果没有满足条件的字符串，返回 nil
+      nil
     end
 
     # 判断远程分支是否代码是否同步到远程目标分支

data/lib/gitlab/GitlabInfo.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Pixab
 
   class GitlabInfo
@@ -5,8 +7,8 @@ module Pixab
     # Gitlab API endpoint
     API_ENDPOINT = 'https://techgit.meitu.com/api/v4'
 
-    # Gitlab private token
-    TOKEN = 'glpat-BZWgys9gsAQ8mnGYTajr'
+    # Gitlab token key
+    TOKEN_KEY = 'user_token'
 
   end
 
@@ -58,6 +60,37 @@ module Pixab
       end
     end
 
+    def get_config
+      config_file = get_config_file
+      if File.exist?(config_file)
+        return YAML.load_file(config_file)
+      else
+        return {}
+      end
+    end
+
+    def get_user_token
+      config = get_config
+      return config[GitlabInfo::TOKEN_KEY]
+    end
+
+    def set_user_token(token)
+      config = get_config
+      config[GitlabInfo::TOKEN_KEY] = token
+      config_dir = get_config_dir
+      config_file = get_config_file
+      Dir.mkdir(config_dir) unless Dir.exist?(config_dir)
+      File.write(config_file, config.to_yaml)
+    end
+
+    def get_config_dir
+      File.expand_path('~/.pixab')
+    end
+
+    def get_config_file
+      File.join(get_config_dir, 'mrConfig.yml')
+    end
+
   end
 
 end

data/lib/gitlab/GitlabMR.rb

@@ -9,6 +9,10 @@ module Pixab
 
   class GitlabMR
 
+    def initialize(token)
+      @token = token
+    end
+
     def run(path, reviewers_ids)
       unless Dir.exist?(path)
         puts "当前目录不存在: #{path}".red
@@ -45,7 +49,7 @@ module Pixab
 
       # 构建 HTTP 请求
       request = Net::HTTP::Post.new(uri)
-      request['PRIVATE-TOKEN'] = GitlabInfo::TOKEN
+      request['PRIVATE-TOKEN'] = @token
       request['Content-Type'] = 'application/json'
 
       body = {
@@ -94,7 +98,7 @@ module Pixab
 
       uri = URI("#{GitlabInfo::API_ENDPOINT}/projects/#{URI.encode_www_form_component(project_path)}")
       request = Net::HTTP::Get.new(uri)
-      request['PRIVATE-TOKEN'] = GitlabInfo::TOKEN
+      request['PRIVATE-TOKEN'] = @token
 
       http = Net::HTTP.new(uri.hostname, uri.port)
       http.use_ssl = (uri.scheme == 'https') # 如果是 HTTPS，启用 SSL

data/lib/gitlab/GitlabMRManager.rb

@@ -10,7 +10,6 @@ module Pixab
 
     def run(commands = nil)
       platform = nil
-
       if not commands.nil?
         commands.each_index do |index|
           command = commands[index]
@@ -19,6 +18,11 @@ module Pixab
             platform = Platform.new('android')
           when '--iOS'
             platform = Platform.new('iOS')
+          when '--token'
+            token = commands[index + 1]
+            unless token.nil?
+              GitlabInfo.set_user_token(token)
+            end
           end
         end
       end
@@ -27,6 +31,12 @@ module Pixab
         platform = Platform.new('iOS')
       end
 
+      token = GitlabInfo.get_user_token
+      if token.nil?
+        puts "未设置 Gitlab Token".red
+        return
+      end
+
       git_repos = Pixab::GitlabMRManager.new.find_git_repos(Dir.pwd)
 
       if git_repos.empty?
@@ -54,7 +64,7 @@ module Pixab
         end
       end
 
-      gitlab_mr = GitlabMR.new 
+      gitlab_mr = GitlabMR.new(token)
       git_repos.each do |repo|
         gitlab_mr.run(repo, reviewer_ids)
       end

data/lib/pixab/version.rb

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

data/pixab.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rubyzip'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rest-client'
+  spec.add_dependency 'yaml'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - 廖再润
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  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: Write a longer description or delete this line.
 email:
 - lzr3@us.meitu.com