eac_tools 0.39.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d34a9bc1557787991919d4ec774433919c492c615358bbe55bbe39068f3cef
-  data.tar.gz: c8cf8dbc1417d808ca55a0651b160d2c013292fa073aab923a4f1b184b236a9e
+  metadata.gz: b4a759c572f8acfb951cb1952ae3b1b1800bac5dada73d1907e8e8e2df9fa9e5
+  data.tar.gz: 4c5804436ac869605af3be470557cee27131fbe0be2d6f2191f778210d7c60cd
 SHA512:
-  metadata.gz: 0d0fa178c202a85807f5d92d62931b2983e485e25b275ace4215220f864c4870f5503eea2c0ca11bbf3ca4f682c4a44c7e736d8aa2a969fc213742d4388f62bc
-  data.tar.gz: d8f84b5fd9025491c75d98c9e93d993dfe956facf8b8a868888fb81c8bf57fa63636f812b99f3a95ff2882b532ba5103ec56bd882740e6bcced10aea12f75388
+  metadata.gz: dbe1a9779ef9fa3a6d11c4d47bd47d9a5812d7af616669ff01a503233c563f15d64ca857b3536ea89e3b767d28c8ea13f56b0615c4183cf965729433bffd0310
+  data.tar.gz: a2f36c26ff611a47052fcf57a31a9644c408160ae27dc637d0ebdbd8c3477fe564dcc56bc7ce38076d3be7ef6e6a6619cd1aab7e70db4fe19b3da55e20dbff04

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.39.0)
-      avm (~> 0.53)
-      avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
+    eac_tools (0.41.0)
+      avm (~> 0.54)
+      avm-eac_asciidoctor_base0 (~> 0.9)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.3)
@@ -11,8 +11,8 @@ PATH
       avm-eac_rails_base1 (~> 0.7)
       avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.26, >= 0.26.1)
-      avm-eac_webapp_base0 (~> 0.12)
+      avm-eac_ruby_base1 (~> 0.26, >= 0.26.2)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
       avm-tools (~> 0.142, >= 0.142.4)
       eac_ruby_utils (~> 0.106, >= 0.106.1)
@@ -33,10 +33,10 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.7.1)
-      asciidoctor (~> 2.0, >= 2.0.17)
-      avm-eac_webapp_base0 (~> 0.9)
-      eac_ruby_utils (~> 0.104)
+    avm-eac_asciidoctor_base0 (0.9.0)
+      asciidoctor (~> 2.0, >= 2.0.18)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
+      eac_ruby_utils (~> 0.106, >= 0.106.1)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -108,20 +108,21 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.26.1)
-      avm (~> 0.52)
-      avm-eac_generic_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.106)
+    avm-eac_ruby_base1 (0.26.2)
+      avm (~> 0.54)
+      avm-eac_generic_base0 (~> 0.8)
+      eac_ruby_utils (~> 0.106, >= 0.106.1)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.12.0)
-      avm (~> 0.52)
-      avm-eac_generic_base0 (~> 0.7)
+    avm-eac_webapp_base0 (0.12.2)
+      avm (~> 0.54)
+      avm-eac_generic_base0 (~> 0.8)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.106)
+      avm-files (~> 0.6)
+      eac_ruby_utils (~> 0.106, >= 0.106.1)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -144,8 +145,8 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.9.0)
-      avm (~> 0.53)
+    avm-git (0.10.0)
+      avm (~> 0.54)
       avm-files (~> 0.6)
       eac_git (~> 0.13)
       eac_ruby_utils (~> 0.106, >= 0.106.1)
@@ -172,12 +173,12 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.53.0)
+    avm (0.54.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.5)
-      eac_fs (~> 0.12, >= 0.12.3)
+      eac_fs (~> 0.13)
       eac_git (~> 0.13)
       eac_ruby_utils (~> 0.106, >= 0.106.1)
       eac_templates (~> 0.3, >= 0.3.2)
@@ -210,10 +211,10 @@ PATH
 PATH
   remote: sub/eac_fs
   specs:
