pixab 1.1.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620f8ce01d8a6d133e14e0bf9fd5b38ae12d59690f8755c311dbad00162e3378
-  data.tar.gz: 5949bd4e8a44174d1a6702698bd47aabb5b499940ef8bb7785674dcd3e5d4ddc
+  metadata.gz: 465c3b05af7e8d11f5fd4b439052fa3dbe29f4e3bc8c16e1299d19fb7dc278e7
+  data.tar.gz: 4c3dd3ef7d60511a00bb9fc57df5ff35e40b9faf3686e1c4d4f131d6d6aefd34
 SHA512:
-  metadata.gz: 3f64497e1c775ea0f8fe164f66d15b463c967e6ddcb568e8447541d366828e7e84c50e99ec22836afa26968cdf6172cb31f699ba53eea8e24a5623ebcc5ea0b6
-  data.tar.gz: fc3c3013e9e97e39fa622fcfff40125df59c2aa5735455aa50d6fe6df82ea1bbcd92d5929975f08b967238159322828b5a17e841320f9422e82896a42359a61f
+  metadata.gz: 78ca01d716329db426c40ff7103b03ebee3cbb4b09b9c8467ccd822cc60de4a48b4b9473516cbdfcd3bee824963425b1104669fa82ed5b94d1ae991643edc5c6
+  data.tar.gz: cdc919b196b24c97040c8cde8118a09aeae0f27be69cc8d2e5e07ff73f5c062aea70469e82c5a288e793ba700ae5b083415c23be10354f8eff5476a5a30eec12

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

@@ -57,12 +57,14 @@ module Pixab
     def replace_local_to_remote
       active_repo_names = ""
       repos.each do |repo|
-        components = repo["components"]
         is_avtive = true
-        components.each do |component|
-          if component["tool"] == "CocoaPods"
-            is_avtive = !component["active"].empty?
-            break
+        components = repo["components"]
+        if !components.nil?
+          components.each do |component|
+            if component["tool"] == "CocoaPods"
+              is_avtive = !component["active"].empty?
+              break
+            end
           end
         end
         if is_avtive 

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`.chomp
+      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/MergeRequest.rb

@@ -5,30 +5,38 @@ require "fileutils"
 require 'colored2'
 require_relative './Utilities.rb'
 require_relative './RepoManager.rb'
+require_relative './GitUtils.rb'
 
 module Pixab
   
   class MergeRequest
 
-    attr_accessor :repo_type, :default_commit_msg
+    attr_accessor :repo_type, :default_commit_msg, :need_merge_origin, :need_creat_mr
     attr_reader :repo_manager, :repos, :command_options
   
     def initialize(repo_manager = RepoManager.new, commands = nil)
       @repo_manager = repo_manager
       @repo_type = 2
       @default_commit_msg = "[Feature]"
+      @need_merge_origin = true
+      @need_creat_mr = true
+
       if commands.nil?
         return
       end
       commands.each_index do |index|
         command = commands[index]
         case command
-        when  "-a"
+        when "-a"
           @repo_type = 0
         when "-m"
           @repo_type = 1
         when "--commit-m"
           @default_commit_msg = commands[index + 1]
+        when "--no-merge-origin"
+          @need_merge_origin = false
+        when "--no-mr"
+          @need_creat_mr = false
         else
         end
       end
@@ -85,8 +93,7 @@ module Pixab
   
     # 合并代码
     def merge()
-      is_need_merge = Utilities.display_default_dialog("是否需要合并远程代码到本地？")
-      if is_need_merge 
+      if need_merge_origin 
         repos.each do |repo|
           system "mbox merge --repo #{repo["name"]}"
         end
@@ -95,30 +102,43 @@ module Pixab
   
     # 推送MR
     def push_and_create_mr()
-      is_need_creat_mr = Utilities.display_default_dialog("是否需要推送到远程并创建MR？")
-      if is_need_creat_mr 
-        reviewers = Utilities.display_dialog("请输入审核人员ID：\n子琰(979) 丕臻(1385) 再润(1569) 思保(1922)", "979 1385").split()
-        mr_request_assign = ""
-        reviewers.each do |reviewer|
+      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()
+      mr_request_assign = ""
+      reviewers.each do |reviewer|
         mr_request_assign += " -o merge_request.assign=#{reviewer}"
+      end
+      mr_source_branch = "-o merge_request.remove_source_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
-  
-        mr_source_branch = "-o merge_request.remove_source_branch"
-        repos.each do |repo|
-          repo_name = repo["name"]
-          puts repo_name
-          repo_target_branch = repo["target_branch"]
-          repo_last_branch = repo["last_branch"]
         
-          FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
-          log_content = `git log origin/#{repo_target_branch}..#{repo_last_branch} --pretty=format:"%H"`
-          if log_content.empty?
-            next
-          end
-          mr_target = "-o merge_request.target=#{repo_target_branch}"
-          # mr_title = "-o merge_request.title=#{repo_last_branch}"
-          `git push -o merge_request.create #{mr_target} #{mr_source_branch} #{mr_request_assign}`
+        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
+        mr_target = "-o merge_request.target=#{repo_target_branch}"
+        # mr_title = "-o merge_request.title=#{repo_last_branch}"
+        commad = "git push"
+        if repo["last_branch"].nil?
+          commad += " --set-upstream origin #{current_branch}"
         end
+        `#{commad} -o merge_request.create #{mr_target} #{mr_source_branch} #{mr_request_assign}`
       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/RepoManager.rb

@@ -8,7 +8,7 @@ module Pixab
 
   class RepoManager
   
-    attr_reader :root_path, :repos
+    attr_reader :root_path, :feature
   
     def initialize()
       read_repo_infos
@@ -27,10 +27,13 @@ module Pixab
         puts "Error: You are currently in Free Mode".red
         exit(1)
       end
-      feature = obj["features"][current_feature_name.downcase]
-      @repos = feature["repos"]
+      @feature = obj["features"][current_feature_name.downcase]
     end
   
+    def repos
+     feature["repos"]
+    end
+
     def main_repo
       repos.first
     end
@@ -43,6 +46,14 @@ module Pixab
       end
       return []
     end
+
+    def feature_name
+      feature["name"]
+    end
+
+    def feature_branch
+      feature["branch_prefix"] + feature_name
+    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.3"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.1
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-13 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