eac_tools 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbc38a08966af86a3d17c50ad0788770045d7dcbd7c336fbbc31c9883b6a0aa
-  data.tar.gz: '0979accd22c7b7651e8ee52d4798efad58550b74e21def1a2df600f4a557386f'
+  metadata.gz: 4292c7dafc8fea6004c6bd827f4bc17d03bf3c8027cb468f9484fa3a1410c0e8
+  data.tar.gz: f4c8f529510815f1eced983511935c96271332fb5bb64d9899037c8239b8970a
 SHA512:
-  metadata.gz: f3c593fb8b4e163a02e42b7540022bc5180abc1883f1ee2a9b8608035243fe99b43cb484894e0fcc7b40a33b3b63d0b00651885ae4685ba59b7acc40259ff25e
-  data.tar.gz: 65b5f4c7a7713ebe7e49892df82e18965fc32d47304b4afc2ca35af8c0a82a0a85df6b238e79645cd7c99002ef09f3a407357ef3089aa77e61e0defa3d24fdec
+  metadata.gz: 92c6761b6cf54fe18ac480e51e4acff82b581c81ce7fb9971e0dd4a3094edfa20e17c9172a48b9bede3a374b741a1fa3818e744fcc2134d59261ceff43761bd7
+  data.tar.gz: af5cefe3c7ee50134b44b63958412dbf23a4d2c76d5d6a354b5cbd544090e59aa578a1293bc3b508eb6ec5d053dc950097830c457a863ea158e67920f6b96eea

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.51.0)
+    eac_tools (0.53.0)
       avm (~> 0.60)
-      avm-eac_asciidoctor_base0 (~> 0.13)
-      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_asciidoctor_base0 (~> 0.15)
+      avm-eac_generic_base0 (~> 0.9)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
@@ -13,8 +13,8 @@ PATH
       avm-eac_rails_base1 (~> 0.8)
       avm-eac_redmine_base0 (~> 0.18)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.28)
-      avm-eac_webapp_base0 (~> 0.13)
+      avm-eac_ruby_base1 (~> 0.28, >= 0.28.1)
+      avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
       avm-eac_wordpress_base0 (~> 0.3)
       avm-tools (~> 0.143)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
@@ -35,19 +35,19 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.13.0)
+    avm-eac_asciidoctor_base0 (0.15.0)
       asciidoctor (~> 2.0, >= 2.0.18)
-      avm-eac_webapp_base0 (~> 0.13)
-      eac_ruby_utils (~> 0.109)
+      avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.8.0)
-      avm (~> 0.53)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+    avm-eac_generic_base0 (0.9.0)
+      avm (~> 0.60)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
   remote: sub/avm-eac_latex_base0
@@ -118,9 +118,9 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.28.0)
+    avm-eac_ruby_base1 (0.28.1)
       avm (~> 0.60)
-      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_generic_base0 (~> 0.9)
       eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
@@ -134,13 +134,13 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.13.0)
-      avm (~> 0.57)
-      avm-eac_generic_base0 (~> 0.8)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.2)
-      avm-eac_ubuntu_base0 (~> 0.3)
+    avm-eac_webapp_base0 (0.13.1)
+      avm (~> 0.60)
+      avm-eac_generic_base0 (~> 0.9)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
+      avm-eac_ubuntu_base0 (~> 0.4)
       avm-files (~> 0.6)
-      eac_ruby_utils (~> 0.109)
+      eac_ruby_utils (~> 0.110, >= 0.110.1)
 
 PATH
   remote: sub/avm-eac_wordpress_base0

data/lib/eac_tools/version.rb

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

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

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'asciidoctor', '~> 2.0', '>= 2.0.18'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13', '>= 0.13.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
   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/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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.13.0'
+    VERSION = '0.15.0'
   end
 end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/file_formats/base_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/file_formats/base'
+
+::RSpec.describe ::Avm::EacAsciidoctorBase0::FileFormats::Base do
+  include_examples 'avm_file_format_file_resource_name', {
+    'content/title' => 'Content[/]',
+    'content/body.adoc' => 'Content[/]',
+    'content/abc/title' => 'Content[/abc]',
+    'content/abc/body.adoc' => 'Content[/abc]',
+    'content/abc/sub/body.adoc' => 'Content[/abc/sub]'
+  }
+end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/theme/main.css

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

data/sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/theme/main.css

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

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.53'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'avm', '~> 0.60'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/file_resource_name_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    class FileFormats
+      class Base < ::Avm::FileFormats::Base
+        module FileResourceNameHelper
+          def result_from_patterns(patterns, path)
+            patterns.lazy.map { |pattern| pattern.to_parser.parse(path.to_path) }
+              .find(&:present?).if_present { |v| yield(v) }
+          end
+
+          def result_from_superclass(path)
+            self.class.superclass.instance_method(:file_resource_name)
+              .bind_call(self, path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/file_formats/base'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacGenericBase0
     class FileFormats
       class Base < ::Avm::FileFormats::Base
+        require_sub __FILE__, include_modules: true
+
         VALID_BASENAMES = %w[*.asm *.bat *.coffee *.java *.js *.rb *.s *.sql *.tex *.url *.yml
                              *.yaml].freeze
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale,template}/**/*']
 
   s.add_dependency 'avm', '~> 0.60'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'

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

@@ -29,9 +29,8 @@ module Avm
             result_from_patterns(LIBRARY_PATTERNS) { |m| m[1].camelize }
           end
 
-          def result_from_patterns(patterns)
-            patterns.lazy.map { |pattern| pattern.to_parser.parse(path.to_path) }
-              .find(&:present?).if_present { |v| yield(v) }
+          def result_from_patterns(patterns, &block)
+            file_format.result_from_patterns(patterns, path, &block)
           end
 
           def result_from_spec
@@ -39,8 +38,7 @@ module Avm
           end
 
           def result_from_superclass
-            file_format.class.superclass.instance_method(:file_resource_name)
-              .bind_call(file_format, path)
+            file_format.result_from_superclass(path)
           end
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.28.0'
+    VERSION = '0.28.1'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.2'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
+  s.add_dependency 'avm', '~> 0.60'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.9'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.13.0'
+    VERSION = '0.13.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: avm-eac_latex_base0
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -196,6 +199,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.28'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +209,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -210,6 +219,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +341,8 @@ files:
 - sub/avm-eac_asciidoctor_base0/Gemfile
 - sub/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/file_formats/base.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/file_formats/base/file_resource_name.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/apache_host.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/apache_path.rb
@@ -350,6 +364,7 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners/build.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/file_formats/base_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build/document_spec_files/pre_processed_root_body.adoc
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec.rb
@@ -372,6 +387,7 @@ files:
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb
+- sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/file_resource_name_helper.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/instances/base.rb
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources.rb