pixab 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6c43ec698584f8f91743cae24ae667d94ddc2ccca5d815e1581017971410d8
-  data.tar.gz: 64ccf850cfadb45aef2e666925f1461ea623c3e531b6919e0c8d4638cbc17e8b
+  metadata.gz: ad65d5472da045a81067a41d705fea247f8458977f72aa7ba61224f3c2d155da
+  data.tar.gz: 7c283ff51d7166f658e72ed9afb7de9693a79889b9f6c0b4e5015c30958a2824
 SHA512:
-  metadata.gz: f32fcff490af540814963d60e8c996728bcba783dde83355da7e2d1ac2093494dcd9b908d759496c585b65d31c0b0e80471b51e21039ed1fbc382f72233856f2
-  data.tar.gz: c1cb8b128137fb128cceabd0b7deaf04df27ae6cc6fc0aef38f7b3706e1a7881c65e3ae45625862f8edc77c9a9526cbae0eadae2f9c1378478e82eca5a335deb
+  metadata.gz: 3c7228c287049cf5f006559481862a67b09abe1d743628b57d4909c3c188a93f136c07c4e4fbd1f8893d5ccd3b98b4935f89d3569659d2244e6370d83b8aa391
+  data.tar.gz: 7b66f1118681b026bcb0e525279e00e16bf16295efd0132ba80066bb9c5de81cf799ec1c999ab7eff4864e7ce97bbf5e2c9224768b71a85b86d341506f8e375d

data/exe/pixab

@@ -2,9 +2,11 @@
 #!/usr/bin/env ruby
 # 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'
 
 case ARGV[0]
 when 'merge'
@@ -29,6 +31,10 @@ when 'sync'
   end
 when 'localize'
   Pixab::Localization.new.run(ARGV[1..-1])
+when 'package'
+  Pixab::Package.new.run
+when '--version'
+  puts Pixab::VERSION
 else
   puts "Invalid command".red
 end

data/lib/ComponentSynchronizer.rb

@@ -105,6 +105,7 @@ module Pixab
         repo_name = repo["name"]
         repo_target_branch = repo["target_branch"]
         FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
+        `git fetch origin #{repo_target_branch}`
         commit_id = `git log origin/#{repo_target_branch} -n 1 --pretty=format:"%H"`
         if !commit_id.nil?
           repo_commite_id[repo_name] = commit_id

data/lib/GitUtils.rb

@@ -0,0 +1,146 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require_relative './Utilities.rb'
+
+module Pixab
+
+  class GitUtils
+
+  end
+  
+  class << GitUtils
+    
+    # 判断当前是否为git仓库
+    def is_git_repo()
+      is_git_repo = `git rev-parse --is-inside-work-tree`.chomp
+      return is_git_repo == "true"
+    end
+  
+    # 检查当前是否有未提交的代码
+    def has_uncommit_code()
+      git_status = `git status -s`
+      return !git_status.empty?
+    end
+  
+    # 检查指定分支是否关联了远程分支
+    def has_remote_branch(branch="HEAD")
+      branch_full_name = `git rev-parse --symbolic-full-name #{branch}`
+      remote_branch = `git for-each-ref --format='%(upstream:short)' #{branch_full_name}`.chomp
+      return !remote_branch.empty?
+    end
+  
+    # 检查指定分支的本地代码和远程代码是否已经同步
+    def is_local_and_remote_branch_synced(branch)
+      local_log = `git log #{branch} -n 1 --pretty=format:"%H"`
+      remote_log = `git log remotes/origin/#{branch} -n 1 --pretty=format:"%H"`
+      return local_log == remote_log
+    end
+
+    # 判断branch1的代码是否已经同步到branch2
+    def is_branch_synced(branch1, branch2)
+      if branch1.nil? || branch2.nil?
+        return true
+      end
+      unsynced_commit = `git cherry #{branch2} #{branch1}`
+      return unsynced_commit.empty?
+    end
+
+    # 获取指定分支的最新提交
+    def latest_commit_id(branch)
+      return `git log #{branch} -n 1 --pretty=format:"%H"`
+    end
+
+    # 拉取远程仓库信息
+    # 未指定origin分支时，拉取所有远程仓库信息
+    # 只指定origin分支时，拉取远程仓库指定分支信息
+    # 同时指定local分支时，拉取远程仓库指定分支信息后，会将远程分支合并到local分支
+    def fetch_origin(origin = nil, local = nil)
+      commad = "git fetch origin"
+      if origin.nil?
+        return Utilities.execute_shell(commad)
+      end
+      commad += " #{origin}"
+      if local.nil?
+        return Utilities.execute_shell(commad)
+      end
+      commad += ":#{local}"
+      return Utilities.execute_shell(commad)
+    end
+
+    # 检查当前分支是否有冲突内容
+    def is_code_conflicts_in_current_branch
+      `git --no-pager diff --check`
+      return !Utilities.is_shell_execute_success
+    end
+
+    # 检查两个分支是否存在冲突
+    def is_code_conflicts(branch1, branch2)
+      conflicts = `git diff --name-status #{branch1} #{branch2} | grep "^U"`
+      return !conflicts.empty?
+    end
+  
+    # 获取当前分支
+    def current_branch
+      branch = `git rev-parse --abbrev-ref HEAD`
+      return branch
+    end
+
+    # 推送代码
+    # branch: 指定推送分支
+    def push(branch = nil)
+      commad = "git push"
+      if !branch.nil?
+        commad += " origin #{branch}"
+      end
+      return Utilities.execute_shell(commad)
+    end
+
+  end
+
+  class << GitUtils
+
+    def check_git_repo(path)
+      if !is_git_repo
+        puts "Error: #{path} is not a git repository".red
+        exit(1)
+      end
+    end
+
+    def check_has_uncommit_code(path)
+      if has_uncommit_code
+        puts "Please commit first, project path: #{path}".red
+        exit(1)
+      end
+    end
+
+    def check_local_and_remote_branch_synced(branch)
+      if !is_local_and_remote_branch_synced
+        puts "Please sync remote branch, use `git pull` or `git push`".red
+        exit(1)
+      end
+    end
+
+    def check_is_code_conflicts_in_current_branch
+      is_code_conflicts = is_code_conflicts_in_current_branch()
+      if !is_code_conflicts
+        return
+      end
+      project = File.basename(Dir.pwd)
+      conflict_hint = "Error: code conflict!\n"
+      conflict_hint += "step1: Resolve project:#{project}, branch:#{current_branch} code conflicts\n"
+      conflict_hint += "step2: Execute this script again"
+      puts conflict_hint.red
+      exit(1)
+    end
+
+    def check_is_code_conflicts(branch1, branch2)
+      if is_code_conflicts(branch1, branch2)
+        puts "Error: #{branch1} and #{branch2} has code conflicts".red
+        exit(1)
+      end
+    end
+
+  end
+
+end

