pixab 2.6.7 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03ed271c8fb0a56b425c86fcf36e2e9cafc7f4bbf2f3f7d300cc1bd7d3235739
-  data.tar.gz: 4a50de50638cd35ffaebca73b9b4a35e174a9aa0ad7195732336c2404340c26f
+  metadata.gz: ebbf9043986375cb22100981eda800f49dffa8995cdd4d943dea3fecc7d2a4dc
+  data.tar.gz: dd9c1b54ea7d359dc7d7589c9d7e3443c1c6193345e2cc6fc90b46321695cb0d
 SHA512:
-  metadata.gz: 6df00a737bdd715c3f5c3b0ed5b6065e1c97df053d2683a1f33022934a2ec1e9d9a31498570d06bd7ba3e000360f980311b5e593594fc655308d7745622b7d4c
-  data.tar.gz: fbd8075532588d861a7692039613200605c8d303cf86eba574a5106983e558c91ca996d6e43778287d5cf512ab0f41801e66e674bb4ae307be307962c402fadb
+  metadata.gz: 5d8203821bb1f8a754deb95520cbca7ac103817e75053e34289eb577d23520d76057b227b0da241dd9dd02465fa4bcc68bafbaa10b66488300e54f0e2224a182
+  data.tar.gz: 9dec8f482d4eb7166c3ee666a9b6f84552733901b7aaf7d2de9a4a5e866f7b56ddf8de07b01d39ad61a652658879eb24ecf95444db3ec918c06c337cb15cfc2a

data/lib/pixab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixab
-  VERSION = "2.6.7"
+  VERSION = "2.6.8"
 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, :need_merge_origin
+    attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch, :need_merge_origin, :is_need_stash
     attr_reader :repo_manager, :repos, :main_repo_name, :updated_repo_names
   
     def initialize(repo_manager = RepoManager.new, commands = nil)
@@ -22,6 +22,7 @@ module Pixab
       @is_need_pod_install = false
       @is_use__target_branch = true
       @need_merge_origin = true
+      @is_need_stash = false
 
       if commands.nil?
         return
@@ -41,6 +42,8 @@ module Pixab
           @is_use__target_branch = false
         when "--no-merge-origin"
           @need_merge_origin = false
+        when "--stash"
+          @is_need_stash = true
         else
         end
       end
@@ -50,33 +53,62 @@ module Pixab
     def run
       read_repo_infos
 
-      active_repo_names = nil
-      if is_need_remote_repo
-        puts "\n⤴️ 正在将本地调试仓替换为远程仓\n".green
-        active_repo_names = replace_local_to_remote
+      did_stash = false
+      if is_need_stash
+        did_stash = stash_changes
       end
 
-      puts "\n🔀 正在合并主工程代码".green
-      merge_and_check 
+      begin
+        active_repo_names = nil
+        if is_need_remote_repo
+          puts "\n⤴️ 正在将本地调试仓替换为远程仓\n".green
+          active_repo_names = replace_local_to_remote
+        end
 
-      puts "\n📥 正在读取最新提交".green
-      replace_podfile
+        puts "\n🔀 正在合并主工程代码".green
+        merge_and_check 
 
-      if is_need_pod_install
-        puts "\n📦 正在执行pod install\n".green
-        pod_install
-      end
+        puts "\n📥 正在读取最新提交".green
+        replace_podfile
+
+        if is_need_pod_install
+          puts "\n📦 正在执行pod install\n".green
+          pod_install
+        end
 
-      if is_need_remote_repo 
-        puts "\n⤵️ 正在将远程仓复原为本地调试仓\n".green
-        reset_remote_to_local(active_repo_names)
+        if is_need_remote_repo 
+          puts "\n⤵️ 正在将远程仓复原为本地调试仓\n".green
+          reset_remote_to_local(active_repo_names)
+        end
+
+        if is_need_build
+          puts "\n🛠️ 正在进行Xcode编译\n".green
+          FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
+          build
+        end
+      ensure
+        if did_stash
+          pop_stash
+        end
       end
+    end
 
-      if is_need_build
-        puts "\n🛠️ 正在进行Xcode编译\n".green
-        FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
-        build
+    # 暂存本地修改
+    def stash_changes
+      FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
+      if GitUtils.has_uncommit_code
+        puts "\n📦 正在暂存本地修改".green
+        system "git stash push -m 'pixab-sync-auto-stash'"
+        return true
       end
+      return false
+    end
+
+    # 恢复暂存的修改
+    def pop_stash
+      FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
+      puts "\n📦 正在恢复暂存的本地修改".green
+      system "git stash pop"
     end
   
     # 读取组件信息

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-06 00:00:00.000000000 Z
+date: 2026-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2