eac_tools 0.54.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6e9611db77983e7a2e2c85a80c76b1f862a1f1995a787396bb162819379e54
-  data.tar.gz: 11b3d60caf8f8cac1ada36e41cf280f01ea7ac6b37e79284193ff09f9a06bbf8
+  metadata.gz: ae856818c701f2192ec09610cac0d471e150e435c7700028e93f2b3e511e49f5
+  data.tar.gz: 9214f069183c0b48d954c883e3a1f2e0f59d7a3227c1089b4315c70464a9028f
 SHA512:
-  metadata.gz: 073ba61cf82fc77a0676ea984e82840d661cd70ccac1faa1af088f1758ecfe9f895aefca5603ed107fe109d9aa3fbf2c0606b954e321994af7cc8d977169e8fb
-  data.tar.gz: 78cfcc7f331d552ec6e541d752d4d21e87c8eee70083f0257118564987d0dec0eb83849f3c5666439a1223baa2d012f85b2ace8fb751d4da32b8a80734c23e45
+  metadata.gz: b0b1c879ce8f91b853f1677f217c2e4c89f63a63de8a3525e9ce422a47a819a94cd83aee66d4edbc8d8a8ada4b7f153098eb2f365bd4a5e3e304d6bc7c4a1f45
+  data.tar.gz: 4b8ec43cea4942df3538d83fa40627d53e668066d6961d4b3bf1a26c2f2a0922890b3d846f56e501d64c0fb81e1e11e727b6f347a613886d442c52fcedd399c8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.54.0)
-      avm (~> 0.61)
+    eac_tools (0.55.0)
+      avm (~> 0.62)
       avm-eac_asciidoctor_base0 (~> 0.15)
       avm-eac_generic_base0 (~> 0.10)
       avm-eac_latex_base0 (~> 0.3)
@@ -16,8 +16,8 @@ PATH
       avm-eac_ruby_base1 (~> 0.29)
       avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
       avm-eac_wordpress_base0 (~> 0.3)
-      avm-tools (~> 0.144)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      avm-tools (~> 0.145)
+      eac_ruby_utils (~> 0.111)
 
 PATH
   remote: sub/aranha-parsers
@@ -173,9 +173,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.144.0)
+    avm-tools (0.145.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.61)
+      avm (~> 0.62)
       avm-eac_ruby_base1 (~> 0.29)
       avm-eac_ubuntu_base0 (~> 0.4)
       avm-files (~> 0.6)
@@ -191,14 +191,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.61.0)
+    avm (0.62.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.16)
       eac_git (~> 0.14)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      eac_ruby_utils (~> 0.111)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -253,7 +253,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.110.1)
+    eac_ruby_utils (0.111.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.111'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

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

@@ -14,7 +14,7 @@ module Avm
         end
 
         def class_name
-          file_format.file_resource_name(path)
+          file_format.file_resource_name(relative_path)
         end
 
         def commit_message

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module AutoCommit
+      class ForFile
+        common_constructor :source, :path, :rules
+
+        delegate :run, to: :scm_auto_commit
+
+        # @return [Pathname]
+        def path_for_auto_commit
+          path.relative_path_from(source_for_auto_commit.path)
+        end
+
+        # @return [Avm::Scms::AutoCommit::ForFile]
+        def scm_auto_commit
+          ::Avm::Scms::AutoCommit::ForFile.new(source_for_auto_commit.scm, path_for_auto_commit,
+                                               rules)
+        end
+
+        # @return [Avm::Sources::Base]
+        def source_for_auto_commit
+          source.sub_for_path(path) || source
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/auto_commit.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module AutoCommit
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/subs.rb

@@ -12,6 +12,11 @@ module Avm
         SUBS_EXCLUDE_PATHS_DEFAULT = [].freeze
         SUBS_INCLUDE_PATHS_DEFAULT = ['sub/*'].freeze
 
+        # @return [Avm::Sources::Base, nil]
+        def sub_for_path(path)
+          subs.lazy.map { |sub| path.expand_path.child_of?(sub.path) ? sub : nil }.find(&:present?)
+        end
+
         # @return [Enumerable<Avm::Sources::Base>]
         def subs
           subs_paths_to_search

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

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

data/sub/avm-tools/avm-tools.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'avm', '~> 0.61'
+  s.add_dependency 'avm', '~> 0.62'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.29'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_dependency 'avm-files', '~> 0.6'

data/sub/avm-tools/lib/avm/tools/runner/source/auto_commit.rb

@@ -2,8 +2,8 @@
 
 require 'eac_cli/core_ext'
 require 'avm/file_formats/search_formatter'
-require 'avm/scms/auto_commit/for_file'
 require 'avm/scms/auto_commit/rules'
+require 'avm/sources/auto_commit/for_file'
 
 module Avm
   module Tools
@@ -21,7 +21,7 @@ module Avm
           def run
             format_files
             files.each do |file|
-              ::Avm::Scms::AutoCommit::ForFile.new(runner_context.call(:source).scm, file, rules)
+              ::Avm::Sources::AutoCommit::ForFile.new(runner_context.call(:source), file, rules)
                 .run
             end
           end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.144.0'
+    VERSION = '0.145.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/child_of.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+class Pathname
+  # Indicate if +self+ is child of +parent_path+.
+  #
+  # @return [Boolean]
+  def child_of?(parent_path)
+    self_parts = expand_path.each_filename.to_a
+    parent_parts = parent_path.expand_path.each_filename.to_a
+    return false if self_parts == parent_parts
+
+    parent_parts.zip(self_parts).all? { |x, y| x == y }
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.110.1'
+  VERSION = '0.111.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/child_of_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/pathname/child_of'
+
+RSpec.describe ::Pathname do
+  describe 'child_of?' do
+    [
+      ['/foo/bar/baz', '/foo/bar', true],
+      ['/foo/../foo/bar/../bar/baz', '/foo/bar', true],
+      ['/foo/bar/baz', '/foo/../foo/bar/../bar', true],
+      ['/foo/bar/baz', '/boink', false],
+      ['/foo/bar/../not_bar/baz', '/foo/bar', false],
+      ['/foo/bar/../bar_not/baz', '/foo/bar', false],
+      ['/foo', '/foo/bar', false],
+      ['/foo', '/bar', false],
+      ['/foo', '/foo', false]
+    ].each do |test_values|
+      child_path, parent_path, expected_value = test_values
+      context "when child=\"#{child_path}\" and parent=\"#{parent_path}\"" do
+        it do
+          expect(Pathname(child_path).child_of?(Pathname(parent_path))).to be(expected_value)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.55.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.62'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.61'
+        version: '0.62'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -236,34 +236,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.144'
+        version: '0.145'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.144'
+        version: '0.145'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.111'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.110'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.110.1
+        version: '0.111'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -1176,6 +1170,8 @@ files:
 - sub/avm/lib/avm/source_generators/option_list.rb
 - sub/avm/lib/avm/source_generators/runner.rb
 - sub/avm/lib/avm/sources.rb
+- sub/avm/lib/avm/sources/auto_commit.rb
+- sub/avm/lib/avm/sources/auto_commit/for_file.rb
 - sub/avm/lib/avm/sources/base.rb
 - sub/avm/lib/avm/sources/base/application.rb
 - sub/avm/lib/avm/sources/base/configuration.rb
@@ -1761,6 +1757,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/assert_parent.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_noext.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/child_of.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/if_exist.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/mkpath_s.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/parent_n.rb
@@ -1848,6 +1845,7 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/assert_parent_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_noext_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_sub_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/child_of_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/parent_n_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/string/delimited_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/recursive_builder_spec.rb