m-git 2.5.4 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 061c41a63ff3870becb7688fd0006b85c57423d3fd909e6dde81df7756f3dc3b
-  data.tar.gz: d9da7bf09c24160ef38953892306ac3fa659400fe1742c59a621b0d6f1c6be10
+  metadata.gz: 77220cb1407e06eff83ee8f4fe617c34355301b5928ce67d4c82c0ae23402d4c
+  data.tar.gz: 93a2f2eafc405eab27aaf420967e7a791c6e62baeba93e6c35efc847822d5b57
 SHA512:
-  metadata.gz: 57cef37878e9c37fe761717385a83c5237dcec0ab14057ab3013eae05ee353426031556888420322c621051d8331e6c522d65119439b61b2f260f0a3a6f0eb5f
-  data.tar.gz: 710a2e9b7de9b273b4ddd40a8e8d3d3a252e2cbd97a94bb6b66b3aeea91b21c1afc9388efd63f8102a42e986188c46a5b97f2b9bce70327461455ca3a594c72c
+  metadata.gz: e0d257a7e6844cffbae5af66ed7584b7c828236555967101188eaf283e0591498a6c8494cefa2d5a492bef9692d6f51dd4450e28cc0c549e026af8cbeb7604e4
+  data.tar.gz: ead3235aae1f1f720da6ae6466107393f74e7668990fcc649aa8f8157e81a04af6610a112fdb204b213f86d596293864f2f04193d9d3ab0457335271f5c25c7d

data/lib/m-git/command/config.rb

