eac_tools 0.94.0 → 0.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de8194475d2a078bd3d8330c6daec6558a2f568656cb4bfa000a751a1251a1d1
-  data.tar.gz: 71ab9f54e9a885e17755d774434d3ea7356dad44e5f49c6c2924808d3acf2042
+  metadata.gz: bcddc537bf7d33465c21a75bb134a6fb57009abd8e56da74595f76c6dab41245
+  data.tar.gz: d578287e68dc31506c0739e1edfe1303f4e7f528bb7e652c011f94f13cdd2180
 SHA512:
-  metadata.gz: 2a72e472acc586fcce802c22507dcfd1e8f8d9dcbc524c2cdd091746cd9832c8d55a85a3ddbb5d05c345384070005bde49d86aa7826742ae6de54112de16133e
-  data.tar.gz: b403d2d290a763b6cd0b23432bb4d5fcd744c1491068442c7579335d8cb0b336bec2908888c5e885006d9583d044749e327c1654265f4d25d5eb8db343bf2f1c
+  metadata.gz: de1053a06fd859a336b9ff5d60b116239e8ba19def9e8bf6e8ed6daaea1ef4eb3a34026c89bf4fbbb0b92efbe04e9945f3c38b709d448b7dd198f829b805a3fe
+  data.tar.gz: 7d2270c0ada7eb229c8e5a2e4e6def1130e090cced5ae6237a930a7171e0c436f344ff00b5767450ebb624699c373c99397e04b20c55d44724849bc4fe03e4a8

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.94.0)
+    eac_tools (0.96.0)
       avm (~> 0.94)
-      avm-eac_asciidoctor_base0 (~> 0.23)
+      avm-eac_asciidoctor_base0 (~> 0.24)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
@@ -16,55 +16,25 @@ PATH
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.3)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base0 (~> 0.1)
-      avm-eac_ruby_base1 (~> 0.34, >= 0.34.1)
+      avm-eac_ruby_base1 (~> 0.35)
       avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.18)
       avm-tools (~> 0.162)
+      eac_ruby_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
 
 PATH
-  remote: sub/avm-eac_webapp_base0
+  remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_webapp_base0 (0.20.1)
-      avm (~> 0.94)
-      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.8)
-      eac_ruby_utils (~> 0.122)
-      htmlbeautifier (~> 1.4, >= 1.4.3)
-
-PATH
-  remote: sub/avm-git
-  specs:
-    avm-git (0.18.0)
-      avm (~> 0.94)
-      avm-files (~> 0.8)
-      eac_git (~> 0.16)
-      eac_ruby_utils (~> 0.122)
-      git (~> 1.19, >= 1.19.1)
-
-PATH
-  remote: sub/avm-tools
-  specs:
-    avm-tools (0.162.0)
-      avm (~> 0.94)
-      clipboard (~> 1.4, >= 1.4.1)
-      eac_ruby_base0 (~> 0.19)
-
-PATH
-  remote: sub/avm
-  specs:
-    avm (0.94.0)
-      eac_cli (~> 0.42)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_docker (~> 0.7)
+    avm-eac_asciidoctor_base0 (0.24.0)
+      asciidoctor (~> 2.0, >= 2.0.23)
+      avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
       eac_fs (~> 0.18)
+      eac_ruby_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
-      eac_templates (~> 0.7, >= 0.7.1)
-      minitar (~> 0.9)
-      ruby-progressbar (~> 1.13)
+      os (~> 1.1, >= 1.1.4)
+      rouge (~> 3.30)
 
 GEM
   remote: https://rubygems.org/
@@ -79,12 +49,15 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     asciidoctor (2.0.23)
     ast (2.4.2)
