pixab 2.2.3 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f09a9844dc68dff860b089c152670840bebb8847446fed524c4090f44382fd7
-  data.tar.gz: c4f4db1ade058dfae0a4d7d45cf83f21920a5664ea307e545a4b1e6b6b3bfc5f
+  metadata.gz: 7ce14f99dbf83f98b625eefb60bd2093cf7c9322c703a7d69ab077fa3605280a
+  data.tar.gz: f09ac53203795a9d02901e6caabc8a9ec8c5baa5f11bb516ed848332afbc2551
 SHA512:
-  metadata.gz: f54c1b12ffb4c692064d945ed26ea9b054055563240d0fada93adfda1b628feaf2a1dcfcdcede3064f5cfea0893ab49a2b7092b3eadcf122d7fa6a8fb22d996c
-  data.tar.gz: 6d841b0e5773e8f24e141ca893c248b3d871d7c11a46028ef63769c09c0ce6cdf7a1823d117cd660a794ce3ff8f7d41b1836a4ea571b91bf9e8acb3a1a3d3f8b
+  metadata.gz: 413f91682e09d47c0c19241cd397948ca18e882f4876605c736909b05f109841bfaf34ab47536966b113521e6120df5bcbf2990c669d6d48f04dfee4315fc15e
+  data.tar.gz: be562d9cc8621eed03e4b61e45ed4135e52b8c7bef6e446251dceb44b2383eb9171df301499f4f41d0a1552d2d22ead2aaa4ebc09c204e9086c54f86307502b0

data/lib/Platform.rb

@@ -8,6 +8,14 @@ module Pixab
       @platform = platform
     end
 
+    def self.iOS
+      self.new('iOS')
+    end
+
+    def self.android
+      self.new('android')
+    end
+
     def is_iOS 
       platform == 'iOS'
     end

data/lib/Utilities/UserInfo.rb

@@ -0,0 +1,53 @@
+require_relative '../GitUtils.rb'
+require_relative '../Platform.rb'
+
+module Pixab
+
+  class UserInfo
+
+    attr_accessor :platform
+
+    def platform
+      if @platform.nil?
+        @platform = readPlatform
+      end
+      return @platform
+    end
+
+    def git_repos 
+      git_repos = GitUtils.find_git_repos(Dir.pwd)
+      git_repos.contact(git_sub_repos)
+      return git_repos
+    end
+
+    def git_sub_repos
+      sub_repos_path = nil
+      if @platform.is_android
+        parent_dir = File.dirname(Dir.pwd)
+        sub_repos_path = File.join(parent_dir, 'pixab_libraries')
+      end
+      
+      if sub_repos_path.nil?
+        return []
+      end
+      
+      sub_git_repos = GitUtils.find_git_repos(sub_repos_path)
+      return sub_git_repos
+    end
+
+    private
+
+    def readPlatform
+      android_file_name = 'build.gradle.kts'
+      if File.exist?(android_file_name)
+        return Platform.android
+      else
+        return Platform.iOS
+      end
+    end
+
+  end
+
+end
+
+

data/lib/feature/Feature.rb

@@ -1,16 +1,12 @@
+require_relative '../Utilities/UserInfo.rb'
 require_relative './FeatureStart.rb'
+require_relative './FeatureCopy.rb'
 
 module Pixab
   
   class Feature
     
     def run(commands = nil)
-      git_repos = GitUtils.find_git_repos(Dir.pwd)
-      if git_repos.empty?
-        puts "No Git repositories found.".red
-        return
-      end
-
       isNeedPush = true
       commands.each_index do |index|
         command = commands[index]
@@ -24,22 +20,53 @@ module Pixab
         command = commands[index]
         case command
         when 'start'
-          feature_name = commands[index + 1]
-          if feature_name.nil?
-            puts "请输入要创建的分支名称".red
-            return
-          end
-          feature_name = ensure_feature_prefix(feature_name)
-
-          feature_start = FeatureStart.new(isNeedPush)
-          git_repos.each do |repo|
-            feature_start.run(repo, feature_name)
-          end
+          featureStart
+        when 'copy'
+          featureCopy
         end
       end
 
     end
 
