eac_tools 0.56.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39a13e0d2d3c95ec91b645a95b4194dd25550440a986de200e9e0867ef2ec31
-  data.tar.gz: b7135c790da9d47ce3675cced805478b9b16a4c9d27ee3454612bc5c86e9e2f2
+  metadata.gz: a88a109b74daae9bda081b8b736f011d52a0a96ea8c1a1ee330e1b1e9559bbd0
+  data.tar.gz: 7ddb4fc53c371c53cbc403df93f87ff89762e9f83cf9e414d5499d83a1ed5f2d
 SHA512:
-  metadata.gz: f400d1cf29e23f6ffc9a87025d4765a7a601c9e0fd4c53925ccfc636bca411e840e94cb153cdc7cfd11ff32fb79111ba97d3b59389772260fdfc7d1e02861d6d
-  data.tar.gz: f22e7776248bc742fb3005aa4f3fbf3fb468f8efcafb890d14058ac3d4c93a3cd4012da2d99d0accaf7216ef8948cd359dcad8f7e543c6e8b1e372b5337e12de
+  metadata.gz: 7295ff7568e29474205b29bcacb0e01e87b258a2b9dcebb3e9b493342c70cef68666c069520510c83e3922677425d7099234721de4168964c7ae6496f14d31bc
+  data.tar.gz: 4c4db4f4870442e8761b5eefd060ace77db5ba6dd468c510fdbea114979c1a2e2c6e8d6e6e894d7efd91b4e0b4cbbfb32ed65ded65402e0ce855b6c3a54714a7

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.56.0)
+    eac_tools (0.57.0)
       avm (~> 0.66)
-      avm-eac_asciidoctor_base0 (~> 0.15)
+      avm-eac_asciidoctor_base0 (~> 0.16)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_rails_base0 (~> 0.9, >= 0.9.1)
+      avm-eac_rails_base0 (~> 0.10)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
       avm-eac_redmine_base0 (~> 0.18, >= 0.18.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
@@ -37,10 +37,10 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.15.0)
+    avm-eac_asciidoctor_base0 (0.16.0)
       asciidoctor (~> 2.0, >= 2.0.18)
-      avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
-      eac_ruby_utils (~> 0.110, >= 0.110.1)
+      avm-eac_webapp_base0 (~> 0.14)
+      eac_ruby_utils (~> 0.112)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
 
@@ -84,7 +84,7 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.9.1)
+    avm-eac_rails_base0 (0.10.0)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
       eac_ruby_utils (~> 0.112)
 
@@ -272,7 +272,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.2)
       public_suffix (>= 2.0.2, < 6.0)
     asciidoctor (2.0.18)
     ast (2.4.2)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.56.0'
+  VERSION = '0.57.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', '>= 0.13.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.110', '>= 0.110.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.14'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
   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_macro_value.rb → header_lines.rb}

@@ -7,7 +7,7 @@ module Avm
     module Instances
       class Build
         class Document
-          class HeaderMacroValue
+          class HeaderLines
             enable_method_class
             enable_settings_provider
             enable_simple_cache

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

@@ -50,9 +50,10 @@ module Avm
 
           # @return [String]
           def pre_processed_body_source_content
-            source_document.body_path.read.each_line
-                           .flat_map { |line| pre_process_line(line.rstrip) }
-                           .map { |line| "#{line.rstrip}\n" }.join
+            (
+              header_lines + [''] + source_document.body_path.read.each_line
+                               .flat_map { |line| pre_process_line(line.rstrip) }
+            ).map { |line| "#{line.rstrip}\n" }.join
           end
 
           def tree_documents_count

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

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

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc

@@ -1,5 +1,3 @@
-//#header
-
 == Child Documents
 
 //#child_docs

data/sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc

@@ -1,5 +1,3 @@
-//#header
-
 == Child Documents
 
 //#child_docs

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/{apache_host.rb → instances/apache_host.rb}

@@ -4,7 +4,9 @@ require 'avm/eac_rails_base1/instances/apache_host'
 
 module Avm
   module EacRailsBase0
-    class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
+    module Instances
+      class ApacheHost < ::Avm::EacRailsBase1::Instances::ApacheHost
+      end
     end
   end
 end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+require 'avm/eac_webapp_base0/instances/apache_path'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
