pixab 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bdedbf96ae1aad98cea6889c0cd32dafc9d9d6634ed181ea5d3aad9fc50c53
-  data.tar.gz: f097ad80dcff665eb3f0e6a77f7717fbed41bc7e7503e6819a09e0591e5b43f2
+  metadata.gz: 8f09a9844dc68dff860b089c152670840bebb8847446fed524c4090f44382fd7
+  data.tar.gz: c4f4db1ade058dfae0a4d7d45cf83f21920a5664ea307e545a4b1e6b6b3bfc5f
 SHA512:
-  metadata.gz: 74c4e32db81e84edf7d54c6a7bf719290bf458978440435e231113ba1e08eefb6dc659934742f295a1660733887c4adbb24f00f408adc303c22e050a57264d4f
-  data.tar.gz: fec66d4eac0ed930fa2052a3d02d77e8a482b1da15edf8f068e6fdbb5c98f81bf25649b0bdf0d707115fa54b15b69639dd192a3ce3ec7313040a622f59ccf705
+  metadata.gz: f54c1b12ffb4c692064d945ed26ea9b054055563240d0fada93adfda1b628feaf2a1dcfcdcede3064f5cfea0893ab49a2b7092b3eadcf122d7fa6a8fb22d996c
+  data.tar.gz: 6d841b0e5773e8f24e141ca893c248b3d871d7c11a46028ef63769c09c0ce6cdf7a1823d117cd660a794ce3ff8f7d41b1836a4ea571b91bf9e8acb3a1a3d3f8b

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,6 +10,7 @@ module Pixab
 
     def run(commands = nil)
       platform = nil
+      sub_repos_path = nil
 
       if not commands.nil?
         commands.each_index do |index|
@@ -17,8 +18,15 @@ module Pixab
           case command
           when '--android'
             platform = Platform.new('android')
+            parent_dir = File.dirname(Dir.pwd)
+            sub_repos_path = File.join(parent_dir, 'pixab_libraries')
           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,8 +35,20 @@ module Pixab
         platform = Platform.new('iOS')
       end
 
-      git_repos = Pixab::GitlabMRManager.new.find_git_repos(Dir.pwd)
+      token = GitlabInfo.get_user_token
+      if token.nil?
+        puts "未设置 Gitlab Token".red
+        return
+      end
 
+      git_repos = GitUtils.find_git_repos(Dir.pwd)
+      unless sub_repos_path.nil?
+        sub_git_repos = GitUtils.find_git_repos(sub_repos_path)
+        unless sub_git_repos.nil?
+          git_repos.concat(sub_git_repos)
+        end
+      end
+       
       if git_repos.empty?
         puts "No Git repositories found.".red
         return
@@ -54,19 +74,13 @@ 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
 
     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 = "2.2.1"
+  VERSION = "2.2.3"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -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