+    def featureStart(commands, index, isNeedPush)
+      git_repos = UserInfo.new.git_repos
+      if git_repos.empty?
+        puts "No Git repositories found.".red
+        return
+      end
+
+      feature_name = commands[index + 1]
+      if feature_name.nil?
+        puts "请输入要创建的分支名称".red
+        return
+      end
+      feature_name = ensure_feature_prefix(feature_name)
+
+      feature_start = FeatureStart.new(isNeedPush)
+      git_repos.each do |repo|
+        feature_start.run(repo, feature_name)
+      end
+    end
+
+    def featureCopy(commands, index, isNeedPush)
+      git_repos = UserInfo.new.git_sub_repos
+      if git_repos.empty?
+        puts "No Git repositories found.".red
+        return
+      end
+
+      feature_name = GitRepoInfo.new.branch
+      if feature_name.nil?
+        puts "无法获取当前分支名称".red
+        return
+      end
+
+      feature_copy = FeatureCopy.new(isNeedPush)
+      git_repos.each do |repo|
+        feature_copy.run(repo, feature_name)
+      end
+    end
+
     def ensure_feature_prefix(feature_name)
       feature_name.start_with?('feature') ? feature_name : "feature/#{feature_name}"
     end

data/lib/feature/FeatureCopy.rb

@@ -0,0 +1,55 @@
+require 'colored2'
+require_relative '../GitUtils.rb'
+require_relative '../gitlab/GitRepoInfo.rb'
+
+module Pixab
+
+  class FeatureCopy
+
+    def initialize(isNeedPush)
+      @isNeedPush = isNeedPush
+    end
+    
+    def run(path, feature_name)
+      unless Dir.exist?(path)
+        puts "当前目录不存在: #{path}".red
+        return
+      end
+
+      puts "\n#{File.basename(path)} 开始创建分支: #{feature_name}\n".green
+
+      Dir.chdir(path) do
+        create_feature_branch(feature_name)
+      end
+    end
+
+    def create_feature_branch(feature_name)
+      if !GitUtils.is_git_repo
+        puts "当前目录不是 Git 仓库！, path: #{Dir.pwd}".red
+        return
+      end
+
+      target_branch = GitRepoInfo.get_target_branch(feature_name)
+      if target_branch.nil?
+        puts "无法获取目标分支，分支：#{feature_name}".red
+      end
+
+      remote_target_branch = GitUtils.get_remote_branch_name(target_branch)
+      if remote_target_branch.nil?
+        puts "远程仓库不存在 #{target_branch} 分支！".red
+        return
+      end
+
+      GitUtils.fetch_origin(target_branch)
+
+      `git checkout -b #{feature_name} #{remote_target_branch}`
+
+      # 是否需要推送到远程仓库
+      if @isNeedPush 
+        `git push -u origin #{feature_name}`
+      end
+    end
+    
+  end
+
+end

data/lib/git/Git.rb

@@ -1,11 +1,11 @@
-require_relative '../GitUtils.rb'
+require_relative '../Utilities/UserInfo.rb' 
 
 module Pixab
 
   class Git
     
     def run(commands)
-      git_repos = GitUtils.find_git_repos(Dir.pwd)
+      git_repos = UserInfo.new.git_repos
       if git_repos.empty?
         puts "No Git repositories found.".red
         return

data/lib/gitlab/GitRepoInfo.rb

@@ -15,20 +15,50 @@ module Pixab
 
       `git fetch origin`
 
+      # 获取当前分支
       @branch = GitUtils.current_branch
       if @branch.nil?
         puts "无法获取当前分支".red
       end
+    end
 
-      @target_branch = get_target_branch(@branch)
+    # 获取目标分支
+    def target_branch
       if @target_branch.nil?
