avm-git 0.13.2 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf8e082960ea0c3f5895f7d4fd75d88d0b0ff802941b6785b3c21798355b2e1
-  data.tar.gz: 3a94d2ba83aa0c7f97a2bc1c9e8b1bc1a18ee37376cf48aa4db2b74878513acd
+  metadata.gz: 97b90e458de2c4249f60e964c1d95564bd46dbe0f4fd754ce591f475ba13313f
+  data.tar.gz: 03bc99cf2b5863dc919a8d06f92711959c8f3fd8b4ae360500528a5b82f74a9a
 SHA512:
-  metadata.gz: c34f1f8dbc3a1f9d3d73926fd9bc1b39351064ae16059e8ce015dde70c9e76a6953575de8249e345c28e8629173d89e66e4ebc66b7ed45389bbb88a0ebc2a3bf
-  data.tar.gz: 0022ab54517124cd3c782958e39452b5f6c4abb75b3ab210f985f7b352c77a22d9ad053aa406ae5f1789449e40fa250f44c5c1544b2da7c8113298f8c41b51cb
+  metadata.gz: afb7e4062254feab12e955691537fabe63c5a31318aa4965a31b807c40636ade3835dd90649bff89b830eb79d666d73680e0b74501910b1d7f58f9c5eed009c7
+  data.tar.gz: aba1de78c58adcfee8009bf3a02f2ac7e87ff97a0313643745dd393416d76559ba02197ebab4e345244758d6e8de80f2f726957360f58b3edab5608c8a4b7129

data/lib/avm/git/commit/diff_tree_line.rb

@@ -20,7 +20,7 @@ module Avm
         end
 
         def fields
-          FIELDS.map { |field| [field, send(field)] }.to_h
+          FIELDS.index_with { |field| send(field) }
         end
 
         private

data/lib/avm/git/launcher/base/underlying.rb

@@ -21,11 +21,9 @@ module Avm
 
           %w[execute execute! system system!].each do |exec_type|
             define_method exec_type do |*args|
-              begin
-                command(*args).send(exec_type)
-              rescue ::EacRubyUtils::Envs::ExecutionError
-                raise ::Avm::Git::Launcher::Error
-              end
+              command(*args).send(exec_type)
+            rescue ::EacRubyUtils::Envs::ExecutionError
+              raise ::Avm::Git::Launcher::Error
             end
           end
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avm/scms/commit_info'
+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.4'
   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.4
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.67.1
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +70,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -124,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.7.0
 description: 
 email: 
 executables: []
@@ -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
@@ -225,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="