avm-git 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dbbeaecd11ef3df5fcdc6467875ee5e4cbd4bbf0ec16878c56ea0b0996b726b
-  data.tar.gz: 257081841d148f3195076725ab146b4f12d47fc143db3b7e6bd7467840a2a481
+  metadata.gz: 447507fccfbdccc90a778e94ea7dbc81e2600cab181994857ee1e2644d80ca9a
+  data.tar.gz: cf78b8c4eb61432fc10369703fdb2309fca8e4c30fb92c2dc507262c30d8c070
 SHA512:
-  metadata.gz: 1c40bfcfd621c1dc6137dcece97b85e5158b32419b529ec721aebd7eeb622e8692fbf8229fee08216d148592e6bbc1344043ce7bee2ae8ac06235ad920f7a900
-  data.tar.gz: 71ca230ad521db192dbe47c981ccbd22fc40154aeaaabc8b32b512fb51716783159f55fb171cb71c8e000a245edf833053b374ebac6e91b81f9df45912c43c10
+  metadata.gz: 2d54484f2a54ca4a8a315e47044f0450acbb74b8f95f39cf9ff2c803600cc7a4d1b08209d3ccb66a3da9070fefb846b71cc3d0cdd8b497e438b76a4bedc1d47e
+  data.tar.gz: ea4c503d46c43fce7d44b38e69792a16c6b380a5a448fbd7e959cbb2e7348123f809ac3b9a52c090a670edca80c98e3ba21ab5157327b8d3a608037b4f8c5f1b

data/lib/avm/git/scms/git/change_tracker.rb

@@ -7,7 +7,7 @@ module Avm
     module Scms
       class Git < ::Avm::Scms::Base
         class ChangeTracker
-          common_constructor :git_scm, :message
+          common_constructor :git_scm, :commit_info
           attr_reader :starting_commit
           delegate :git_repo, to: :git_scm
 
@@ -22,7 +22,7 @@ module Avm
             git_scm.commit_dirty
             return nil if starting_commit == git_repo.head
 
-            git_scm.reset_and_commit(starting_commit, message)
+            git_scm.reset_and_commit(starting_commit, commit_info)
           end
 
           private

data/lib/avm/git/scms/git/commits.rb

@@ -20,21 +20,24 @@ module Avm
             end
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
-          def commit_dirty(message = nil)
+          def commit_dirty(commit_info = nil)
             return nil unless git_repo.dirty?
 
+            commit_info = ::Avm::Scms::CommitInfo.assert(commit_info)
+            commit_info = commit_info.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if
+              commit_info.message.blank?
+
             git_repo.command('add', '.').execute!
-            git_repo.command(
-              'commit', '-m',
-              message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)
-            ).execute!
+            run_commit(commit_info)
             head_commit
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
-          def commit_if_change(message = nil)
-            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
+          def commit_if_change(commit_info = nil)
+            tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, commit_info)
             tracker.start
             yield
             tracker.stop
@@ -45,10 +48,11 @@ module Avm
             commit(git_repo.head)
           end
 
+          # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit]
-          def reset_and_commit(commit_to_reset, message)
+          def reset_and_commit(commit_to_reset, commit_info)
             git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
-            commit_dirty(message)
+            commit_dirty(commit_info)
           end
         end
       end

data/lib/avm/git/scms/git_sub_base.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        enable_abstract_methods
+
+        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
+                 :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git_subrepo.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/scms/base'
+require 'avm/git/scms/git_sub_base'
 require 'eac_git/local'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     module Scms
-      class GitSubrepo < ::Avm::Scms::Base
-        delegate :changed_files, :commit_if_change, :current_milestone_base_commit, :interval,
-                 :head_commit, :run_commit, to: :parent_scm
-
+      class GitSubrepo < ::Avm::Git::Scms::GitSubBase
         def update
           git_subrepo.command('clean').execute!
           git_subrepo.command('pull').execute!

data/lib/avm/git/scms/git_subtree.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/provider'
+require 'avm/git/scms/git_sub_base'
+require 'avm/scms/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubtree < ::Avm::Git::Scms::GitSubBase
+        def update
+          # Do nothing
+        end
+
+        def valid?
+          return false unless ::Avm::Git::Scms::Provider
+                              .new.all.any? { |scm_class| parent_scm.is_a?(scm_class) }
+
+          (::Avm::Git::Scms::Provider.new.all - [self.class])
+            .lazy.map { |scm_class| scm_class.new(path) }.none?(&:valid?)
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/provider.rb

@@ -2,13 +2,15 @@
 
 require 'avm/git/scms/git'
 require 'avm/git/scms/git_subrepo'
+require 'avm/git/scms/git_subtree'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     module Scms
       class Provider
-        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo].freeze
+        SCMS = [::Avm::Git::Scms::Git, ::Avm::Git::Scms::GitSubrepo,
+                ::Avm::Git::Scms::GitSubtree].freeze
 
         def all
           SCMS

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/locale/en.yml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: fix/update.'

data/locale/pt-BR.yml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    git:
+      scms:
+        git_subrepo:
+          update_version_scm_message: '**/.gitrepo: conserta/atualiza.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.61'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: '0.61'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +192,9 @@ files:
 - lib/avm/git/scms/git/interval.rb
 - lib/avm/git/scms/git/milestones.rb
 - lib/avm/git/scms/git/run_commit.rb
+- lib/avm/git/scms/git_sub_base.rb
 - lib/avm/git/scms/git_subrepo.rb
+- lib/avm/git/scms/git_subtree.rb
 - lib/avm/git/scms/provider.rb
 - lib/avm/git/subrepo_check.rb
 - lib/avm/git/subrepo_check/parent.rb
@@ -196,6 +204,8 @@ files:
 - lib/avm/git/vendor.rb
 - lib/avm/git/vendor/github.rb
 - lib/avm/git/version.rb
+- locale/en.yml
+- locale/pt-BR.yml
 homepage: 
 licenses: []
 metadata: {}