eac_tools 0.96.2 → 0.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a85250168e8a4dece64a1b735d4a8f044823bf911a739fd172960ede3274467
-  data.tar.gz: edfbfcef25c09e651034d391d415fe0692596880242b972023cd2b6802d3a410
+  metadata.gz: 9b86618f5e0b6acf9c493717389ada6aa49459a59b4a3eb2970d8f0b2b16d570
+  data.tar.gz: 3cdba7b928c7b2754642ad9ce59f36ecd8d2656fa1a1a18d4f675e6809134376
 SHA512:
-  metadata.gz: dc5fbdca4469bec0d6063bb26e859eebfd404a47ef60ce15ebfd6da9342bdc2f8826b5fa5aa4976fff115a6a586fa7d092de4c6cc484156aeaa5c1e422416209
-  data.tar.gz: f68acfdb87c5c8800e294e6cd7424fea6d1e11fae8044c6205e96b5adc049fc9797a98e215ca53fa6dd48b65a092e093cb187c6b2efe4a3f13452d11df948fe0
+  metadata.gz: 6fe556277a414f99d7a798d00b602ae780ba83b64d709b957e047d90673517ca6b56abfa6dabbacd16bbe407f65a8a08aa00d30302851a87f50bd3c92ee6d3fc
+  data.tar.gz: 1f814609ae504133bd62e30a8356d0a847a61ec470b8bfa8ef7855dce8cef3b516aeb596f3e612696a155a02a5247189f1f711b08b847cbbeebfd88e9f18a819

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.96.2)
+    eac_tools (0.97.0)
       avm (~> 0.94)
-      avm-eac_asciidoctor_base0 (~> 0.24)
+      avm-eac_asciidoctor_base0 (~> 0.25)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
@@ -21,21 +21,23 @@ PATH
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.18)
       avm-tools (~> 0.162)
-      eac_ruby_utils (~> 0.122)
+      eac_ruby_utils (~> 0.123)
 
 PATH
-  remote: sub/avm-eac_rails_base1
+  remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_rails_base1 (0.10.1)
-      avm (~> 0.94)
-      avm-eac_ruby_base1 (~> 0.35, >= 0.35.1)
+    avm-eac_asciidoctor_base0 (0.25.0)
+      asciidoctor (~> 2.0, >= 2.0.23)
       avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
-      eac_ruby_utils (~> 0.122)
+      eac_fs (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.123)
+      os (~> 1.1, >= 1.1.4)
+      rouge (~> 3.30)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.8)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -54,14 +56,6 @@ GEM
       eac_templates (~> 0.7, >= 0.7.1)
       minitar (~> 0.9)
       ruby-progressbar (~> 1.13)
-    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)
-      os (~> 1.1, >= 1.1.4)
-      rouge (~> 3.30)
     avm-eac_generic_base0 (0.13.0)
       avm (~> 0.90)
       eac_ruby_utils (~> 0.121)
@@ -90,6 +84,11 @@ GEM
     avm-eac_rails_base0 (0.11.1)
       avm-eac_rails_base1 (~> 0.10)
       eac_ruby_utils (~> 0.121)
+    avm-eac_rails_base1 (0.10.1)
+      avm (~> 0.94)
+      avm-eac_ruby_base1 (~> 0.35, >= 0.35.1)
+      avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
+      eac_ruby_utils (~> 0.122)
     avm-eac_redmine_base0 (0.22.3)
       avm (~> 0.92)
       avm-eac_generic_base0 (~> 0.13)
@@ -161,17 +160,18 @@ GEM
     eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
-    eac_envs-http (0.5.1)
-      eac_fs (~> 0.17)
-      eac_ruby_utils (~> 0.120)
-      faraday (~> 2.7, >= 2.7.12)
+    eac_envs-http (0.6.1)
+      eac_fs (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.123)
+      faraday (~> 2.8, >= 2.8.1)
       faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.2)
-    eac_fs (0.18.0)
+      faraday-retry (~> 2.2, >= 2.2.1)
+      random-port (~> 0.7, >= 0.7.1)
+    eac_fs (0.18.1)
       content-type (~> 0.0, >= 0.0.2)
-      eac_ruby_utils (~> 0.122)
+      eac_ruby_utils (~> 0.123)
       ruby-filemagic (~> 0.7, >= 0.7.3)
     eac_git (0.16.0)
       eac_ruby_utils (~> 0.121)
@@ -191,9 +191,9 @@ GEM
       rubocop (~> 1.60, >= 1.60.1)
       rubocop-rails (~> 2.23, >= 2.23.1)
       rubocop-rspec (~> 2.26, >= 2.26.1)
-    eac_ruby_utils (0.122.0)
+    eac_ruby_utils (0.123.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.6)
+      addressable (~> 2.8, >= 2.8.7)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
@@ -221,7 +221,7 @@ GEM
     htmlbeautifier (1.4.3)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.7.5)
     language_server-protocol (3.17.0.3)
     minitar (0.12.1)
     minitest (5.25.1)
@@ -230,7 +230,7 @@ GEM
     os (1.1.4)
     parallel (1.26.3)
     parseconfig (1.1.2)
-    parser (3.3.5.0)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -238,8 +238,9 @@ GEM
       tty-color (~> 0.5)
     public_suffix (5.1.1)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.8)
     rainbow (3.1.1)
+    random-port (0.7.1)
     rchardet (1.8.0)
     regexp_parser (2.9.2)
     rouge (3.30.0)
@@ -247,16 +248,16 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -266,13 +267,13 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -309,7 +310,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm-eac_rails_base1!
+  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.96.2'
+  VERSION = '0.97.0'
 end

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.23'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.20', '>= 0.20.1'
+  s.add_dependency 'eac_fs', '~> 0.18', '>= 0.18.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.123'
+  s.add_dependency 'os', '~> 1.1', '>= 1.1.4'
+  s.add_dependency 'rouge', '~> 3.30'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'
+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_rails_base1/lib/avm/eac_rails_base1 → avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0}/instances/apache_host.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base1/instances/apache_base'
 require 'avm/eac_webapp_base0/instances/apache_host'
 
 module Avm
-  module EacRailsBase1
+  module EacAsciidoctorBase0
     module Instances
       class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
-        prepend ::Avm::EacRailsBase1::Instances::ApacheBase
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+        end
 
         def extra_content
-          'PassengerEnabled On'
+          ''
         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,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