@@ -26,11 +26,11 @@ module MGit
           ARGV::Opt.new(OPT_LIST[:update_manifest],
                         short_key:OPT_LIST[:update_manifest_s],
                         info:"该指令用于更新mgit所使用的配置文件，如：\"mgit config -m <new_path>/manifest.json\"。",
-                        type: :boolean),
+                        type: :string),
           ARGV::Opt.new(OPT_LIST[:update_local],
                         short_key:OPT_LIST[:update_local_s],
                         info:"该指令用于更新mgit所使用的本地配置文件，如：\"mgit config -u <new_path>/local_manifest.json\"。",
-                        type: :boolean),
+                        type: :string),
           ARGV::Opt.new(OPT_LIST[:create_local],
                         short_key:OPT_LIST[:create_local_s],
                         info:"在指定目录下创建本地配置文件，若目录不存在则自动创建。如执行：\"mgit config -c /a/b/c\"，则生成本地配置文件：\"/a/b/c/local_manifest.json\"。如果未传入值，如：\"mgit config -c\"，那么若配置仓库存在的话，会在配置仓库中创建本地配置文件。",

data/lib/m-git/command/init.rb

@@ -297,7 +297,7 @@ module MGit
     def move_project_to_root
       Dir.foreach(Workspace.root) { |item|
         if item != '.' && item != '..' && item != '.DS_Store'
-          FileUtils.mv(File.join(Workspace.root, item), @origin_root)
+          FileUtils.mv(File.join(Workspace.root, item), @origin_root, force: true)
         end
       }
       FileUtils.remove_dir(Workspace.root, true) if Dir.exist?(Workspace.root)

data/lib/m-git/command/push.rb

@@ -23,10 +23,10 @@ module MGit
     def options
       [
           ARGV::Opt.new(OPT_LIST[:gerrit],
-                        info:"开启gerrit功能，如果没有对应远程分支则推送新分支，否则推送到审查分支（refs/for/**），默认未开启",
+                        info:"开启gerrit功能，如果没有对应远程分支则推送新分支，否则推送到审查分支（refs/for/**），默认#{MGIT_PUSH_GERRIT_ENABLED ? '已开启' : '未开启' }",
                         type: :boolean),
           ARGV::Opt.new(OPT_LIST[:topic_id],
-                        info:"指定一组变更的分类topic，若未指定则自动生成，默认未开启，开启后强制开启Gerrit功能。mgit push --topic 12345 = git push origin HEAD:refs/for/<branch>%topic=12345",
+                        info:"指定一组变更的分类topic，若未指定则自动生成，默认#{MGIT_PUSH_TOPIC_ENABLED ? '已开启' : '未开启'}，开启后强制开启Gerrit功能。mgit push --topic 12345 = git push origin HEAD:refs/for/<branch>%topic=12345",
                         type: :string),
       ].concat(super)
     end

data/lib/m-git/foundation/constants.rb

@@ -77,7 +77,8 @@ module MGit
     REPO_CONFIG_LOCK_KEY = {
         :branch         => 'branch',
         :commit_id      => 'commit-id',
-        :tag            => 'tag'
+        :tag            => 'tag',
+        :change_ref     => 'change-ref'
     }.freeze
 
     SNAPSHOT_KEY = {

data/lib/m-git/foundation/mgit_config.rb

@@ -179,7 +179,7 @@ module MGit
       #
       def __load_file(root)
         config_path = File.join(root, Constants::MGIT_CONFIG_PATH)
-        if File.exists?(config_path)
+        if File.exist?(config_path)
           begin
             return YAML.load_file(config_path), nil
           rescue => e

data/lib/m-git/hooks_manager.rb

@@ -83,7 +83,7 @@ module MGit
       # block
       def __execute_hook_file(file_name, hook_class)
         file_path = File.join(Workspace.hooks_dir, file_name)
-        if File.exists?(file_path)
+        if File.exist?(file_path)
           require file_path
         end
         if Object.const_defined?(hook_class) && hook = Object.const_get(hook_class)

data/lib/m-git/manifest/light_repo.rb

@@ -19,6 +19,9 @@ module MGit
         # [String] 仓库配置分支
         :branch,
 
+        # [String] 未合入的提交 change ref
+        :change_ref,
+
         # [String] 仓库配置commit id
         :commit_id,
 

data/lib/m-git/manifest/light_repo_generator.rb

@@ -16,7 +16,7 @@ module MGit
       # @return [LightRepo] 配置对象
       #
       def self.simple_init(name, path, url)
-        LightRepo.new(name, path, nil, nil, nil, url, false, false, false, false)
+        LightRepo.new(name, path, nil, nil, nil, nil, url, false, false, false, false)
       end
 
       def self.light_repo_with(name, config_json, parent_json)
@@ -30,6 +30,7 @@ module MGit
           light_repo.commit_id = lock_info[Constants::REPO_CONFIG_LOCK_KEY[:commit_id]]
           light_repo.tag = lock_info[Constants::REPO_CONFIG_LOCK_KEY[:tag]]
           light_repo.branch = lock_info[Constants::REPO_CONFIG_LOCK_KEY[:branch]]
+          light_repo.change_ref = lock_info[Constants::REPO_CONFIG_LOCK_KEY[:change_ref]]
         end
         light_repo.url = __parse_url(config_json, parent_json)
 

data/lib/m-git/manifest/linter.rb

@@ -12,7 +12,7 @@ module MGit
       def lint_manifest_path(path)
         manifest_name = Constants::CONFIG_FILE_NAME[:manifest]
 
-        if !File.exists?(path)
+        if !File.exist?(path)
           if File.symlink?(path)
             terminate!("配置文件软链接#{path}失效，请执行\"mgit config -m <new_path>/manifest.json\"更新！")
           else

data/lib/m-git/plugin_manager.rb

@@ -59,7 +59,7 @@ module MGit
       with_name ||= plugin_root
       glob = "#{plugin_prefix}_plugin#{Gem.suffix_pattern}"
       glob = File.join(plugin_root, '**', glob)
-      plugin_files = Dir[glob].map { |f| f.untaint }
+      plugin_files = Dir[glob]
       return if loaded_plugins[with_name] || plugin_files.nil? || plugin_files.empty?
       safe_activate_plugin_files(with_name, plugin_files)
       loaded_plugins[with_name] = plugin_files
@@ -70,6 +70,7 @@ module MGit
     def self.load_gem_plugins(plugin_prefix)
       glob = "#{plugin_prefix}_plugin#{Gem.suffix_pattern}"
       gem_plugins = Gem::Specification.latest_specs.map do |spec|
+        spec = spec.to_spec unless spec.is_a?(Gem::Specification)
         matches = spec.matches_for_glob(glob)
         [spec, matches] unless matches.empty?
       end.compact
@@ -91,7 +92,7 @@ module MGit
       message << "\n#{exception.class} - #{exception.message}"
       message << "\n#{exception.backtrace.join("\n")}"
       message << "\n---------------------------------------------\n"
-      warn message.ansi.yellow
+      warn message
       false
     end
 
@@ -104,7 +105,7 @@ module MGit
       message << "\n#{exception.class} - #{exception.message}"
       message << "\n#{exception.backtrace.join("\n")}"
       message << "\n---------------------------------------------\n"
-      warn message.ansi.yellow
+      warn message
       false
     end
 

data/lib/m-git/repo/sync_helper.rb

@@ -134,6 +134,8 @@ module MGit
             return sync_tag(repo, light_repo)
           elsif !light_repo.branch.nil?
             return sync_branch(repo, light_repo)
+          elsif !light_repo.change_ref.nil?
+            return sync_change_ref(repo, light_repo)
           end
         end
 
@@ -210,6 +212,45 @@ module MGit
 
         end
 
+        # 同步 change ref
+        #
+        # @param repo [Repo] Repo对象
+        #
+        # @param light_repo [Manifest::LightRepo] LightRepo对象
+        #
+        # @return [Boolean] 执行结果，成功返回nil，错误返回错误信息
+        #
+        def sync_change_ref(repo, light_repo)
+          current_branch = repo.status_checker.current_branch(strict_mode:false)
+          local_branch_exist = repo.status_checker.local_branch_exist?(light_repo.branch)
+          remote_branch_exist = repo.status_checker.remote_branch_exist?(light_repo.branch)
+          is_dirty = repo.status_checker.status == Status::GIT_REPO_STATUS[:dirty]
+
+          # 当前已在目标切换分支则不操作
+          if current_branch == light_repo.branch
+            return nil
+            # 本地或远程存在目标分支则切换
+          # elsif local_branch_exist || remote_branch_exist || Utils.branch_exist_on_remote?(light_repo.branch, light_repo.url)
+
+          else
+            # return "仓库change_ref \"#{light_repo.change_ref}\"不存在，请检查是否拼写错误！"
+            # 本地无目标分支则先拉取
+            if !local_branch_exist && !remote_branch_exist
+              success, error = repo.execute_git_cmd('fetch origin', light_repo.change_ref)
+              puts error
+              return error if !success
+            end
+
+            if !is_dirty
+              success, output = repo.execute_git_cmd('checkout', 'FETCH_HEAD')
+              puts output
+              return output if !success
+            else
+              return "本地有改动, 无法切换到\"#{light_repo.change_ref}\", 请处理后重试!"
+            end
+          end
+        end
+
         # 同步remote url
         #
         # @param repo [Repo] Repo对象

data/lib/m-git/version.rb

@@ -1,6 +1,6 @@
 
 module MGit
-  VERSION = "2.5.4".freeze
+  VERSION = "2.5.8".freeze
 end
 
 

data/m-git

@@ -1 +1 @@
-./mgit
+mgit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m-git
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.8
 platform: ruby
 authors:
 - zhangyu81
 autorequire: 
 bindir: "./"
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: A multi-repository management tool integrated with git.