pixab 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e343b6bb118ca7dea7ba7a5f1a09f925c662b60104c3cc1cec9f0903e257857
-  data.tar.gz: d05148fe7149a47ae7c06eeec57de5276c2f2ded8148a2bb675a72cc4d216eda
+  metadata.gz: 40bdedbf96ae1aad98cea6889c0cd32dafc9d9d6634ed181ea5d3aad9fc50c53
+  data.tar.gz: f097ad80dcff665eb3f0e6a77f7717fbed41bc7e7503e6819a09e0591e5b43f2
 SHA512:
-  metadata.gz: bd5d261253f3b36eb5b5f7b4f7123ddfd922e36b8dfc5bab1afceebda3ea0ceec81a9f86a566f3ba7def345263b147b9dd9a0676d7fcfdbd9b38337a370f827c
-  data.tar.gz: c71932134caaa9fc477f1a8e4186ddd6758905b27970af104b3aef0e4f44d8e704c6e3507a896f6dd87d7e571f5db8563048b39a4abaec05a8320ec63cd0746a
+  metadata.gz: 74c4e32db81e84edf7d54c6a7bf719290bf458978440435e231113ba1e08eefb6dc659934742f295a1660733887c4adbb24f00f408adc303c22e050a57264d4f
+  data.tar.gz: fec66d4eac0ed930fa2052a3d02d77e8a482b1da15edf8f068e6fdbb5c98f81bf25649b0bdf0d707115fa54b15b69639dd192a3ce3ec7313040a622f59ccf705

data/exe/pixab

@@ -12,6 +12,8 @@ require_relative '../lib/LocalizationSmartcatImport.rb'
 require_relative '../lib/LocalizationSmartcatMerge.rb'
 require_relative '../lib/mbox/Mbox.rb'
 require_relative '../lib/gitlab/GitlabMRManager.rb'
+require_relative '../lib/feature/Feature.rb'
+require_relative '../lib/git/Git.rb'
 
 case ARGV[0]
 when '--version'
@@ -58,6 +60,10 @@ when 'mbox'
   Pixab::Mbox.new.run(ARGV[1..-1])
 when 'mr'
   Pixab::GitlabMRManager.new.run(ARGV[1..-1])
+when 'feature'
+  Pixab::Feature.new.run(ARGV[1..-1])
+when 'git'
+  Pixab::Git.new.run(ARGV[0..-1])
 else
   puts "Invalid command".red
 end

data/lib/GitUtils.rb

@@ -134,6 +134,19 @@ module Pixab
       status.success? && !exisit_remote_branch.strip.empty?
     end
 
+    # 获取远程分支名的方法
+    def get_remote_branch_name(branch, remote = 'origin')
+      remote_branches = `git branch -r`.split("\n").map(&:strip)
+      remote_branch = remote_branches.find { |b| b == "#{remote}/#{branch}" }
+      return remote_branch
+    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
 
   class << GitUtils

data/lib/feature/Feature.rb

@@ -0,0 +1,49 @@
+require_relative './FeatureStart.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]
+        case command
+        when '--no-push'
+          isNeedPush = false
+        end  
+      end
+
+      commands.each_index do |index|
+        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
+        end
+      end
+
+    end
+
+    def ensure_feature_prefix(feature_name)
+      feature_name.start_with?('feature') ? feature_name : "feature/#{feature_name}"
+    end
+
+  end
+
+end

data/lib/feature/FeatureStart.rb

@@ -0,0 +1,50 @@
+require 'colored2'
+require_relative '../GitUtils.rb'
+
+module Pixab
+
+  class FeatureStart
+
+    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
+
+      remote_develop_branch = GitUtils.get_remote_branch_name('develop')
+      if remote_develop_branch.nil?
+        puts "远程仓库不存在 develop 分支！".red
+        return
+      end
+
+      GitUtils.fetch_origin('develop')
+
+      `git checkout -b #{feature_name} #{remote_develop_branch}`
+
+      # 是否需要推送到远程仓库
+      if @isNeedPush 
+        `git push -u origin #{feature_name}`
+      end
+
+    end
+
+  end
+
+end

data/lib/git/Git.rb

@@ -0,0 +1,26 @@
+require_relative '../GitUtils.rb'
+
+module Pixab
+
+  class Git
+    
+    def run(commands)
+      git_repos = GitUtils.find_git_repos(Dir.pwd)
+      if git_repos.empty?
+        puts "No Git repositories found.".red
+        return
+      end
+
+      command = commands.join(' ')
+      git_repos.each do |repo|
+        puts "\n[#{File.basename(repo)}]".green
+        Dir.chdir(repo) do
+          system command
+        end
+      end
+
+    end
+
+  end
+
+end

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/pixab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -94,6 +94,9 @@ files:
 - lib/Platform.rb
 - lib/RepoManager.rb
 - lib/Utilities.rb
+- lib/feature/Feature.rb
+- lib/feature/FeatureStart.rb
+- lib/git/Git.rb
 - lib/gitlab/GitRepoInfo.rb
 - lib/gitlab/GitlabInfo.rb
 - lib/gitlab/GitlabMR.rb