+        def document_root
+          ::File.join(super, 'public')
+        end
+
+        def extra_content
+          template.child('extra_content.conf').apply(instance)
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/instances/base'
+require 'avm/eac_rails_base0/instances/deploy'
 
 module Avm
   module EacRailsBase0

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/deploy.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+require 'avm/eac_webapp_base0/instances/deploy'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module EacRailsBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
+        set_callback :assert_instance_branch, :after do
+          bundle_install
+          assert_database
+          database_migrate
+          compile_assets
+          restart_tasks_scheduler
+          touch_restart_file
+        end
+
+        def assert_database
+          infom 'Asserting database...'
+          instance.pg.assert
+        end
+
+        def bundle_install
+          infom 'Running "bundle install"...'
+          instance.bundle('install').system!
+        end
+
+        def compile_assets
+          infom 'Compiling assets...'
+          instance.rake('assets:clean', 'assets:precompile').system!
+        end
+
+        def database_migrate
+          infom 'Running database migrations...'
+          instance.rake('db:migrate').system!
+        end
+
+        def restart_tasks_scheduler
+          infom 'Restarting Tasks Scheduler\'s daemon...'
+          instance.bundle('exec', 'tasks_scheduler', 'restart').system!
+        end
+
+        def touch_restart_file
+          infom 'Touching restart file...'
+          instance.host_env.command(
+            'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                                 'tmp', 'restart.txt')
+          ).system!
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.9.1'
+    VERSION = '0.10.0'
   end
 end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/{apache_host_spec.rb → instances/apache_host_spec.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/instances/apache_host'
 require 'avm/eac_rails_base0/instances/base'
 
-RSpec.describe ::Avm::EacRailsBase0::ApacheHost do
+RSpec.describe ::Avm::EacRailsBase0::Instances::ApacheHost do
   describe '#no_ssl_site_content' do
     let(:instance) { ::Avm::EacRailsBase0::Instances::Base.by_id('stub-app_0') }
     let(:apache_host) { described_class.new(instance) }

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/{apache_path_spec.rb → instances/apache_path_spec.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/eac_rails_base0/apache_path'
+require 'avm/eac_rails_base0/instances/apache_path'
 require 'avm/eac_rails_base0/instances/base'
 
-RSpec.describe ::Avm::EacRailsBase0::ApachePath do
+RSpec.describe ::Avm::EacRailsBase0::Instances::ApachePath do
   describe '#no_ssl_site_content' do
     let(:instance) { ::Avm::EacRailsBase0::Instances::Base.by_id('stub-app_0') }
     let(:apache_path) { described_class.new(instance) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -376,7 +370,7 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/child_docs_macro_value.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_macro_value.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators.rb
@@ -518,23 +512,23 @@ files:
 - sub/avm-eac_rails_base0/Gemfile
 - sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0.rb
-- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_host.rb
-- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb
-- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances.rb
+- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/apache_host.rb
+- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/apache_path.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/base.rb
+- sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/instances/deploy.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/source_generators/base.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/sources/base.rb
 - sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb
-- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec.rb
-- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
-- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb
-- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec_files/stub-app_0_apache_path.conf
+- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_host_spec.rb
+- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_host_spec_files/apache_host_spec_no_ssl_content.conf
+- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec.rb
+- sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/instances/apache_path_spec_files/stub-app_0_apache_path.conf
 - sub/avm-eac_rails_base0/spec/rubocop_spec.rb
 - sub/avm-eac_rails_base0/spec/spec_helper.rb
-- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/apache_path/extra_content.conf
-- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/database.yml.template
-- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/deploy/config/envvars.d/email.yml.template
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/apache_path/extra_content.conf
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/database.yml.template
+- sub/avm-eac_rails_base0/template/avm/eac_rails_base0/instances/deploy/config/envvars.d/email.yml.template
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Gemfile
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/Rakefile
 - sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/app/assets/config/manifest.js

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/apache_path.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/instances/apache_path'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacRailsBase0
-    class ApachePath < ::Avm::EacWebappBase0::Instances::ApachePath
-      def document_root
-        ::File.join(super, 'public')
-      end
-
-      def extra_content
-        template.child('extra_content.conf').apply(instance)
-      end
-    end
-  end
-end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_templates/core_ext'
-require 'avm/eac_webapp_base0/instances/deploy'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module EacRailsBase0
-    class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
-      set_callback :assert_instance_branch, :after do
-        bundle_install
-        assert_database
-        database_migrate
-        compile_assets
-        restart_tasks_scheduler
-        touch_restart_file
-      end
-
-      def assert_database
-        infom 'Asserting database...'
-        instance.pg.assert
-      end
-
-      def bundle_install
-        infom 'Running "bundle install"...'
-        instance.bundle('install').system!
-      end
-
-      def compile_assets
-        infom 'Compiling assets...'
-        instance.rake('assets:clean', 'assets:precompile').system!
-      end
-
-      def database_migrate
-        infom 'Running database migrations...'
-        instance.rake('db:migrate').system!
-      end
-
-      def restart_tasks_scheduler
-        infom 'Restarting Tasks Scheduler\'s daemon...'
-        instance.bundle('exec', 'tasks_scheduler', 'restart').system!
-      end
-
-      def touch_restart_file
-        infom 'Touching restart file...'
-        instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
-                               'tmp', 'restart.txt')
-        ).system!
-      end
-    end
-  end
-end