eac_tools 0.87.0 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94899940f6ea8c9bf26e6f0227db84e8add50935112b3ce90ad5128c3daa9a9c
-  data.tar.gz: d41cc081b23be785cb6873b3c780445e759965f84ee2cdd40428d34743ce68c6
+  metadata.gz: 9265f04b7e93de5298e85230f877408831a90e29f98e283cb8e34e59fccfa753
+  data.tar.gz: 7ef8d84e342637f04f601e0e7cd24b5467aef94a312c1089f21f5175a60dcaeb
 SHA512:
-  metadata.gz: e8c11bc5596794f47b116d368895b81fa9cdc1ef5e48fdb2582ecf0e74e15b7857f0acebf4f5a7d2cc72b29758d8859f8e605f2b2802a13b04a4f9096dcf6be4
-  data.tar.gz: 7a33d024b4a95a939437f580ed4c28d22240ac95ba44289017bf7ff7dacc42715038f52a67c80577c4e38ff45082b9698d3a907fe29bceb4d42b466a78278e09
+  metadata.gz: 901958c5e2a18cb40c1f7972aeb27c6f6d1a808650401babca74abef1be0acff0782a60e8ba02607dc670b7f51bb55e6bfa2a054a409f4bcf531328609a57729
+  data.tar.gz: ccaf49462bc9e1de20dc17f80d61f188da7259da6526a0fce62ba258963f20a961c0f10f2295470ae8132bf1eb6c0954c869190e09ba03556fec99df4b2087bf

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.87.0)
-      avm (~> 0.90)
-      avm-eac_asciidoctor_base0 (~> 0.22, >= 0.22.1)
+    eac_tools (0.88.0)
+      avm (~> 0.90, >= 0.90.1)
+      avm-eac_asciidoctor_base0 (~> 0.23)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
@@ -13,7 +13,7 @@ PATH
       avm-eac_python_base0 (~> 0.2, >= 0.2.2)
       avm-eac_rails_base0 (~> 0.11, >= 0.11.1)
       avm-eac_rails_base1 (~> 0.10)
-      avm-eac_redmine_base0 (~> 0.22, >= 0.22.1)
+      avm-eac_redmine_base0 (~> 0.22, >= 0.22.2)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       avm-eac_webapp_base0 (~> 0.19)
@@ -25,45 +25,13 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.22.1)
+    avm-eac_asciidoctor_base0 (0.23.0)
       asciidoctor (~> 2.0, >= 2.0.22)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
+      avm-eac_webapp_base0 (~> 0.19)
       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.90.0)
-      eac_cli (~> 0.40, >= 0.40.1)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_docker (~> 0.7)
-      eac_fs (~> 0.17)
-      eac_ruby_utils (~> 0.121)
-      eac_templates (~> 0.5, >= 0.5.1)
-      minitar (~> 0.9)
-      ruby-progressbar (~> 1.13)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -84,6 +52,18 @@ GEM
       ofx-parser (~> 1.1)
     asciidoctor (2.0.22)
     ast (2.4.2)
+    avm (0.90.1)
+      eac_cli (~> 0.40, >= 0.40.1)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_docker (~> 0.7)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
+      minitar (~> 0.9)
+      ruby-progressbar (~> 1.13)
+    avm-eac_generic_base0 (0.13.0)
+      avm (~> 0.90)
+      eac_ruby_utils (~> 0.121)
     avm-eac_github_base0 (0.3.0)
       avm (~> 0.82)
       avm-git (~> 0.14)
@@ -114,9 +94,9 @@ GEM
       avm-eac_ruby_base1 (~> 0.33)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
-    avm-eac_redmine_base0 (0.22.1)
-      avm (~> 0.88)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
+    avm-eac_redmine_base0 (0.22.2)
+      avm (~> 0.90, >= 0.90.1)
+      avm-eac_generic_base0 (~> 0.13)
       avm-eac_rails_base1 (~> 0.10)
       avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
       curb (~> 0.9, >= 0.9.11)
@@ -136,6 +116,14 @@ GEM
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
       eac_templates (~> 0.5, >= 0.5.1)
+    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)
     avm-eac_wordpress_base0 (0.3.2)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
