pixab 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857301e3eb6ed6a88bd64b764698de017088e1d7cabb7eb5ddefbd9161fcb904
-  data.tar.gz: e2e740a5b16c665a23c9b909bdf30c910356c69f59141b3ac0296d8c07c1271b
+  metadata.gz: 65ac3034471869b3d54c91cb78037e992a5afa7e14c04a778d19de6a8550da2a
+  data.tar.gz: cae519a48fd8ad1abd49f4787895c6d9b37cdf9d06fb22516e3b6f7c30a1e247
 SHA512:
-  metadata.gz: a8441858d9f113240a710bde966e5332c9d3e50850e9c4f07302548a70503181f175cba76b326d9048b5ed20a29b3f3a2e664d81606b0e929e2d0d1f036a7ef3
-  data.tar.gz: c6ed08f5fffe019e9c159c0e1f5573541f6e5559d66349d87e268655f1115b2620a126c81f7093c7a3389a4a8755662bdf3b0bd76a615127c4b54ccdee9df3be
+  metadata.gz: 22e700b31c5ba8f69ff5c353dc8758629d9e4e0a38c149899a07aad127f5f9e8a3b5941491b0715687cbce4fc06b515acaf40383f5bc1b927a543ebbba4352d3
+  data.tar.gz: a8931cca6d82419583204f6ebf7aae5415e2cd2d4f61f926be3c515258c11d2d34d076f01a16c043389409dc60d338ec76c70d22f6196e833f4a59fcc0cbcc22

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    pixab (2.4.0)
+      colored2
+      nokogiri
+      rest-client
+      ruby-progressbar
+      rubyzip
+      yaml
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colored2 (3.1.2)
+    domain_name (0.6.20240107)
+    http-accept (1.7.0)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    logger (1.6.6)
+    mime-types (3.6.0)
+      logger
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2025.0304)
+    netrc (0.11.0)
+    nokogiri (1.15.7-x86_64-darwin)
+      racc (~> 1.4)
+    racc (1.8.1)
+    rake (13.2.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    ruby-progressbar (1.13.0)
+    rubyzip (2.4.1)
+    yaml (0.4.0)
+
+PLATFORMS
+  x86_64-darwin-19
+
+DEPENDENCIES
+  pixab!
+  rake (~> 13.0)
+
+BUNDLED WITH
+   2.3.22

data/exe/pixab

@@ -3,10 +3,10 @@
 # encoding: UTF-8
 
 require_relative "../lib/pixab/version"
-require_relative '../lib/MergeRequest.rb'
-require_relative '../lib/ComponentSynchronizer.rb'
-require_relative '../lib/Localization.rb'
-require_relative '../lib/Package.rb'
+require_relative '../lib/projects/MergeRequest.rb'
+require_relative '../lib/projects/ComponentSynchronizer.rb'
+require_relative '../lib/projects/Package.rb'
+require_relative '../lib/localization/phrase/Localization.rb'
 require_relative '../lib/localization/smartcat/LocalizationSmartcat.rb'
 require_relative '../lib/localization/smartcat/LocalizationSmartcatImport.rb'
 require_relative '../lib/localization/smartcat/LocalizationSmartcatMerge.rb'

data/lib/Utilities/UserInfo.rb

@@ -1,5 +1,5 @@
-require_relative '../GitUtils.rb'
-require_relative '../Platform.rb'
+require_relative '../git/GitUtils.rb'
+require_relative './Platform.rb'
 
 module Pixab
 

data/lib/{Utilities.rb → Utilities/Utilities.rb}

@@ -36,14 +36,14 @@ module Pixab
     end
     
     def display_default_dialog(default_text)
-      input_msg = `osascript -e 'display dialog "#{default_text}"'`.chomp
+      input_msg = `osascript -e 'display dialog "#{default_text}"' 2>/dev/null`.chomp
       reg = /button returned:(.+)/
       input_msg.match(reg)
       !$1.nil?
     end
     
     def display_dialog(default_text, default_answer = "")
-      input_msg = `osascript -e 'display dialog "#{default_text}" default answer "#{default_answer}"'`.chomp
+      input_msg = `osascript -e 'display dialog "#{default_text}" default answer "#{default_answer}"' 2>/dev/null`.chomp
       reg = /text returned:(.+)/
       input_msg.match(reg)
       $1.nil? ? "" : $1

data/lib/feature/FeatureCopy.rb

@@ -1,5 +1,5 @@
 require 'colored2'
-require_relative '../GitUtils.rb'
+require_relative '../git/GitUtils.rb'
 require_relative '../gitlab/GitRepoInfo.rb'
 
 module Pixab

data/lib/feature/FeatureStart.rb

@@ -1,5 +1,5 @@
 require 'colored2'
-require_relative '../GitUtils.rb'
+require_relative '../git/GitUtils.rb'
 
 module Pixab
 

data/lib/{GitUtils.rb → git/GitUtils.rb}

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 
 require 'open3'
-require_relative './Utilities.rb'
+require_relative '../Utilities/Utilities.rb'
 
 module Pixab
 

data/lib/gitlab/GitRepoInfo.rb

@@ -1,5 +1,5 @@
 require 'colored2'
-require_relative '../GitUtils.rb'
+require_relative '../git/GitUtils.rb'
 
 module Pixab
 

data/lib/gitlab/GitlabMRManager.rb

@@ -1,7 +1,7 @@
 require 'colored2'
-require_relative '../Platform.rb'
+require_relative '../Utilities/Platform.rb'
 require_relative './GitlabInfo.rb'
-require_relative '../Utilities.rb'
+require_relative '../Utilities/Utilities.rb'
 require_relative './GitlabMR.rb'
 require_relative '../Utilities/UserInfo.rb' 
 

data/lib/{LocalizationPlatform.rb → localization/phrase/LocalizationPlatform.rb}

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 
 require "fileutils"
-require_relative './Utilities.rb'
+require_relative '../../Utilities/Utilities.rb'
 
 module Pixab
 

data/lib/mbox/MboxAdd.rb

@@ -1,7 +1,7 @@
 require 'open3'
 require_relative './AirBrushProjectInfo.rb'
-require_relative '../Utilities.rb'
-require_relative '../RepoManager.rb'
+require_relative '../Utilities/Utilities.rb'
+require_relative '../projects/RepoManager.rb'
 
 module Pixab
 

data/lib/pixab/version.rb

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

data/lib/{ComponentSynchronizer.rb → projects/ComponentSynchronizer.rb}

@@ -4,7 +4,8 @@
 require "fileutils"
 require 'colored2'
 require 'open3'
-require_relative './GitUtils.rb'
+require 'ruby-progressbar'
+require_relative '../git/GitUtils.rb'
 require_relative './RepoManager.rb'
 
 module Pixab
@@ -18,7 +19,7 @@ module Pixab
       @repo_manager = repo_manager
       @is_need_build = false
       @is_need_remote_repo = false
-      @is_need_pod_install = true
+      @is_need_pod_install = false
       @is_use__target_branch = true
 
       if commands.nil?
@@ -33,6 +34,8 @@ module Pixab
           @is_need_remote_repo = true
         when "--no-pod-install"
           @is_need_pod_install = false
+        when "--pod-install"
+          @is_need_pod_install = true
         when "--current-branch"
           @is_use__target_branch = false
         else
@@ -46,23 +49,28 @@ module Pixab
 
       active_repo_names = nil
       if is_need_remote_repo
-        puts "\n》》》》》正在将本地调试仓替换为远程仓 》》》》》》》》》》\n".green
+        puts "\n⤴️ 正在将本地调试仓替换为远程仓\n".green
         active_repo_names = replace_local_to_remote
       end
 
-      puts "\n》》》》》正在合并主工程代码 》》》》》》》》》》》》》》》\n".green
+      puts "\n🔀 正在合并主工程代码".green
       merge_and_check 
 
-      puts "\n》》》》》正在读取最新提交，并更新pod 》》》》》》》》》》\n".green
+      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
+        puts "\n⤵️ 正在将远程仓复原为本地调试仓\n".green
         reset_remote_to_local(active_repo_names)
       end
 
       if is_need_build
-        puts "\n》》》》》正在进行Xcode编译 》》》》》》》》》》》》》》》\n".green
+        puts "\n🛠️ 正在进行Xcode编译\n".green
         FileUtils.cd("#{repo_manager.root_path}/#{main_repo_name}")
         build
       end
@@ -122,6 +130,12 @@ module Pixab
   
     # 替换主工程Podfile
     def replace_podfile
+      progressbar = ProgressBar.create(
+        total: repos.length,
+        format: '%t |%B| %p%%',
+        length: 50
+      )
+
       # 获取每个子库最新的commit id
       repo_commite_id = {}
       repos.each do |repo|
@@ -129,15 +143,23 @@ module Pixab
 
         FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
         repo_target_branch = @is_use__target_branch ? repo_target_branch = repo["target_branch"] : GitUtils.current_branch
-        next unless GitUtils.check_remote_branch_exists_fast("origin/#{repo_target_branch}")    
+        unless GitUtils.check_remote_branch_exists_fast("origin/#{repo_target_branch}") 
+          progressbar.increment
+          next
+        end
 
-        stdout, status = Open3.capture2("git fetch origin #{repo_target_branch}")
-        next unless status.success?
+        stdout, status = Open3.capture2("git fetch origin #{repo_target_branch} --quiet")
+        unless status.success?
+          progressbar.increment
+          break
+        end
 
         commit_id = `git log origin/#{repo_target_branch} -n 1 --pretty=format:"%H"`
         if !commit_id.nil?
           repo_commite_id[repo_name] = commit_id
         end
+
+        progressbar.increment
       end
   
       podfile_path = "#{repo_manager.root_path}/#{main_repo_name}/AirBrushPodfiles/pix_ab_component.rb" 
@@ -158,13 +180,14 @@ module Pixab
         end
       end
   
-      if is_need_pod_install
-        system "mbox pod install --repo-update"
-        Utilities.check_shell_result("Error: execute `mbox pod install --repo-update` failed")
-      end
-
       @updated_repo_names = updated_repo_names
     end
+
+    # 执行 pod install
+    def pod_install
+      system "mbox pod install --repo-update"
+      Utilities.check_shell_result("Error: execute `mbox pod install --repo-update` failed")
+    end
   
     # 编译
     def build

data/lib/{MergeRequest.rb → projects/MergeRequest.rb}

@@ -3,9 +3,9 @@
 
 require "fileutils"
 require 'colored2'
-require_relative './Utilities.rb'
+require_relative '../Utilities/Utilities.rb'
 require_relative './RepoManager.rb'
-require_relative './GitUtils.rb'
+require_relative '../git/GitUtils.rb'
 
 module Pixab
   

data/lib/{Package.rb → projects/Package.rb}

@@ -2,7 +2,7 @@
 # encoding: UTF-8
 
 require "fileutils"
-require_relative './GitUtils.rb'
+require_relative '../git/GitUtils.rb'
 require_relative './RepoManager.rb'
 
 module Pixab

data/pixab.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'yaml'
+  spec.add_dependency 'ruby-progressbar'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Write a longer description or delete this line.
 email:
 - lzr3@us.meitu.com
@@ -91,29 +105,26 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - exe/pixab
-- lib/ComponentSynchronizer.rb
-- lib/GitUtils.rb
-- lib/Localization.rb
-- lib/LocalizationPlatform.rb
-- lib/MergeRequest.rb
-- lib/Package.rb
-- lib/Platform.rb
-- lib/RepoManager.rb
-- lib/Utilities.rb
 - lib/Utilities/FileMode.rb
+- lib/Utilities/Platform.rb
 - lib/Utilities/UserInfo.rb
+- lib/Utilities/Utilities.rb
 - lib/feature/Feature.rb
 - lib/feature/FeatureCopy.rb
 - lib/feature/FeatureStart.rb
 - lib/git/Git.rb
+- lib/git/GitUtils.rb
 - lib/gitlab/GitRepoInfo.rb
 - lib/gitlab/GitlabInfo.rb
 - lib/gitlab/GitlabMR.rb
 - lib/gitlab/GitlabMRManager.rb
+- lib/localization/phrase/Localization.rb
+- lib/localization/phrase/LocalizationPlatform.rb
 - lib/localization/smartcat/LocalizationSmartcat.rb
 - lib/localization/smartcat/LocalizationSmartcatImport.rb
 - lib/localization/smartcat/LocalizationSmartcatInfo.rb
@@ -126,6 +137,10 @@ files:
 - lib/mbox/MboxRemove.rb
 - lib/pixab.rb
 - lib/pixab/version.rb
+- lib/projects/ComponentSynchronizer.rb
+- lib/projects/MergeRequest.rb
+- lib/projects/Package.rb
+- lib/projects/RepoManager.rb
 - pixab.gemspec
 - sig/pixab.rbs
 homepage: https://github.com/LZRun