pixab 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b23dbba4b6ae53666ba3ff936c868143cc3a7926d7bf61738a3cc0709a092b
-  data.tar.gz: 86b9a0d5878707673ba300b87ae77837d7ff22cba239ab012598f0ae30e6c8e4
+  metadata.gz: e6b8c8409f3aed1339f32316bf5e78207cc768cd45b3f488eeda92852dabbffa
+  data.tar.gz: bff6b53f8c90223e444a53b47e6f4518f452cd635c4fa17b77a9347b2f82c688
 SHA512:
-  metadata.gz: e418e5acf0a57ece9ccc811a460c58b97a8105dc67ba70a92826af07f9d8883e0816099cbf6a0e97b03318a48282234335a9ce4de7eb9fc6627db77bc10e4df3
-  data.tar.gz: 79536dd5536769dfc6392eaf7ebc17ade6129a3add815776d562f78fd9b0ad400b1b3755d1463805a1d72f2ca8f4f92eb6e164fe2ce8ba8f94507bcea938160c
+  metadata.gz: 672f01d7b5217758eaa57d6f1ed229dafb9e2de5300928cc0d5f618522d7f7a2cca9c3a25d419610977d9b69a6ddf526a041cd9066910ea49f5058ae8bea7b9e
+  data.tar.gz: 150192991051384a78ff4d3fb468cc899913d3242d7a0b2cce6518a278343133ce94d9c381e718ec93eacd8808b23ef79c77a8f7fd745f7f7292c008b6785db5

data/lib/localization/smartcat/SmartcatBatch.rb

@@ -16,6 +16,10 @@ module Pixab
       smartcat = Pixab::LocalizationSmartcat.new
       new_commands = commands.nil? ? [] : commands
       collections.each_with_index do |collection, index|
+        if is_skipped_collection(collection)
+          next
+        end
+
         new_commands.push('--collections', collection)
         if index > 0
           new_commands.push('--mode', 'a')
@@ -24,6 +28,19 @@ module Pixab
       end
     end
 
+    # 判断合集后缀为-debug, -ongoing, -bug时。忽略此合集拉取
+    def is_skipped_collection(collection)
+      if collection.nil?
+        return true
+      end
+
+      if collection.end_with?('-debug', '-ongoing', '-bug')
+        return true
+      end
+
+      return false
+    end
+
   end
 
 end

data/lib/pixab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixab
-  VERSION = "2.6.0"
+  VERSION = "2.6.2"
 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`

metadata

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