pixab 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad65d5472da045a81067a41d705fea247f8458977f72aa7ba61224f3c2d155da
-  data.tar.gz: 7c283ff51d7166f658e72ed9afb7de9693a79889b9f6c0b4e5015c30958a2824
+  metadata.gz: 465c3b05af7e8d11f5fd4b439052fa3dbe29f4e3bc8c16e1299d19fb7dc278e7
+  data.tar.gz: 4c3dd3ef7d60511a00bb9fc57df5ff35e40b9faf3686e1c4d4f131d6d6aefd34
 SHA512:
-  metadata.gz: 3c7228c287049cf5f006559481862a67b09abe1d743628b57d4909c3c188a93f136c07c4e4fbd1f8893d5ccd3b98b4935f89d3569659d2244e6370d83b8aa391
-  data.tar.gz: 7b66f1118681b026bcb0e525279e00e16bf16295efd0132ba80066bb9c5de81cf799ec1c999ab7eff4864e7ce97bbf5e2c9224768b71a85b86d341506f8e375d
+  metadata.gz: 78ca01d716329db426c40ff7103b03ebee3cbb4b09b9c8467ccd822cc60de4a48b4b9473516cbdfcd3bee824963425b1104669fa82ed5b94d1ae991643edc5c6
+  data.tar.gz: cdc919b196b24c97040c8cde8118a09aeae0f27be69cc8d2e5e07ff73f5c062aea70469e82c5a288e793ba700ae5b083415c23be10354f8eff5476a5a30eec12

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

@@ -82,7 +82,7 @@ module Pixab
   
     # 获取当前分支
     def current_branch
-      branch = `git rev-parse --abbrev-ref HEAD`
+      branch = `git rev-parse --abbrev-ref HEAD`.chomp
       return branch
     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/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/pixab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2