data/lib/Package.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require "fileutils"
+require_relative './GitUtils.rb'
+require_relative './RepoManager.rb'
+
+module Pixab
+
+  class Package
+
+    attr_reader :repo_manager
+
+    def initialize(repo_manager = RepoManager.new)
+      @repo_manager = repo_manager
+    end
+
+    def run
+      main_repo = repo_manager.main_repo
+      package_branch = 'develop'
+      origin_package_branch = "origin/#{package_branch}"
+      target_branch = main_repo["target_branch"]
+      origin_target_branch = "origin/#{target_branch}"
+      main_repo_path = "#{repo_manager.root_path}/#{main_repo['name']}"
+      FileUtils.cd(main_repo_path)
+      GitUtils.check_git_repo(main_repo_path)
+      puts "\n》》》》》正在更新远程仓库信息》》》》》\n".green
+      GitUtils.fetch_origin
+      if !GitUtils.is_branch_synced(origin_package_branch, package_branch)
+        puts "\n》》》》》正在将#{origin_package_branch}代码拉取到#{package_branch}》》》》》\n".green
+        GitUtils.check_is_code_conflicts(origin_package_branch, package_branch)
+        GitUtils.fetch_origin(package_branch, package_branch)
+      end
+      if !GitUtils.is_branch_synced(origin_target_branch, package_branch)
+        puts "\n》》》》》正在将#{origin_target_branch}代码合并到#{package_branch}》》》》》\n".green
+        GitUtils.check_is_code_conflicts(origin_target_branch, package_branch)
+        GitUtils.fetch_origin(target_branch, package_branch)
+      end
+      if GitUtils.is_branch_synced(package_branch, origin_package_branch)
+        puts "Error: #{package_branch} branch has no code update and cannot be packaged.".red
+        exit(1)
+      end
+      GitUtils.push(package_branch)
+      puts "\n》》》》》已完成#{package_branch}代码推送，正在打包》》》》》".green
+      puts "打包平台地址：http://ios.meitu-int.com/ipa/airbrush/queue\n".green
+    end
+
+  end
+
+end

data/lib/Utilities.rb

@@ -11,8 +11,14 @@ module Pixab
   
   class << Utilities
   
-    def check_shell_result(error_msg = nil, success = nil)
+
+    def is_shell_execute_success(success = nil)
       is_success = success.nil? ? $?.to_i == 0 : success 
+      return is_success
+    end
+
+    def check_shell_result(error_msg = nil, success = nil)
+      is_success = is_shell_execute_success(success)
       if is_success 
         return
       end
@@ -21,6 +27,14 @@ module Pixab
       end
       exit(1)
     end
+
+    def execute_shell(commad)
+      if commad.nil?
+        return false
+      end
+      `#{commad}`
+      return is_shell_execute_success
+    end
     
     def display_default_dialog(default_text)
       input_msg = `osascript -e 'display dialog "#{default_text}"'`.chomp

data/lib/pixab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -40,9 +40,11 @@ files:
 - Rakefile
 - exe/pixab
 - lib/ComponentSynchronizer.rb
+- lib/GitUtils.rb
 - lib/Localization.rb
 - lib/LocalizationPlatform.rb
 - lib/MergeRequest.rb
+- lib/Package.rb
 - lib/RepoManager.rb
 - lib/Utilities.rb
 - lib/pixab.rb