eac_tools 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a759c572f8acfb951cb1952ae3b1b1800bac5dada73d1907e8e8e2df9fa9e5
-  data.tar.gz: 4c5804436ac869605af3be470557cee27131fbe0be2d6f2191f778210d7c60cd
+  metadata.gz: 0cc7fffb0a2dc335ea8d9bb791d3aac22b783dbf2556d7812ece97708fee0be9
+  data.tar.gz: 23081d70c8762bca09ee9389b361f3b0fed45f30a09c7649f9caaf28948559f3
 SHA512:
-  metadata.gz: dbe1a9779ef9fa3a6d11c4d47bd47d9a5812d7af616669ff01a503233c563f15d64ca857b3536ea89e3b767d28c8ea13f56b0615c4183cf965729433bffd0310
-  data.tar.gz: a2f36c26ff611a47052fcf57a31a9644c408160ae27dc637d0ebdbd8c3477fe564dcc56bc7ce38076d3be7ef6e6a6619cd1aab7e70db4fe19b3da55e20dbff04
+  metadata.gz: 10510fc8717ce648a96da24ca0796ac2bc0f4b57424dc7efad470b86cd71585b3fbf8dd9df03818a6b4f2d739accc8f7758925d65f9bbfdf04dec360bf82fca4
+  data.tar.gz: 17442df47bb3b1944d1ce2a4b0b976aaf36edb54e6c13aad74655fc32295159caa5e31835a08b2853ea63b4db2f5311f6823af588ec2b649ca3d27f4a1dd0ea0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.41.0)
-      avm (~> 0.54)
-      avm-eac_asciidoctor_base0 (~> 0.9)
+    eac_tools (0.42.0)
+      avm (~> 0.55)
+      avm-eac_asciidoctor_base0 (~> 0.10)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.3)
@@ -11,11 +11,11 @@ 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.2)
+      avm-eac_ruby_base1 (~> 0.27)
       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)
+      eac_ruby_utils (~> 0.107)
 
 PATH
   remote: sub/aranha-parsers
@@ -33,10 +33,10 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.9.0)
+    avm-eac_asciidoctor_base0 (0.10.0)
       asciidoctor (~> 2.0, >= 2.0.18)
       avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_ruby_utils (~> 0.107)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -108,10 +108,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.26.2)
-      avm (~> 0.54)
+    avm-eac_ruby_base1 (0.27.0)
+      avm (~> 0.55)
       avm-eac_generic_base0 (~> 0.8)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_ruby_utils (~> 0.107)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -173,14 +173,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.54.0)
+    avm (0.55.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.28)
-      eac_config (~> 0.11, >= 0.11.1)
+      eac_cli (~> 0.29)
+      eac_config (~> 0.12)
       eac_docker (~> 0.5)
-      eac_fs (~> 0.13)
+      eac_fs (~> 0.14)
       eac_git (~> 0.13)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_ruby_utils (~> 0.107)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -189,17 +189,17 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.28.0)
+    eac_cli (0.29.0)
       colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.11, >= 0.11.1)
-      eac_ruby_utils (~> 0.103)
+      eac_config (~> 0.12)
+      eac_ruby_utils (~> 0.107)
 
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.11.1)
-      addressable (~> 2.8)
-      eac_ruby_utils (~> 0.102)
+    eac_config (0.12.0)
+      addressable (~> 2.8, >= 2.8.1)
+      eac_ruby_utils (~> 0.107)
 
 PATH
   remote: sub/eac_docker
@@ -235,7 +235,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.106.1)
+    eac_ruby_utils (0.107.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -370,7 +370,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.4)
     zlib (2.1.1)
 
 PLATFORMS

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'eac_cli', '~> 0.28'
-  s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
+  s.add_dependency 'eac_cli', '~> 0.29'
+  s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.5'
-  s.add_dependency 'eac_fs', '~> 0.13'
+  s.add_dependency 'eac_fs', '~> 0.14'
   s.add_dependency 'eac_git', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107'
   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/applications/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/entries/base'
+require 'avm/instances/ids'
 require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
