avm-git 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf8e082960ea0c3f5895f7d4fd75d88d0b0ff802941b6785b3c21798355b2e1
-  data.tar.gz: 3a94d2ba83aa0c7f97a2bc1c9e8b1bc1a18ee37376cf48aa4db2b74878513acd
+  metadata.gz: 28871a777caa1e8f966f5721699e699dbb1d94a0d4942dc509e8feb044ed5407
+  data.tar.gz: f1a9ea393677102234301676063e2a281d668f36704ef043ac75ddb233288c66
 SHA512:
-  metadata.gz: c34f1f8dbc3a1f9d3d73926fd9bc1b39351064ae16059e8ce015dde70c9e76a6953575de8249e345c28e8629173d89e66e4ebc66b7ed45389bbb88a0ebc2a3bf
-  data.tar.gz: 0022ab54517124cd3c782958e39452b5f6c4abb75b3ab210f985f7b352c77a22d9ad053aa406ae5f1789449e40fa250f44c5c1544b2da7c8113298f8c41b51cb
+  metadata.gz: baaf6987cc2f64fd6d32d791230c4a9a7de0df711870d908fdf95fc30da44aa0e1a9082d27a3a020f82425e435c63d77723af466f9003cbb0fcad0d28c2d4e1f
+  data.tar.gz: 7c2ff2e208628a5e7a1361965139473f98ba3be5b573a97d55479eeeda8b29c8f63554edf25b5b1c11d25a8ae4d1ec39d9c4e6f70ef8b5a61d9ed43bac9806c6

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class CommitDirty
+          enable_method_class
+          # @param commit_info [Avm::Scms::CommitInfo, nil]
+          common_constructor :scm, :commit_info, default: [nil]
+          delegate :git_repo, :head_commit, :run_commit, to: :scm
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def result
+            return nil unless git_repo.dirty?
+
+            run_commit(asserted_commit_info)
+            head_commit
+          end
+
+          private
+
+          def asserted_commit_info
+            r = ::Avm::Scms::CommitInfo.assert(commit_info)
+            r = r.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if r.message.blank?
+            git_repo.dirty_files.inject(r) { |a, e| a.path(e.absolute_path) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,20 +20,6 @@ module Avm
             end
           end
 
-          # @param commit_info [Avm::Scms::CommitInfo]
-          # @return [Avm::Git::Scms::Git::Commit,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!
-            run_commit(commit_info)
-            head_commit
-          end
-
           # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
           def commit_if_change(commit_info = nil)

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

@@ -48,7 +48,7 @@ module Avm
           end
 
           def reset
-            scm.git_repo.command('reset', '--soft', 'HEAD').execute!
+            scm.git_repo.command('reset', 'HEAD').execute!
           end
         end
       end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :parent_changed_file
+
+          # @return [Pathname]
+          def path
+            parent_changed_file.path.relative_path_from(scm.relative_path_from_parent_scm)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,9 +9,7 @@ module Avm
     module Scms
       class GitSubBase < ::Avm::Scms::Base
         class Commit < ::Avm::Scms::Commit
-          common_constructor :scm, :parent_commit do
-            # parent_commit.assert_argument(::Avm::Git::Scms::Git::Commit, 'parent_commit')
-          end
+          common_constructor :scm, :parent_commit
 
           delegate :deploy_to_env_path, :fixup?, :id, :merge_with, :reword, :scm_file?, :subject,
                    :to_s, to: :parent_commit

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

@@ -9,9 +9,16 @@ module Avm
       class GitSubBase < ::Avm::Scms::Base
         enable_abstract_methods
 
-        delegate :changed_files, :commit_if_change, :current_milestone_base_commit,
+        delegate :commit_if_change, :current_milestone_base_commit,
                  :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
 
+        # @return [Enumerable<Avm::Git::Scms::GitSubBase::ChangedFile>]
+        def changed_files
+          parent_scm.changed_files.map do |parent_changed_file|
+            ::Avm::Git::Scms::GitSubBase::ChangedFile.new(self, parent_changed_file)
+          end
+        end
+
         # @param from [Avm::Git::Scms::Git::Commit]
         # @param to [Avm::Git::Scms::Git::Commit]
         # @return [Avm::Git::Scms::GitSubBase::Interval]

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.2'
+    VERSION = '0.13.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.73'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: 0.73.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.73'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: 0.73.1
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.117'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.117'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -194,11 +194,13 @@ files:
 - lib/avm/git/scms/git/commit.rb
 - lib/avm/git/scms/git/commit/deploy.rb
 - lib/avm/git/scms/git/commit/deploy_methods.rb
+- lib/avm/git/scms/git/commit_dirty.rb
 - lib/avm/git/scms/git/commits.rb
 - 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_sub_base/changed_file.rb
 - lib/avm/git/scms/git_sub_base/commit.rb
 - lib/avm/git/scms/git_sub_base/interval.rb
 - lib/avm/git/scms/git_subrepo.rb