pixab 2.6.2 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b8c8409f3aed1339f32316bf5e78207cc768cd45b3f488eeda92852dabbffa
-  data.tar.gz: bff6b53f8c90223e444a53b47e6f4518f452cd635c4fa17b77a9347b2f82c688
+  metadata.gz: 8f63b51e91e21453dd1892a925619c5fcb5eec0492800d3f1168b873bd10fc23
+  data.tar.gz: a87f518f6532aca41402fc07af84d9bbc00e8eddd00256f26b14632c3460d714
 SHA512:
-  metadata.gz: 672f01d7b5217758eaa57d6f1ed229dafb9e2de5300928cc0d5f618522d7f7a2cca9c3a25d419610977d9b69a6ddf526a041cd9066910ea49f5058ae8bea7b9e
-  data.tar.gz: 150192991051384a78ff4d3fb468cc899913d3242d7a0b2cce6518a278343133ce94d9c381e718ec93eacd8808b23ef79c77a8f7fd745f7f7292c008b6785db5
+  metadata.gz: 250fbd905a5b0545b54f6dc455fec2066629817a70f99ab338d2008bcfc89259a8b55f2629b2e41a34c76d7c3f9e9e689b40e825b5a787af7a47e8dfa6244282
+  data.tar.gz: 4677eea1c7f6ba9e18af34e27471bfd1617c6c74a882d66cddcb8631c8a33f66985420de0fda2cec088df7cd63d4f538152154b32eec9ceeb5f89146563e6923

data/exe/pixab

@@ -27,7 +27,11 @@ when 'sync'
 
   is_need_commit = Pixab::Utilities.display_default_dialog("是否需要提交代码")
   if is_need_commit
-    commands = ["-m"]
+    commands = []
+    if ARGV.count > 1
+      commands.push(*ARGV[1..-1])
+    end
+    commands.push("-m")
     if !synchronizer.updated_repo_names.empty?
       default_commit_msg = "[Feature]Update"
       synchronizer.updated_repo_names.each do |repo_name|

data/lib/pixab/version.rb

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

data/lib/projects/MergeRequest.rb

@@ -11,7 +11,7 @@ module Pixab
   
   class MergeRequest
 
-    attr_accessor :repo_type, :default_commit_msg, :need_merge_origin, :need_creat_mr
+    attr_accessor :repo_type, :default_commit_msg, :need_merge_origin, :need_creat_mr, :need_push_remote
     attr_reader :repo_manager, :repos, :command_options
   
     def initialize(repo_manager = RepoManager.new, commands = nil)
@@ -20,6 +20,7 @@ module Pixab
       @default_commit_msg = "[Feature]"
       @need_merge_origin = true
       @need_creat_mr = true
+      @need_push_remote = false
 
       if commands.nil?
         return
@@ -37,6 +38,9 @@ module Pixab
           @need_merge_origin = false
         when "--no-mr"
           @need_creat_mr = false
+        when "--current-branch"
+          @need_creat_mr = false
+          @need_push_remote = true
         else
         end
       end
@@ -46,7 +50,11 @@ module Pixab
       read_repo_infos
       commit
       merge
-      push_and_create_mr
+      if need_creat_mr
+        push_and_create_mr
+      elsif need_push_remote
+        push_to_remote
+      end
     end
   
     # 读取组件信息
@@ -102,10 +110,6 @@ module Pixab
   
     # 推送MR
     def push_and_create_mr()
-      if !need_creat_mr
-        return
-      end
-
       feature_branch = repo_manager.feature_branch
 
       reviewers = Utilities.display_dialog("正在创建Merge Request\n请输入审核人员ID：\n子琰(979) 丕臻(1385) 再润(1569) 思保(1922)", "979 1385").split()
@@ -141,7 +145,36 @@ module Pixab
         `#{commad} -o merge_request.create #{mr_target} #{mr_source_branch} #{mr_request_assign}`
       end
     end
-  
+
+    def push_to_remote
+      feature_branch = repo_manager.feature_branch
+
+      repos.each do |repo|
+        repo_name = repo["name"]
+        puts "\n[#{repo_name}]"
+        FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
+        current_branch = GitUtils.current_branch
+        if current_branch != feature_branch
+          puts "\n[!] The repo #{repo_name} is not in feature branch `#{feature_branch}`. Skip it.".yellow
+          next
+        end
+        
+        repo_target_branch = repo["target_branch"]          
+        
+        log_content = `git log origin/#{repo_target_branch}..#{current_branch} --pretty=format:"%H"`
+        if log_content.empty?
+          puts "\n[!] branch `#{current_branch}` is same as branch `origin/#{repo_target_branch}`. Skip it.".yellow
+          next          
+        end
+
+        commad = "git push"
+        if repo["last_branch"].nil?
+          commad += " --set-upstream origin #{current_branch}"
+        end
+        `#{commad}`
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.5
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-26 00:00:00.000000000 Z
+date: 2025-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2