@@ -22,23 +23,43 @@ module Avm
       end
 
       def instance(suffix)
-        ::Avm::Instances::Base.new(self, suffix)
+        stereotype.instance_class.new(self, suffix)
       end
 
       def name
         entry(::Avm::Instances::EntryKeys::NAME).read
       end
 
+      # @return [String]
+      def local_instance_id
+        ::Avm::Instances::Ids.build(id, local_instance_suffix)
+      end
+
+      # @return [Pathname]
+      def local_source_path
+        local_source_path_entry.value!.to_pathname
+      end
+
+      # @return [EacConfig::Entry]
+      def local_source_path_entry
+        ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
+      end
+
+      # @return [String]
+      def local_instance_suffix
+        LOCAL_INSTANCE_SUFFIX
+      end
+
       private
 
       # @return [Avm::Instances::Base]
       def local_instance_uncached
-        instance(LOCAL_INSTANCE_SUFFIX)
+        instance(local_instance_suffix)
       end
 
       # @return [Avm::Sources::Base]
       def local_source_uncached
-        ::Avm::Registry.sources.detect(local_instance.install_path)
+        ::Avm::Registry.sources.detect(local_source_path)
       end
     end
   end

data/sub/avm/lib/avm/entries/entry.rb

@@ -46,6 +46,11 @@ module Avm
         optional_value || read
       end
 
+      def value!
+        optional_value.if_present { |v| return v }
+        context_entry.value!
+      end
+
       def write(value)
         context_entry.value = value
       end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/ids'
 require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
@@ -23,18 +24,9 @@ module Avm
 
       class << self
         def by_id(id)
-          application_id, suffix = parse_id(id)
+          parsed_id = ::Avm::Instances::Ids.parse!(id)
           require 'avm/applications/base'
-          new(::Avm::Applications::Base.new(application_id), suffix)
-        end
-
-        private
-
-        def parse_id(id)
-          m = ID_PATTERN.match(id)
-          return [m[1], m[2]] if m
-
-          raise "ID Pattern no matched: \"#{id}\""
+          new(::Avm::Applications::Base.new(parsed_id.application_id), parsed_id.instance_suffix)
         end
       end
 
@@ -42,8 +34,9 @@ module Avm
         self.suffix = suffix.to_s
       end
 
+      # @return [String]
       def id
-        "#{application.id}_#{suffix}"
+        ::Avm::Instances::Ids.build(application.id, suffix)
       end
 
       def to_s

data/sub/avm/lib/avm/instances/ids.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Ids
+      ID_PARTS_SEPARATOR = '_'
+      ID_PATTERN = /\A([a-z0-9]+(?:\-[a-z0-9]+)*)_(.+)\z/.freeze
+      ID_PARSER = ID_PATTERN.to_parser do |m|
+        ::Struct.new(:application_id, :instance_suffix).new(m[1], m[2])
+      end
+
+      class << self
+        # @param application_id [String]
+        # @param instance_suffix [String]
+        # @return [String]
+        def build(application_id, instance_suffix)
+          [application_id, instance_suffix].join(ID_PARTS_SEPARATOR)
+        end
+
+        # @param id [String]
+        # @return [String]
+        def parse!(id)
+          ID_PARSER.parse!(id)
+        end
+      end
+    end
+  end
+end

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

@@ -21,6 +21,14 @@ module Avm
           require "avm/rspec/shared_examples/#{example}"
         end
       end
+
+      # @return [self]
+      def stub_avm_contexts
+        stub_eac_config_node
+        stub_eac_speaker
+
+        self
+      end
     end
   end
 end

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

@@ -7,20 +7,8 @@ module Avm
   module Sources
     class Base
       module Instance
-        DEFAULT_INSTANCE_SUFFIX = 'dev'
-
-        def instance_suffix
-          DEFAULT_INSTANCE_SUFFIX
-        end
-
-        private
-
-        def application_uncached
-          ::Avm::Applications::Base.new(path.basename)
-        end
-
-        def instance_uncached
-          ::Avm::Instances::Base.new(application, DEFAULT_INSTANCE_SUFFIX)
+        def instance
+          application.local_instance
         end
       end
     end

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

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