-    eac_fs (0.12.3)
-      content-type
-      eac_ruby_utils (~> 0.70)
-      ruby-filemagic
+    eac_fs (0.14.0)
+      content-type (~> 0.0, >= 0.0.2)
+      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      ruby-filemagic (~> 0.7, >= 0.7.3)
 
 PATH
   remote: sub/eac_git

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.5'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_fs', '~> 0.13'
   s.add_dependency 'eac_git', '~> 0.13'
   s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'

data/sub/avm/lib/avm/rspec/setup/source_generator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Rspec
+    module Setup
+      module SourceGenerator
+        DEFAULT_TARGET_BASENAME = 'generated_app'
+
+        # @return [Avm::Sources::Base]
+        def avm_source(stereotype_name, options = {})
+          options = options.dup
+          target_basename ||= options.delete(:target_basename) || DEFAULT_TARGET_BASENAME
+          target_path ||= options.delete(:target_path) || temp_dir.join(target_basename)
+          ::Avm::Registry.source_generators.detect(stereotype_name, target_path, options).perform
+          ::Avm::Registry.sources.detect(target_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/rspec/setup.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'avm/rspec/source_generator'
+require 'avm/rspec/setup/source_generator'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[avm_file_formats_with_fixtures entries_values in_avm_registry
-                    not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures avm_source_generated entries_values
+                    in_avm_registry not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples
         obj.rspec_config.include(::Avm::Rspec::Setup::Launcher)
-        obj.rspec_config.include(::Avm::Rspec::SourceGenerator)
+        obj.rspec_config.include(::Avm::Rspec::Setup::SourceGenerator)
       end
 
       def setup_examples

data/sub/avm/lib/avm/rspec/shared_examples/avm_source_generated.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_fs/comparator'
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_source_generated' do |spec_file, stereotype, options = {}|
+  fixtures_dir = ::Pathname.new('base_spec_files').expand_path(::File.dirname(spec_file))
+
+  fixtures_dir.children.select(&:directory?).each do |target_dir|
+    context "when target is \"#{target_dir.basename}\"" do
+      let(:source) { avm_source(stereotype, options.merge(target_basename: target_dir.basename)) }
+
+      it do
+        expect(fs_comparator.build(source.path)).to eq(fs_comparator.build(target_dir))
+      end
+    end
+  end
+
+  # @return [EacFs::Comparato]
+  def fs_comparator
+    ::EacFs::Comparator.new.rename_file('.gitignore', '_gitignore')
+  end
+end

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

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

data/sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec

@@ -12,11 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.17'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.18'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
   s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
   s.add_dependency 'rouge', '~> 3.30'
 
+  s.add_development_dependency 'eac_fs', '~> 0.14'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb

@@ -12,7 +12,7 @@ module Avm
           ::Avm::EacAsciidoctorBase0::Sources::Build.new(
             project,
             ::Avm::EacAsciidoctorBase0::Sources::Build::OPTION_TARGET_DIRECTORY => build_dir
-          ).run
+          ).perform
         end
 
         private

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_templates/core_ext'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        OPTIONS = {}.freeze
+
+        enable_speaker
+        enable_simple_cache
+
+        class << self
+          def option_list
+            OPTIONS.inject(super) { |a, e| a.option(*e) }
+          end
+        end
+
+        def perform
+          template.apply(self, target_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators.rb

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

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/base.rb

@@ -8,7 +8,13 @@ module Avm
   module EacAsciidoctorBase0
     module Sources
       class Base < ::Avm::EacWebappBase0::Sources::Base
-        MAIN_FILE_SUBPATH = ::Pathname.new('index.adoc')
+        CONTENT_DIRECTORY_SUBPATH = ::Pathname.new('content')
+        CONTENT_DOCUMENT_BASENAME = ::Pathname.new('body.adoc')
+        MAIN_FILE_SUBPATH = CONTENT_DIRECTORY_SUBPATH.join(CONTENT_DOCUMENT_BASENAME)
+
+        def content_directory
+          path.join(CONTENT_DIRECTORY_SUBPATH)
+        end
 
         def valid?
           path.join(MAIN_FILE_SUBPATH).file?

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/document.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'asciidoctor'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Sources
+      class Build
+        class Document
+          ROOT_BODY_TARGET_BASENAME = 'index'
+
+          enable_simple_cache
+          enable_speaker
+          common_constructor :build, :parent_document, :basename
+
+          # Absolute path to the Asciidoctor file.
+          #
+          # @return [Pathname]
+          def body_source_path
+            root_source_path.join(
+              ::Avm::EacAsciidoctorBase0::Sources::Base::CONTENT_DOCUMENT_BASENAME
+            )
+          end
+
+          # Absolute path to the output of Asciidoctor's source file.
+          #
+          # @return [Pathname]
+          def body_target_path
+            build.target_directory.join(
+              parent_document.present? ? subpath : ROOT_BODY_TARGET_BASENAME
+            ).basename_sub('.*') { |b| "#{b}.html" }
+          end
+
+          def mydebug
+            root_source_path.print_debug(title: 'Document')
+            children.count.print_debug(label: 'children.count')
+            body_source_path.print_debug(label: 'body_source')
+            body_source_path.file?.print_debug(label: 'body_source.file?')
+            body_target_path.print_debug(label: 'body_target')
+          end
+
+          def perform
+            perform_self
+            perform_children
+          end
+
+          def perform_self
+            infov 'Building', root_source_path
+            ::Asciidoctor.convert_file(
+              body_source_path.to_path,
+              to_file: body_target_path.to_path, safe: :unsafe, mkdirs: true
+            )
+          end
+
+          def perform_children
+            children.each(&:perform)
+          end
+
+          def tree_documents_count
+            children.inject(1) { |a, e| a + e.tree_documents_count }
+          end
+
+          # Absolute path to the document's source root.
+          #
+          # @return [Pathname]
+          def root_source_path
+            build.source.content_directory.join(subpath)
+          end
+
+          def subpath
+            parent_document.if_present('.'.to_pathname) { |pd| pd.subpath.join(basename) }
+          end
+
+          private
+
+          def children_uncached
+            root_source_path.children.select(&:directory?)
+                            .map { |path| self.class.new(build, self, path.basename) }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb

@@ -12,20 +12,24 @@ module Avm
         enable_simple_cache
         enable_listable
         lists.add_symbol :option, :target_directory
-        common_constructor :project, :options, default: [{}] do
+        common_constructor :source, :options, default: [{}] do
           self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
         end
 
         SOURCE_EXTNAMES = %w[.adoc .asc].freeze
 
-        def run
-          infov 'Files to build', source_files.count
+        def perform
+          infov 'Files to build', root_document.tree_documents_count
           target_directory.clear
-          source_files.each(&:run)
+          root_document.perform
         end
 
         def default_target_directory
-          project.path.join('build')
+          source.path.join('build')
+        end
+
+        def root_document
+          ::Avm::EacAsciidoctorBase0::Sources::Build::Document.new(self, nil, nil)
         end
 
         def target_directory
@@ -33,16 +37,6 @@ module Avm
             options[OPTION_TARGET_DIRECTORY] || default_target_directory
           )
         end
-
-        def source_files_uncached
-          r = []
-          project.path.children.each do |child|
-            next unless SOURCE_EXTNAMES.include?(child.extname)
-
-            r << ::Avm::EacAsciidoctorBase0::Sources::Build::File.new(self, child.basename)
-          end
-          r
-        end
       end
     end
   end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners/build.rb

@@ -17,7 +17,7 @@ module Avm
 
           def run
             start_banner
-            build.run
+            build.perform
             open
           end
 
@@ -40,7 +40,7 @@ module Avm
           end
 
           def open_path
-            build.source_files.first.target_path
+            build.root_document.body_target_path
           end
 
           def start_banner

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.7.1'
+    VERSION = '0.9.0'
   end
 end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/source_generators/base'
+require 'avm/source_generators/runner'
+
+RSpec.describe ::Avm::EacAsciidoctorBase0::SourceGenerators::Base do
+  include_examples 'avm_source_generated', __FILE__, 'EacAsciidoctorBase0'
+end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc

@@ -0,0 +1,9 @@
+= EacAsciidoctorBase0 Generated Source =
+
+== First Section
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sapien.
+
+== Second Section
+
+Nam faucibus quis dui at laoreet. Pellentesque ut sapien est.

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/sources/base'
+require 'avm/eac_asciidoctor_base0/sources/build'
+require 'eac_fs/comparator'
+
+::RSpec.describe ::Avm::EacAsciidoctorBase0::Sources::Build do
+  let(:fixtures_dir) { __dir__.to_pathname.join('build_spec_files') }
+  let(:fs_comparator) { ::EacFs::Comparator.new.truncate_file('*.html') }
+  let(:instance) { described_class.new(source) }
+  let(:source) { avm_source('EacAsciidoctorBase0') }
+  let(:target_dir) { fixtures_dir }
+  let(:main_document) do
+    source.path.join(::Avm::EacAsciidoctorBase0::Sources::Base::MAIN_FILE_SUBPATH)
+  end
+
+  before do
+    %w[doc1 doc2 doc2/doc2_1].each do |subpath|
+      target_dir = source.content_directory.join(subpath)
+      target_dir.mkpath
+      ::FileUtils.cp(
+        main_document,
+        target_dir.join(::Avm::EacAsciidoctorBase0::Sources::Base::CONTENT_DOCUMENT_BASENAME)
+      )
+    end
+    instance.perform
+  end
+
+  it do
+    expect(fs_comparator.build(instance.target_directory)).to eq(fs_comparator.build(target_dir))
+  end
+end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc1.html

@@ -0,0 +1 @@
+__TRUNCATED__

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc2/doc2_1.html

@@ -0,0 +1 @@
+__TRUNCATED__

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc2.html

@@ -0,0 +1 @@
+__TRUNCATED__

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/index.html

@@ -0,0 +1 @@
+__TRUNCATED__

data/sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb

@@ -2,3 +2,7 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+
+require 'eac_ruby_utils/speaker'
+require 'eac_ruby_utils/rspec/stub_speaker'
+::EacRubyUtils::Speaker.context.push(::EacRubyUtils::Rspec::StubSpeaker.new)

data/sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc

@@ -0,0 +1,9 @@
+= EacAsciidoctorBase0 Generated Source =
+
+== First Section
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sapien.
+
+== Second Section
+
+Nam faucibus quis dui at laoreet. Pellentesque ut sapien est.

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.52'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.26.1'
+    VERSION = '0.26.2'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb

@@ -4,59 +4,15 @@ require 'avm/eac_ruby_base1/source_generators/base'
 require 'avm/source_generators/runner'
 
 RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
-  let(:targets_root) { ::Pathname.new('base_spec_files').expand_path(__dir__) }
+  include_examples 'avm_source_generated', __FILE__, 'EacRubyBase1',
+                   {
+                     'eac-ruby-utils-version' => '0.35.0',
+                     'eac-ruby-gem-support-version' => '0.2.0'
+                   }
 
-  %w[mygem dashed-mygem].each do |gem_name|
-    context "when runner is executed for #{gem_name}" do
-      let(:stereotype) { 'EacRubyBase1' }
-      let(:target_dir) { targets_root.join(gem_name) }
-      let(:temp_dir) { ::EacRubyUtils::Fs::Temp.directory }
-      let(:gem_path) { temp_dir.join(gem_name) }
-      let(:argv) do
-        %w[--option eac-ruby-utils-version:0.35.0 --option eac-ruby-gem-support-version:0.2.0] +
-          [stereotype, gem_path.to_path]
-      end
+  alias_method :fs_comparator_super, :fs_comparator
 
-      before do
-        ::Avm::SourceGenerators::Runner.run(argv: argv)
-      end
-
-      after do
-        temp_dir.remove
-      end
-
-      it do
-        expect(directory_to_h(gem_path)).to eq(directory_to_h(target_dir))
-      end
-    end
-  end
-
-  def directory_to_h(dir)
-    dir.children.map do |child|
-      [fs_object_basename(child), fs_object_to_h(child)]
-    end.to_h
-  end
-
-  # @return [String]
-  def fs_object_basename(obj)
-    r = obj.basename.to_path
-    r = '.gitignore' if r == '_gitignore'
-    r
-  end
-
-  def fs_object_to_h(obj)
-    if obj.file?
-      file_to_h(obj)
-    elsif obj.directory?
-      directory_to_h(obj)
-    else
-      raise "Unknown filesystem object \"#{obj}\""
-    end
-  end
-
-  def file_to_h(file)
-    return "TRUNCATED\n" if file.basename.to_path == 'Gemfile.lock'
-
-    file.read
+  def fs_comparator
+    fs_comparator_super.truncate_file('Gemfile.lock')
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.52'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
+  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm-files', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/scm.rb

@@ -5,6 +5,8 @@ module Avm
     module Instances
       class Deploy
         module Scm
+          DEFAULT_REMOTE_NAME = 'origin'
+
           def commit_reference_uncached
             git_fetch
             r = git.rev_parse(git_reference_found)
@@ -35,7 +37,7 @@ module Avm
           end
 
           def git_remote_name
-            ::Avm::Git::DEFAULT_REMOTE_NAME
+            DEFAULT_REMOTE_NAME
           end
 
           def git_repository_path

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy.rb

@@ -2,7 +2,6 @@
 
 require 'active_support/callbacks'
 require 'avm/entries/jobs/base'
-require 'avm/git'
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/core_ext'
 require 'net/http'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.12.0'
+    VERSION = '0.12.2'
   end
 end

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.53'
+  s.add_dependency 'avm', '~> 0.54'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_git', '~> 0.13'
   s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

data/sub/avm-git/lib/avm/git.rb

@@ -5,7 +5,5 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Git
     require_sub __FILE__
-
-    DEFAULT_REMOTE_NAME = 'origin'
   end
 end

data/sub/eac_fs/eac_fs.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'content-type'
-  s.add_dependency 'eac_ruby_utils', '~> 0.70'
-  s.add_dependency 'ruby-filemagic'
+  s.add_dependency 'content-type', '~> 0.0', '>= 0.0.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'ruby-filemagic', '~> 0.7', '>= 0.7.3'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_fs/lib/eac_fs/comparator/build.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  class Comparator
+    class Build
+      TRUNCATE_FILE_CONTENT = "__TRUNCATED__\n"
+
+      enable_method_class
+      common_constructor :comparator, :root
+      delegate :rename_files, :truncate_files, to: :comparator
+
+      # @return [Hash]
+      def result
+        build(root)
+      end
+
+      private
+
+      def build(obj)
+        if obj.file?
+          build_file(obj)
+        elsif obj.directory?
+          build_directory(obj)
+        else
+          raise "Unknown filesystem object \"#{obj}\""
+        end
+      end
+
+      # @param dir [Pathname]
+      # @return [Hash]
+      def build_directory(dir)
+        dir.children.map do |child|
+          [fs_object_basename(child), build(child)]
+        end.to_h
+      end
+
+      # @param file [Pathname]
+      # @return [Hash]
+      def build_file(file)
+        truncate_file?(file) ? TRUNCATE_FILE_CONTENT : file.read
+      end
+
+      # @return [String]
+      def fs_object_basename(obj)
+        rename_files.inject(obj.basename.to_path) { |a, e| e.apply(a) }
+      end
+
+      def truncate_file?(file)
+        truncate_files.any? do |pattern|
+          file.basename.fnmatch?(pattern)
+        end
+      end
+    end
+  end
+end

data/sub/eac_fs/lib/eac_fs/comparator/rename_file.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  class Comparator
+    class RenameFile
+      common_constructor :from, :to
+
+      def apply(basename)
+        basename == from ? to : basename
+      end
+    end
+  end
+end

data/sub/eac_fs/lib/eac_fs/comparator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  class Comparator
+    require_sub __FILE__, require_dependency: true
+
+    enable_immutable
+    immutable_accessor :rename_file, :truncate_file, type: :array
+
+    alias rename_file_push rename_file
+
+    def rename_file(from, to)
+      rename_file_push(::EacFs::Comparator::RenameFile.new(from, to))
+    end
+  end
+end

data/sub/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.12.3'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.41.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.53'
+        version: '0.54'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.53'
+        version: '0.54'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +151,7 @@ dependencies:
         version: '0.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -167,7 +161,7 @@ dependencies:
         version: '0.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +169,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -182,6 +179,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -320,16 +320,26 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners/base.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/document.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners/build.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec.rb
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/base_spec.rb
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec.rb
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc1.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc2.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/doc2/doc2_1.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/build_spec_files/index.html
 - sub/avm-eac_asciidoctor_base0/spec/rubocop_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb
+- sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc
 - sub/avm-eac_generic_base0/Gemfile
 - sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
@@ -1044,11 +1054,12 @@ files:
 - sub/avm/lib/avm/rspec.rb
 - sub/avm/lib/avm/rspec/setup.rb
 - sub/avm/lib/avm/rspec/setup/launcher.rb
+- sub/avm/lib/avm/rspec/setup/source_generator.rb
 - sub/avm/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb
+- sub/avm/lib/avm/rspec/shared_examples/avm_source_generated.rb
 - sub/avm/lib/avm/rspec/shared_examples/entries_values.rb
 - sub/avm/lib/avm/rspec/shared_examples/in_avm_registry.rb
 - sub/avm/lib/avm/rspec/shared_examples/not_in_avm_registry.rb
-- sub/avm/lib/avm/rspec/source_generator.rb
 - sub/avm/lib/avm/runners/base.rb
 - sub/avm/lib/avm/scms/base.rb
 - sub/avm/lib/avm/scms/commit.rb
@@ -1223,6 +1234,9 @@ files:
 - sub/eac_fs/eac_fs.gemspec
 - sub/eac_fs/lib/eac_fs.rb
 - sub/eac_fs/lib/eac_fs/cached_download.rb
+- sub/eac_fs/lib/eac_fs/comparator.rb
+- sub/eac_fs/lib/eac_fs/comparator/build.rb
+- sub/eac_fs/lib/eac_fs/comparator/rename_file.rb
 - sub/eac_fs/lib/eac_fs/contexts.rb
 - sub/eac_fs/lib/eac_fs/file_info.rb
 - sub/eac_fs/lib/eac_fs/logs.rb

data/sub/avm/lib/avm/rspec/source_generator.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Rspec
-    module SourceGenerator
-      # @return [Avm::Sources::Base]
-      def avm_source(stereotype_name, options = {})
-        target_path ||= options.delete(:target_path) || temp_dir.join('generated_app')
-        ::Avm::Registry.source_generators.detect(stereotype_name, target_path, options).perform
-        ::Avm::Registry.sources.detect(target_path)
-      end
-    end
-  end
-end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'asciidoctor'
-
-module Avm
-  module EacAsciidoctorBase0
-    module Sources
-      class Build
-        class File
-          enable_speaker
-          common_constructor :build, :subpath
-
-          def run
-            infov 'Building', subpath
-            ::Asciidoctor.convert_file source_path.to_path,
-                                       to_file: target_path.to_path, safe: :unsafe, mkdirs: true
-          end
-
-          def source_path
-            build.project.path.join(subpath)
-          end
-
-          def target_path
-            build.target_directory.join(subpath).basename_sub('.*') { |b| "#{b}.html" }
-          end
-        end
-      end
-    end
-  end
-end