@@ -226,7 +214,7 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    faraday-retry (2.2.0)
+    faraday-retry (2.2.1)
       faraday (~> 2.0)
     filesize (0.2.0)
     git (1.19.1)
@@ -249,7 +237,7 @@ GEM
     os (1.1.4)
     parallel (1.24.0)
     parseconfig (1.1.2)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -276,7 +264,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.63.0)
+    rubocop (1.63.4)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -287,8 +275,8 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
@@ -303,7 +291,7 @@ GEM
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
+    rubocop-rspec_rails (2.28.3)
       rubocop (~> 1.40)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
@@ -330,10 +318,7 @@ PLATFORMS
   x86_64-linux
 
 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.87.0'
+  VERSION = '0.88.0'
 end

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

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   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 'avm-eac_webapp_base0', '~> 0.19'
   s.add_dependency 'eac_ruby_utils', '~> 0.121'
   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/build/document/header_lines.rb

@@ -56,17 +56,17 @@ module Avm
                 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 [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}"
@@ -75,6 +75,15 @@ module Avm
             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

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/theme.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Theme
+          TARGET_SUBPATH = '_theme'
+
+          common_constructor :build
+
+          # @return [void]
+          def perform
+            copy_theme_to_target
+          end
+
+          # @return [Pathname]
+          def target_path
+            build.target_directory.join(TARGET_SUBPATH)
+          end
+
+          # @return [Pathname]
+          def target_stylesheet_path
+            target_path
+              .join(Avm::EacAsciidoctorBase0::Sources::Base::Theme::THEME_STYLESHEET_BASENAME)
+          end
+
+          protected
+
+          # @return [void]
+          def copy_theme_to_target
+            build.source.copy_theme_directory_to(target_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,6 +23,7 @@ module Avm
         def perform
           infov 'Documents to build', root_document.tree_documents_count
           target_directory.clear
+          theme.perform
           root_document.perform
         end
 
@@ -45,6 +46,13 @@ module Avm
             options[OPTION_TARGET_DIRECTORY] || default_target_directory
           )
         end
+
+        private
+
+        # @return [Avm::EacAsciidoctorBase0::Instances::Build::Theme]
+        def theme_uncached
+          ::Avm::EacAsciidoctorBase0::Instances::Build::Theme.new(self)
+        end
       end
     end
   end

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

@@ -12,6 +12,12 @@ module Avm
           DEFAULT_THEME_DIRECTORY_SUBPATH = 'theme'
           THEME_STYLESHEET_BASENAME = 'main.css'
 
+          # @param target_directory_path [Pathname]
+          def copy_theme_directory_to(target_directory_path)
+            target_directory_path.parent.mkpath
+            ::FileUtils.copy_entry(theme_directory, target_directory_path)
+          end
+
           # @return [Pathname]
           def default_theme_directory
             path.join(DEFAULT_THEME_DIRECTORY_SUBPATH)

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.22.1'
+    VERSION = '0.23.0'
   end
 end

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

@@ -14,6 +14,9 @@ RSpec.describe Avm::EacAsciidoctorBase0::Instances::Build::Document do
     FileUtils.copy_entry(source.root_document.root_path, r)
     r
   end
+  let(:pre_processed_body_source_content) do
+    sanitize_body_source(instance.pre_processed_body_source_content)
+  end
 
   before do
     copy_template_hash(
@@ -37,7 +40,7 @@ RSpec.describe Avm::EacAsciidoctorBase0::Instances::Build::Document do
   end
 
   it do
-    expect(instance.pre_processed_body_source_content).to eq(target_file.read)
+    expect(pre_processed_body_source_content).to eq(target_file.read)
   end
 
   # @return [Avm::EacAsciidoctorBase0::Sources::Document]
@@ -69,4 +72,10 @@ RSpec.describe Avm::EacAsciidoctorBase0::Instances::Build::Document do
     r = build_doc.child!(basename)
     path.any? ? build_doc_child(r, *path) : r
   end
+
+  # @param source [String]
+  # @return [String]
+  def sanitize_body_source(source)
+    source.gsub(/^:stylesheet:\s*.+\s*$/, ':stylesheet: ../../../../theme/main.css')
+  end
 end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec_files/first.target/_theme/main.css

@@ -0,0 +1 @@
+@import "https://darshandsoni.com/asciidoctor-skins/css/adoc-colony.css";