data/sub/avm/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__)).stub_avm_contexts

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

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   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 'eac_ruby_utils', '~> 0.107'
   s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
   s.add_dependency 'rouge', '~> 3.30'
 

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

@@ -10,6 +10,24 @@ module Avm
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
         FILES_UNITS = {}.freeze
+        AUTHOR_EMAIL_ENTRY_PATH = 'install.email'
+        AUTHOR_NAME_ENTRY_PATH = 'install.name'
+        AUTHOR_NAME_INITIALS_ENTRY_PATH = 'install.name_initials'
+
+        # @return [String]
+        def author_email
+          entry(AUTHOR_EMAIL_ENTRY_PATH).value!
+        end
+
+        # @return [String]
+        def author_name
+          entry(AUTHOR_NAME_ENTRY_PATH).value!
+        end
+
+        # @return [String]
+        def author_name_initials
+          entry(AUTHOR_NAME_INITIALS_ENTRY_PATH).value!
+        end
       end
     end
   end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_macro_value.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          class HeaderMacroValue
+            enable_method_class
+            enable_settings_provider
+            enable_simple_cache
+            common_constructor :document
+
+            delegate :build, to: :document
+            delegate :instance, to: :build
+            delegate :author_email, :author_name, to: :instance
+
+            ATTRIBUTES = ['Author Initials', 'toc', 'icons', 'numbered', 'website'].freeze
+            TOC = 'left'
+            ICONS = ''
+            NUMBERED = ''
+
+            def attributes_lines
+              ATTRIBUTES.map do |attr|
+                [":#{attr}:", attribute_value(attr)].reject(&:blank?).join(' ')
+              end
+            end
+
+            def attribute_value(attr)
+              setting_value(attr.variableize)
+            end
+
+            def author_initials
+              instance.author_name_initials
+            end
+
+            def author_line
+              "#{author_name} <#{author_email}>"
+            end
+
+            def result
+              result_lines.join("\n")
+            end
+
+            def result_lines
+              [author_line] + attributes_lines
+            end
+
+            def website
+              instance.web_url
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          class PreProcessLine
+            enable_method_class
+            enable_simple_cache
+
+            MACRO_PARSER = %r{\A\s*//\#(\S+.*)}.to_parser do |m|
+              m[1]
+            end
+
+            common_constructor :document, :line
+
+            def result
+              if macro?
+                macro_value
+              else
+                line
+              end
+            end
+
+            def macro?
+              macro_name.present?
+            end
+
+            def macro_parser
+              MACRO_PARSER
+            end
+
+            def macro_value
+              document.send("#{macro_name}_macro_value")
+            end
+
+            private
+
+            def macro_name_uncached
+              macro_parser.parse(line)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/{sources → instances}/build/document.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 require 'asciidoctor'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacAsciidoctorBase0
-    module Sources
+    module Instances
       class Build
         class Document
+          require_sub __FILE__
+
           ROOT_BODY_TARGET_BASENAME = 'index'
 
           enable_simple_cache
@@ -31,14 +34,6 @@ module Avm
             ).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
@@ -46,8 +41,8 @@ module Avm
 
           def perform_self
             infov 'Building', root_source_path