-    avm-eac_asciidoctor_base0 (0.23.0)
-      asciidoctor (~> 2.0, >= 2.0.22)
-      avm-eac_webapp_base0 (~> 0.19)
-      eac_ruby_utils (~> 0.121)
-      os (~> 1.1, >= 1.1.4)
-      rouge (~> 3.30)
+    avm (0.94.0)
+      eac_cli (~> 0.42)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_docker (~> 0.7)
+      eac_fs (~> 0.18)
+      eac_ruby_utils (~> 0.122)
+      eac_templates (~> 0.7, >= 0.7.1)
+      minitar (~> 0.9)
+      ruby-progressbar (~> 1.13)
     avm-eac_generic_base0 (0.13.0)
       avm (~> 0.90)
       eac_ruby_utils (~> 0.121)
@@ -133,25 +106,44 @@ GEM
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
-    avm-eac_ruby_base1 (0.34.1)
-      avm (~> 0.92)
+    avm-eac_ruby_base1 (0.35.0)
+      avm (~> 0.94)
       avm-eac_generic_base0 (~> 0.13)
       eac_envs-http (~> 0.5, >= 0.5.1)
+      eac_ruby_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
+    avm-eac_webapp_base0 (0.20.1)
+      avm (~> 0.94)
+      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.8)
+      eac_ruby_utils (~> 0.122)
+      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)
       eac_ruby_utils (~> 0.121)
-    avm-files (0.8.0)
+    avm-files (0.8.1)
       avm (~> 0.93)
       eac_cli (~> 0.42)
       eac_fs (~> 0.18)
       eac_ruby_utils (~> 0.122)
       eac_templates (~> 0.7, >= 0.7.1)
+    avm-git (0.18.0)
+      avm (~> 0.94)
+      avm-files (~> 0.8)
+      eac_git (~> 0.16)
+      eac_ruby_utils (~> 0.122)
+      git (~> 1.19, >= 1.19.1)
+    avm-tools (0.162.0)
+      avm (~> 0.94)
+      clipboard (~> 1.4, >= 1.4.1)
+      eac_ruby_base0 (~> 0.19)
     base64 (0.2.0)
     clipboard (1.4.1)
     colorize (0.8.1)
@@ -233,7 +225,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitar (0.12)
+    minitar (0.12.1)
     minitest (5.25.1)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
@@ -285,10 +277,10 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
@@ -323,10 +315,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm!
-  avm-eac_webapp_base0!
-  avm-git!
-  avm-tools!
+  avm-eac_asciidoctor_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.94.0'
+  VERSION = '0.96.0'
 end

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

@@ -0,0 +1,26 @@
+# 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.23'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.20', '>= 0.20.1'
+  s.add_dependency 'eac_fs', '~> 0.18'
+  s.add_dependency 'eac_ruby_gem_support', '~> 0.10'
+  s.add_dependency 'eac_ruby_utils', '~> 0.122'
+  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 subpath = \"#{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,47 @@
+# frozen_string_literal: true
+
+require 'asciidoctor'
+require 'avm/eac_asciidoctor_base0/instances/macros'
+require 'avm/eac_asciidoctor_base0/logging/catcher'
+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
+              ::Avm::EacAsciidoctorBase0::Logging::Catcher.on do
+                body_target_write_without_logging_catch
+              end
+            end
+
+            protected
+
+            # @return [Asciidoctor::Document]
+            def body_target_write_without_logging_catch
+              ::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,92 @@
+# 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 [Pathname]
+            def relative_path_to_stylesheet
+              build.theme.target_stylesheet_path
+                .relative_path_from(document.body_target_path.dirname)
+            end
+
+            # @return [String]
+            def stylesheet_line
+              attribute_line('stylesheet', stylesheet_path)
+            end
+
+            # @return [String]
+            def title_line
+              "= #{source_document.title}"
+            end
+
+            def website
+              instance.web_url
+            end
+
+            protected
+
+            # @return [Pathname]
+            def stylesheet_path_uncached
+              temp = ::EacRubyUtils::Fs::Temp.file
+              temp.write("@import '#{relative_path_to_stylesheet}'\n")
+              temp.to_pathname
+            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