eac_tools 0.86.12 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87d471c6fc124da8d27fc58453ae3bd6782de5fbe705bce665eb1cdc6e5caecc
-  data.tar.gz: dc76e1b94a0d7e1fb51c237d459ed2e2dddfbc591fa03850d6696beb40b4b1ed
+  metadata.gz: 94899940f6ea8c9bf26e6f0227db84e8add50935112b3ce90ad5128c3daa9a9c
+  data.tar.gz: d41cc081b23be785cb6873b3c780445e759965f84ee2cdd40428d34743ce68c6
 SHA512:
-  metadata.gz: 3b615dcbea89c0e7122796520cc7779184e470f36c59bc88ad23738220f7e8df2edc006b5a34fd345d4993614388f70569ffb9df0da63b705ca6415b7e3c7ac3
-  data.tar.gz: 8a96ea51c8c4da6f46a4df2382a6a398d4a46d0ccf025159c86e897d1f630602681875187827d89c7b3bdeb2ec0e6df359c29d1411a5ef57cb158b61670f9eb0
+  metadata.gz: e8c11bc5596794f47b116d368895b81fa9cdc1ef5e48fdb2582ecf0e74e15b7857f0acebf4f5a7d2cc72b29758d8859f8e605f2b2802a13b04a4f9096dcf6be4
+  data.tar.gz: 7a33d024b4a95a939437f580ed4c28d22240ac95ba44289017bf7ff7dacc42715038f52a67c80577c4e38ff45082b9698d3a907fe29bceb4d42b466a78278e09

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.86.12)
-      avm (~> 0.89)
-      avm-eac_asciidoctor_base0 (~> 0.22)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
+    eac_tools (0.87.0)
+      avm (~> 0.90)
+      avm-eac_asciidoctor_base0 (~> 0.22, >= 0.22.1)
+      avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.2)
@@ -16,16 +16,45 @@ PATH
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.1)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
+      avm-eac_webapp_base0 (~> 0.19)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.17)
       avm-tools (~> 0.161)
       eac_ruby_utils (~> 0.121)
 
+PATH
+  remote: sub/avm-eac_asciidoctor_base0
+  specs:
+    avm-eac_asciidoctor_base0 (0.22.1)
+      asciidoctor (~> 2.0, >= 2.0.22)
+      avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
+      eac_ruby_utils (~> 0.121)
+      os (~> 1.1, >= 1.1.4)
+      rouge (~> 3.30)
+
+PATH
+  remote: sub/avm-eac_generic_base0
+  specs:
+    avm-eac_generic_base0 (0.13.0)
+      avm (~> 0.90)
+      eac_ruby_utils (~> 0.121)
+
+PATH
+  remote: sub/avm-eac_webapp_base0
+  specs:
+    avm-eac_webapp_base0 (0.19.0)
+      avm (~> 0.90)
+      avm-eac_generic_base0 (~> 0.13)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      avm-files (~> 0.7)
+      eac_ruby_utils (~> 0.121)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
+
 PATH
   remote: sub/avm
   specs:
-    avm (0.89.0)
+    avm (0.90.0)
       eac_cli (~> 0.40, >= 0.40.1)
       eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
@@ -55,15 +84,6 @@ GEM
       ofx-parser (~> 1.1)
     asciidoctor (2.0.22)
     ast (2.4.2)
-    avm-eac_asciidoctor_base0 (0.22.0)
-      asciidoctor (~> 2.0, >= 2.0.20)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
-      eac_ruby_utils (~> 0.121)
-      os (~> 1.1, >= 1.1.4)
-      rouge (~> 3.30)
-    avm-eac_generic_base0 (0.12.2)
-      avm (~> 0.84, >= 0.84.2)
-      eac_ruby_utils (~> 0.120)
     avm-eac_github_base0 (0.3.0)
       avm (~> 0.82)
       avm-git (~> 0.14)
