pixab 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd7c2f70afda370b52d1053f29c31cf57de92b8b83773d2274062faa8ec7444
-  data.tar.gz: 5b708bdf573d20c2e8dd7386f706fd70e10674f28bdf51057d4c612ee8753d49
+  metadata.gz: ec3906e79f2ebe67f2f7dc8febbed0ae2d7eec5fa2490df64b5db3c9893ea18b
+  data.tar.gz: 73ec79db985afcd1d5f432d26ab173f791c846ed44c81930f8b23a9867874c84
 SHA512:
-  metadata.gz: 0ce7a74b7b42ee05dd4db01ad342ccb4b0183926a92e450b20915fdf49bb063251536eca8e8964acb7e37dcc8d0b71c1b002e73f7d79a49618e0e35b38581eb1
-  data.tar.gz: 3aaa2d852128c0cbdc8fc1a9623dd37d3031e03926d2a823e626dea4ba059fabc56d02c38bd908505807b793dfe97deeeebdc59e48ba337c2295dd321603787f
+  metadata.gz: 211e0f3ce4e1cbe14986838a63ac812204953ac0f5709151cdccac5d4fe8557d63ec554977b52110e1ff529a964033f9b2d6218c2291c5a2c59633cd6b22435a
+  data.tar.gz: 03630d3d4d10cc0c26fb93ae42e9a613694f155da614f77c17c7fc5695d87e42603e0899c3e8f7309e456d3e02f72ec3ed69ebeafd5baeacf64091a006144c5b

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.1"
+  VERSION = "2.6.3"
 end

data/lib/projects/ComponentSynchronizer.rb

@@ -12,7 +12,7 @@ module Pixab
 
   class ComponentSynchronizer
 
-    attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch
+    attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch, :need_merge_origin
     attr_reader :repo_manager, :repos, :main_repo_name, :updated_repo_names
   
     def initialize(repo_manager = RepoManager.new, commands = nil)
@@ -21,6 +21,7 @@ module Pixab
       @is_need_remote_repo = false
       @is_need_pod_install = false
       @is_use__target_branch = true
+      @need_merge_origin = true
 
       if commands.nil?
         return
@@ -38,6 +39,8 @@ module Pixab
           @is_need_pod_install = true
         when "--current-branch"
           @is_use__target_branch = false
+        when "--no-merge-origin"
+          @need_merge_origin = false
         else
         end
       end
@@ -119,6 +122,10 @@ module Pixab
   
     # 合并代码并检查冲突
     def merge_and_check
+      if not need_merge_origin
+        return
+      end
+      
       system "mbox merge --repo #{main_repo_name}"
       FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
       `git --no-pager diff --check`

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
+      elseif 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,34 @@ module Pixab
         `#{commad} -o merge_request.create #{mr_target} #{mr_source_branch} #{mr_request_assign}`
       end
     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

metadata

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