-        puts "无法获取目标分支，当前分支：#{@branch}".red
+        @target_branch = GitRepoInfo.get_target_branch(@branch)
+        if @target_branch.nil?
+          puts "无法获取目标分支，当前分支：#{@branch}".red
+        end
+      end
+      return @target_branch
+    end
+
+    # 获取远程分支
+    def remote_branch 
+      if @remote_branch.nil?
+        @remote_branch = "origin/#{@branch}"
       end
+      return @remote_branch
+    end
 
-      @remote_branch = "origin/#{@branch}"
-      @remote_target_branch = "origin/#{@target_branch}"
+    # 获取远程目标分支
+    def remote_target_branch
+      if @remote_target_branch.nil?
+        @remote_target_branch = "origin/#{@target_branch}"
+      end
+      return @remote_target_branch
     end
 
+    # 判断远程分支是否代码是否同步到远程目标分支
+    def is_remote_branch_synced
+      GitUtils.is_branch_synced(@remote_branch, @remote_target_branch)
+    end
+
+  end
+
+  class << GitRepoInfo
+    
+    #  获取目标分支
     def get_target_branch(branch)
       splited_branchs = branch.split('/')
       feature_name = splited_branchs[-1]
@@ -46,6 +76,7 @@ module Pixab
       end
     end
 
+    # 通过分支名获取对应版本号
     def get_version(feature_name)
       # 用 '_' 分割字符串
       parts = feature_name.split('_')
@@ -65,11 +96,6 @@ module Pixab
       nil
     end
 
-    # 判断远程分支是否代码是否同步到远程目标分支
-    def is_remote_branch_synced
-      GitUtils.is_branch_synced(@remote_branch, @remote_target_branch)
-    end
-
   end
 
 end

data/lib/gitlab/GitlabMRManager.rb

@@ -3,25 +3,22 @@ require_relative '../Platform.rb'
 require_relative './GitlabInfo.rb'
 require_relative '../Utilities.rb'
 require_relative './GitlabMR.rb'
+require_relative '../Utilities/UserInfo.rb' 
 
 module Pixab
 
   class GitlabMRManager
 
     def run(commands = nil)
-      platform = nil
-      sub_repos_path = nil
-
+      user_info = UserInfo.new
       if not commands.nil?
         commands.each_index do |index|
           command = commands[index]
           case command
           when '--android'
-            platform = Platform.new('android')
-            parent_dir = File.dirname(Dir.pwd)
-            sub_repos_path = File.join(parent_dir, 'pixab_libraries')
+            user_info.platform = Platform.android
           when '--iOS'
-            platform = Platform.new('iOS')
+            user_info.platform = Platform.iOS
           when '--token'
             token = commands[index + 1]
             unless token.nil?
@@ -31,31 +28,19 @@ module Pixab
         end
       end
 
-      if platform.nil?
-        platform = Platform.new('iOS')
-      end
-
       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
-       
+      git_repos = user_info.git_repos
       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
+      reviewers = user_info.platform.is_iOS ? GitlabInfo.iOS_reviewers : GitlabInfo.android_reviewers
       selected_reviewers = Utilities.display_choose_list(reviewers, nil, "审核人员", "请选择审核人员：", nil, nil, true)
 
       if selected_reviewers.empty?
@@ -64,7 +49,7 @@ module Pixab
       end
       
       reviewer_ids = []
-      if is_iOS
+      if user_info.platform.is_iOS
         selected_reviewers.each do |reviewer|
           reviewer_ids << GitlabInfo.iOS_reviewer_id(reviewer)
         end

data/lib/pixab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.1
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -108,7 +108,9 @@ files:
 - lib/Platform.rb
 - lib/RepoManager.rb
 - lib/Utilities.rb
+- lib/Utilities/UserInfo.rb
 - lib/feature/Feature.rb
+- lib/feature/FeatureCopy.rb
 - lib/feature/FeatureStart.rb
 - lib/git/Git.rb
 - lib/gitlab/GitRepoInfo.rb