@@ -116,14 +136,6 @@ GEM
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
-    avm-eac_webapp_base0 (0.18.4)
-      avm (~> 0.86, >= 0.86.2)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
-      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
-      avm-eac_ubuntu_base0 (~> 0.5)
-      avm-files (~> 0.7)
-      eac_ruby_utils (~> 0.121)
-      htmlbeautifier (~> 1.4, >= 1.4.3)
     avm-eac_wordpress_base0 (0.3.2)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
@@ -145,7 +157,7 @@ GEM
       clipboard (~> 1.3, >= 1.3.6)
       eac_ruby_base0 (~> 0.19)
     base64 (0.2.0)
-    clipboard (1.3.6)
+    clipboard (1.4.1)
     colorize (0.8.1)
     concurrent-ruby (1.2.3)
     content-type (0.0.2)
@@ -224,7 +236,7 @@ GEM
     htmlbeautifier (1.4.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
     minitest (5.22.3)
@@ -243,7 +255,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
     rack (3.0.10)
     rainbow (3.1.1)
@@ -264,7 +276,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -286,7 +298,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.28.0)
+    rubocop-rspec (2.29.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -319,6 +331,9 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
+  avm-eac_asciidoctor_base0!
+  avm-eac_generic_base0!
+  avm-eac_webapp_base0!
   eac_ruby_gem_support (~> 0.10)
   eac_tools!
 

data/lib/eac_tools/version.rb

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

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

@@ -45,6 +45,11 @@ module Avm
         "#{self.class}[#{path}]"
       end
 
+      # @return [Avm::VersionNumber, nil]
+      def version
+        raise_abstract __method__, 'Should return a Avm::VersionNumber or nil'
+      end
+
       private
 
       # @return [Avm::Scms::Base]

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

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

data/sub/avm-eac_asciidoctor_base0/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_asciidoctor_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_asciidoctor_base0'
+  s.version     = Avm::EacAsciidoctorBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*', 'template/avm/eac_asciidoctor_base0/instances/deploy/.keep']
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.22'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.18', '>= 0.18.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.121'
+  s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
+  s.add_dependency 'rouge', '~> 3.30'
+
+  s.add_development_dependency 'eac_fs', '~> 0.16'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.9'
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/recursive_builder'
+
+module Avm
+  module EacAsciidoctorBase0
+    module DocumentsOwner
+      common_concern
+
+      # @param subpath [Pathname]
+      # @return [Avm::EacAsciidoctorBase0::Sources::Document]
+      # @raise [KeyError]
+      def document(subpath)
+        documents.find { |d| d.subpath.to_pathname == subpath.to_pathname } ||
+          raise(::KeyError, "Document not found with subáth = \"#{subpath}\"")
+      end
+
+      # @return [Enumerable<Avm::EacAsciidoctorBase0::Sources::Document>]
+      def documents
+        ::EacRubyUtils::RecursiveBuilder.new(root_document, &:children).result
+      end
+
+      # @return [Object]
+      def root_document
+        raise "Abstract method hit: #{__method__}"
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/file_formats/base/file_resource_name.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileResourceName
+          enable_method_class
+          common_constructor :file_format, :path do
+            self.path = path.to_pathname
+          end
+
+          CONTENT_PATTERNS = [%r{content/(.+)\z}].freeze
+
+          # @param path [Pathname]
+          # @return [Avm::FileFormats::FileWith]
+          def result
+            result_from_content || file_format.result_from_superclass(path)
+          end
+
+          private
+
+          def result_from_content
+            file_format.result_from_patterns(CONTENT_PATTERNS, path) do |m|
+              r = ::File.dirname(m[1])
+              r = '' if r == '.'
+              "Content[/#{r}]"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        require_sub __FILE__
+
+        VALID_BASENAMES = %w[*.adoc title].freeze
+        VALID_TYPES = %w[].freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/apache_host'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+        end
+
+        def extra_content
+          ''
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/apache_path'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/apache_host'
+require 'avm/eac_asciidoctor_base0/instances/apache_path'
+require 'avm/eac_asciidoctor_base0/instances/deploy'
+require 'avm/eac_webapp_base0/instances/base'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instances::Base
+        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
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'asciidoctor'
+require 'avm/eac_asciidoctor_base0/instances/macros'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          module BodyTarget
+            common_concern
+
+            BODY_TARGET_BASENAME = 'index.html'
+
+            # Absolute path to the output of Asciidoctor's source file.
+            #
+            # @return [Pathname]
+            def body_target_path
+              build.target_directory.join(source_document.subpath).join(BODY_TARGET_BASENAME)
+            end
+
+            # @return [Asciidoctor::Document]
+            def body_target_write
+              ::Asciidoctor.convert(
+                pre_processed_body_source_content,
+                base_dir: convert_base_dir,
+                to_file: body_target_path.to_path, safe: :unsafe, mkdirs: true
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          class HeaderLines
+            enable_method_class
+            enable_settings_provider
+            enable_simple_cache
+            common_constructor :document
+
+            delegate :build, :source_document, to: :document
+            delegate :instance, to: :build
+            delegate :author_email, :author_name, to: :instance
+
+            ATTRIBUTES = ['Author Initials', 'toc', 'icons', 'numbered', 'source-highlighter',
+                          'website'].freeze
+            TOC = 'left'
+            ICONS = ''
+            NUMBERED = ''
+            SOURCE_HIGHLIGHTER = 'rouge'
+
+            # @return [String]
+            def attribute_line(name, value)
+              [":#{name}:", value].compact_blank.join(' ')
+            end
+
+            def attributes_lines
+              ATTRIBUTES.map { |attr| attribute_line(attr, attribute_value(attr)) }
+            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
+
+            # @return [String]
+            def breadcrumbs_lines
+              ['[.normal]', document.macro_lines(:breadcrumbs)]
+            end
+
+            # @return [Array<String>]
+            def result
+              [stylesheet_line, title_line, author_line] + attributes_lines + [''] +
+                breadcrumbs_lines
+            end
+
+            # @return [String]
+            def stylesheet_line
+              attribute_line('stylesheet', stylesheet_path)
+            end
+
+            # @return [Pathname]
+            def stylesheet_path
+              source_document.source.theme_stylesheet_path
+                .relative_path_from(document.convert_base_dir)
+            end
+
+            # @return [String]
+            def title_line
+              "= #{source_document.title}"
+            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/media.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'asciidoctor'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Document
+          module Media
+            def copy_media_directory
+              source_document.copy_media_directory_to(media_target_path)
+            end
+
+            # @return [Pathname]
+            def media_target_path
+              build.target_directory.join(
+                parent_document.present? ? source_document.subpath : '',
+                ::Avm::EacAsciidoctorBase0::Sources::Document::Media::MEDIA_DIRECTORY_BASENAME
+              )
+            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,64 @@
+# 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
+
+            ARGUMENT_SEPARATOR = ','
+            MACRO_PARSER = %r{\A\s*//\#(\S+)(?:\s+(.+))?\s*?\z}.to_parser do |m|
+              ::Struct.new(:name, :arguments).new(m[1],
+                                                  m[2].to_s.split(ARGUMENT_SEPARATOR).map(&:strip))
+            end
+
+            common_constructor :document, :line
+
+            # @return [Array<String>]
+            def result
+              if macro?
+                macro_value
+              else
+                [line]
+              end
+            end
+
+            def macro?
+              macro_name.present?
+            end
+
+            # @return [Array<String>, nil]
+            def macro_arguments
+              parsed_macro.if_present(&:arguments)
+            end
+
+            # @return [String, nil]
+            def macro_name
+              parsed_macro.if_present(&:name)
+            end
+
+            def macro_parser
+              MACRO_PARSER
+            end
+
+            # @return [Array<String>]
+            def macro_value
+              document.macro_lines(macro_name, macro_arguments)
+            end
+
+            private
+
+            def parsed_macro_uncached
+              macro_parser.parse(line)
+            end
+          end
+        end
+      end
+    end
+  end
+end