-            ::Asciidoctor.convert_file(
-              body_source_path.to_path,
+            ::Asciidoctor.convert(
+              pre_processed_body_source_content,
               to_file: body_target_path.to_path, safe: :unsafe, mkdirs: true
             )
           end
@@ -56,6 +51,11 @@ module Avm
             children.each(&:perform)
           end
 
+          # @return [String]
+          def pre_processed_body_source_content
+            body_source_path.read.each_line.map { |line| pre_process_line(line.rstrip) + "\n" }.join
+          end
+
           def tree_documents_count
             children.inject(1) { |a, e| a + e.tree_documents_count }
           end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/{sources → instances}/build.rb

@@ -5,14 +5,14 @@ require 'eac_ruby_utils/fs/clearable_directory'
 
 module Avm
   module EacAsciidoctorBase0
-    module Sources
+    module Instances
       class Build
         require_sub __FILE__
         enable_speaker
         enable_simple_cache
         enable_listable
         lists.add_symbol :option, :target_directory
-        common_constructor :source, :options, default: [{}] do
+        common_constructor :instance, :options, default: [{}] do
           self.options = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
         end
 
@@ -29,7 +29,12 @@ module Avm
         end
 
         def root_document
-          ::Avm::EacAsciidoctorBase0::Sources::Build::Document.new(self, nil, nil)
+          ::Avm::EacAsciidoctorBase0::Instances::Build::Document.new(self, nil, nil)
+        end
+
+        # @return [Avm::EacAsciidoctorBase0::Sources::Base]
+        def source
+          instance.application.local_source
         end
 
         def target_directory

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

@@ -2,16 +2,16 @@
 
 require 'avm/eac_webapp_base0/instances/deploy'
 require 'avm/eac_asciidoctor_base0/sources/base'
-require 'avm/eac_asciidoctor_base0/sources/build'
+require 'avm/eac_asciidoctor_base0/instances/build'
 
 module Avm
   module EacAsciidoctorBase0
     module Instances
       class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
         def build_content
-          ::Avm::EacAsciidoctorBase0::Sources::Build.new(
+          ::Avm::EacAsciidoctorBase0::Instances::Build.new(
             project,
-            ::Avm::EacAsciidoctorBase0::Sources::Build::OPTION_TARGET_DIRECTORY => build_dir
+            ::Avm::EacAsciidoctorBase0::Instances::Build::OPTION_TARGET_DIRECTORY => build_dir
           ).perform
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_asciidoctor_base0/sources/build'
+require 'avm/eac_asciidoctor_base0/instances/build'
 require 'eac_cli/core_ext'
 require 'os'
 
@@ -24,8 +24,10 @@ module Avm
           private
 
           def build_uncached
-            ::Avm::EacAsciidoctorBase0::Sources::Build.new(runner_context.call(:source),
-                                                           target_directory: parsed.target_dir)
+            ::Avm::EacAsciidoctorBase0::Instances::Build.new(
+              runner_context.call(:source).instance,
+              target_directory: parsed.target_dir
+            )
           end
 
           def default_target_directory

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

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

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/sources/base'
+require 'avm/eac_asciidoctor_base0/instances/build'
+
+::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build::Document do
+  let(:application) { ::Avm::Applications::Base.new('myapp') }
+  let(:application_instance) do
+    ::Avm::EacAsciidoctorBase0::Instances::Base
+      .new(application, 'stub')
+  end
+  let(:build) { ::Avm::EacAsciidoctorBase0::Instances::Build.new(application_instance) }
+  let(:fixtures_dir) { __dir__.to_pathname.join('document_spec_files') }
+  let(:instance) { build.root_document }
+  let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
+  let(:target_file) { fixtures_dir.join('pre_processed_root_body.adoc') }
+
+  before do
+    application.entry('stereotype').write('EacAsciidoctorBase0')
+    ::EacConfig::Node.context.current.entry("#{application.id}_dev.install.path")
+                     .value = source.path.to_path
+    application_instance.entry('install.path').write(source.path.to_path)
+    application_instance.entry('install.name').write('The Author')
+    application_instance.entry('install.name_initials').write('T.A.')
+    application_instance.entry('install.email').write('theauthor@example.net')
+    application_instance.entry('web.url').write('https://www.example.net')
+  end
+
+  it do
+    expect(instance.pre_processed_body_source_content).to eq(target_file.read)
+  end
+end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec_files/pre_processed_root_body.adoc

@@ -0,0 +1,15 @@
+= EacAsciidoctorBase0 Generated Source =
+The Author <theauthor@example.net>
+:Author Initials: T.A.
+:toc: left
+:icons:
+:numbered:
+:website: https://www.example.net
+
+== First Section
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sapien.
+
+== Second Section
+
+Nam faucibus quis dui at laoreet. Pellentesque ut sapien est.