eac_tools 0.67.0 → 0.67.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eaf414401edd6cd32a363aa20ae12bfd3641bfc0c11d8007911f0dfce9738e0
-  data.tar.gz: 56e6df8b4ac42ed7f10cf7b3121d17cc825ce3c4a8e46018101f2ce71316f654
+  metadata.gz: '0650351188a8e6d37ba2f6de9f72aaafea66701164cd576ada4fb32ffaba32cc'
+  data.tar.gz: 748edc307ad72537a3bbfa167e537fcf9747f44b1ed49b71e58e24fa470de65b
 SHA512:
-  metadata.gz: c24f42e05720c894b99c1757654fe045ce0f306f2e2f4c5ef4fdc9477f048aa227e5d4e58c6a1d97ff90ebeede013c331152fbfa354def48591cb6b213a47ab0
-  data.tar.gz: fd0260cb92aee69652efbab55ef85f73ab6b442966d8aeaf0a09b522db6a6dd59dd5a39c6490255878f24c801c1f9557888017c75b6ec66bc2f4ee9f045f41c2
+  metadata.gz: e08048e32da53d1cb6a81053e9412661102a9d1fdb2e2f9370a6a783b4a0e09b3edfa0cb96a79b452578bfed7ab443ee61f89208b786a600ec3679be0247e224
+  data.tar.gz: f5e0fa874e7a5c6992a0f7a0fac38ed3c85a0b2005857eaabf22ec3faab481d3852e8f971d5b0415c474a1ca704878f62341366f4bcf15bcc0820f0891bed9b4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.67.0)
-      avm (~> 0.73)
+    eac_tools (0.67.1)
+      avm (~> 0.73, >= 0.73.1)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -16,7 +16,7 @@ PATH
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       avm-eac_webapp_base0 (~> 0.17, >= 0.17.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
-      avm-git (~> 0.13, >= 0.13.2)
+      avm-git (~> 0.13, >= 0.13.3)
       avm-tools (~> 0.149)
       eac_ruby_utils (~> 0.117)
 
@@ -164,11 +164,11 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.2)
-      avm (~> 0.67, >= 0.67.1)
+    avm-git (0.13.3)
+      avm (~> 0.73, >= 0.73.1)
       avm-files (~> 0.6, >= 0.6.2)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.117)
       git (~> 1.18)
 
 PATH
@@ -192,7 +192,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.73.0)
+    avm (0.73.1)
       aranha-parsers (~> 0.18)
       eac_cli (~> 0.35)
       eac_config (~> 0.12)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.67.0'
+  VERSION = '0.67.1'
 end

data/sub/avm/lib/avm/instances/base/subcommand_parent.rb

@@ -7,15 +7,15 @@ module Avm
   module Instances
     class Base
       class SubcommandParent
+        include ::EacCli::Runner
         enable_simple_cache
-        common_constructor :instance
+        common_constructor :instance do
+          self.runner_context = ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+        for_context :instance
 
         private
 
-        def runner_context_uncached
-          ::EacCli::Runner::Context.new(self, argv: runner_argv)
-        end
-
         def runner_argv
           [instance.class.name.split('::')[-2].dasherize, instance.id]
         end

data/sub/avm/lib/avm/scms/auto_commit/for_file.rb

@@ -28,6 +28,11 @@ module Avm
 
         private
 
+        # @return [Boolean]
+        def changed?
+          scm.changed_files.any? { |cf| cf.path == scm_relative_path }
+        end
+
         def commit_info_uncached
           rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
             .if_present { |v| v.path(path) }
@@ -42,8 +47,13 @@ module Avm
           return false if commit_info.blank?
 
           infov '  Commit info', commit_info
-          scm.run_commit(commit_info)
-          success '  Commited'
+          if changed?
+            scm.run_commit(commit_info)
+            success '  Commited'
+          else
+            warn "  File \"#{path}\" unchanged"
+          end
+
           true
         end
 

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.73.0'
+  VERSION = '0.73.1'
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'avm', '~> 0.73', '>= 0.73.1'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
   s.add_dependency 'git', '~> 1.18'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/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/sub/avm-git/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/sub/avm-git/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/sub/avm-git/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/sub/avm-git/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/sub/avm-git/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/sub/avm-git/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: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.67.0
+  version: 0.67.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.73'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.73.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.73'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.73.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +281,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -285,7 +291,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -998,11 +1004,13 @@ files:
 - sub/avm-git/lib/avm/git/scms/git/commit.rb
 - sub/avm-git/lib/avm/git/scms/git/commit/deploy.rb
 - sub/avm-git/lib/avm/git/scms/git/commit/deploy_methods.rb
+- sub/avm-git/lib/avm/git/scms/git/commit_dirty.rb
 - sub/avm-git/lib/avm/git/scms/git/commits.rb
 - sub/avm-git/lib/avm/git/scms/git/interval.rb
 - sub/avm-git/lib/avm/git/scms/git/milestones.rb
 - sub/avm-git/lib/avm/git/scms/git/run_commit.rb
 - sub/avm-git/lib/avm/git/scms/git_sub_base.rb
+- sub/avm-git/lib/avm/git/scms/git_sub_base/changed_file.rb
 - sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb
 - sub/avm-git/lib/avm/git/scms/git_sub_base/interval.rb
 - sub/avm-git/lib/avm/git/scms/git_subrepo.rb