eac_tools 0.60.0 → 0.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 327ae2eff08c0ad4c133241be2a63b4c7a0867317996c75f96254289510efc92
-  data.tar.gz: 7f683ac460509520c772af752277317ffbd6adfbc099757ad0f88cd104a85517
+  metadata.gz: caa729c8c9185c74f20a11fa6c623e6269086f4b0b0afec40c60bcbaf638ff44
+  data.tar.gz: ea102dff8ac8f9a6ac3980e83b3167824414eec05e5af59738132b9af1b44f74
 SHA512:
-  metadata.gz: '08edc8c921395b4593f0ae47b0c36d1f67c1847d752d8e17fb258f82fa637854652e85b77ee69fd0a0664ca9f633d0ba2f3812bd188b750c1b55ddaeac60f732'
-  data.tar.gz: d6753df13da2becc01dccf9a71896f2aba4506e236f05b2c8026e8c0dc30a59f472da6dd4453a4b3506cdd778b76f1437e1cc3ac48f873622514b4613a6e0347
+  metadata.gz: 65027ae7f693a5b430cdfc0d1a904636d291f498eb8ecb96a4cc513b7205c4b64c0b8c16201d1045135f812586f7dded38985a62448ebbdabe33b4eb49a065b1
+  data.tar.gz: a75f1adcac0a950ea748418a5f8be220906c1c24f620826b1024e7d8f90bc36732ae0b2e4e8da5bc1c118aa072bdb40e0a2b697e55b506c2c1516ef75f88a97c

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.60.0)
-      avm (~> 0.66, >= 0.66.1)
-      avm-eac_asciidoctor_base0 (~> 0.18)
+    eac_tools (0.60.1)
+      avm (~> 0.67)
+      avm-eac_asciidoctor_base0 (~> 0.18, >= 0.18.1)
       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_latex_base0 (~> 0.3, >= 0.3.1)
+      avm-eac_php_base0 (~> 0.4, >= 0.4.2)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_rails_base0 (~> 0.10)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.2)
-      avm-eac_redmine_base0 (~> 0.19)
+      avm-eac_rails_base0 (~> 0.10, >= 0.10.1)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
+      avm-eac_redmine_base0 (~> 0.19, >= 0.19.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
-      avm-eac_webapp_base0 (~> 0.14)
-      avm-eac_wordpress_base0 (~> 0.3)
+      avm-eac_webapp_base0 (~> 0.15)
+      avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.1)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
@@ -23,23 +23,20 @@ PATH
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.17.0)
+    aranha-parsers (0.17.1)
       activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.1)
+      addressable (~> 2.8, >= 2.8.3)
+      eac_envs-http (~> 0.3)
       eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-follow_redirects (~> 0.3)
-      faraday-gzip (~> 0.1)
-      faraday-retry (~> 2.1)
       nokogiri (~> 1.14, >= 1.14.2)
       ofx-parser (~> 1.1)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.18.0)
+    avm-eac_asciidoctor_base0 (0.18.1)
       asciidoctor (~> 2.0, >= 2.0.18)
-      avm-eac_webapp_base0 (~> 0.14)
+      avm-eac_webapp_base0 (~> 0.15)
       eac_ruby_utils (~> 0.112)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
@@ -54,25 +51,25 @@ PATH
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
-    avm-eac_latex_base0 (0.3.0)
-      avm (~> 0.52)
-      avm-eac_webapp_base0 (~> 0.12)
-      eac_ruby_utils (~> 0.106)
+    avm-eac_latex_base0 (0.3.1)
+      avm (~> 0.67)
+      avm-eac_webapp_base0 (~> 0.15)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_php_base0
   specs:
-    avm-eac_php_base0 (0.4.1)
-      avm-eac_generic_base0 (~> 0.8)
-      avm-eac_webapp_base0 (~> 0.13)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_php_base0 (0.4.2)
+      avm-eac_generic_base0 (~> 0.12)
+      avm-eac_webapp_base0 (~> 0.15)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.3)
-      avm (~> 0.57)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_postgresql_base0 (0.2.4)
+      avm (~> 0.66, >= 0.66.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -84,26 +81,26 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.10.0)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
+    avm-eac_rails_base0 (0.10.1)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.8.2)
-      avm (~> 0.66, >= 0.66.1)
+    avm-eac_rails_base1 (0.8.3)
+      avm (~> 0.67)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
-      avm-eac_webapp_base0 (~> 0.14)
+      avm-eac_webapp_base0 (~> 0.15)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.19.0)
-      avm (~> 0.66, >= 0.66.1)
+    avm-eac_redmine_base0 (0.19.1)
+      avm (~> 0.67)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.2)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
@@ -137,10 +134,10 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.14.0)
-      avm (~> 0.66)
+    avm-eac_webapp_base0 (0.15.0)
+      avm (~> 0.67)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
       avm-files (~> 0.6)
       eac_ruby_utils (~> 0.112)
@@ -148,10 +145,10 @@ PATH
 PATH
   remote: sub/avm-eac_wordpress_base0
   specs:
-    avm-eac_wordpress_base0 (0.3.0)
-      avm (~> 0.57)
-      avm-eac_webapp_base0 (~> 0.13)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_wordpress_base0 (0.3.1)
+      avm (~> 0.67)
+      avm-eac_webapp_base0 (~> 0.15)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-files
@@ -194,8 +191,8 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.66.1)
-      aranha-parsers (~> 0.17)
+    avm (0.67.0)
+      aranha-parsers (~> 0.17, >= 0.17.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
@@ -272,7 +269,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.3)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     asciidoctor (2.0.18)
     ast (2.4.2)
@@ -283,11 +280,14 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.2.0)
+    eac_envs-http (0.3.0)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
       faraday (~> 2.7, >= 2.7.4)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
+      faraday-retry (~> 2.1)
     eac_rest (0.7.3)
       eac_envs-http (~> 0.2)
       eac_fs (~> 0.16)
@@ -327,7 +327,7 @@ GEM
     minitest (5.18.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)

data/lib/eac_tools/version.rb

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

data/sub/aranha-parsers/aranha-parsers.gemspec

@@ -13,12 +13,9 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'activesupport', '>= 4.0.0'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.3'
+  s.add_dependency 'eac_envs-http', '~> 0.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'faraday', '~> 2.7', '>= 2.7.4'
-  s.add_dependency 'faraday-follow_redirects', '~> 0.3'
-  s.add_dependency 'faraday-gzip', '~> 0.1'
-  s.add_dependency 'faraday-retry', '~> 2.1'
   s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.2'
   s.add_dependency 'ofx-parser', '~> 1.1'
 

data/sub/aranha-parsers/lib/aranha/parsers/source_address/hash_http_base.rb

@@ -2,10 +2,9 @@
 
 require 'aranha/parsers/source_address/fetch_content_error'
 require 'aranha/parsers/source_address/hash_http_base'
+require 'eac_envs/http/error'
+require 'eac_envs/http/request'
 require 'eac_ruby_utils/core_ext'
-require 'faraday'
-require 'faraday/follow_redirects'
-require 'faraday/gzip'
 require 'yaml'
 
 module Aranha
@@ -55,21 +54,11 @@ module Aranha
           source.to_yaml
         end
 
-        # @return [Faraday]
-        def faraday_connection
-          ::Faraday.new do |f|
-            f.request :gzip
-            f.response :follow_redirects if follow_redirect?
-          end
-        end
-
         def content
-          req = faraday_request
-          return req.body if req.status == 200
-
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
-            "Get #{url} returned #{req.status.to_i}", req
-          )
+          request = http_request
+          request.response.body_str
+        rescue ::EacEnvs::Http::Error => e
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError, e.message, request
         end
 
         def param(key, default_value)
@@ -82,11 +71,13 @@ module Aranha
 
         private
 
-        def faraday_request_uncached
-          faraday_connection.send(self.class.http_method, url) do |req|
-            headers.if_present { |v| req.headers = v }
-            body.if_present { |v| req.body = v }
-          end
+        # @return [EacEnvs::Http::Request]
+        def http_request
+          r = ::EacEnvs::Http::Request.new.verb(self.class.http_method).url(url)
+          r = headers.if_present(r) { |v| r.headers(v) }
+          r = body.if_present(r) { |v| r.body(v) }
+          r = r.follow_redirect(true) if follow_redirect?
+          r
         end
       end
     end

data/sub/aranha-parsers/lib/aranha/parsers/source_address/http_get.rb

@@ -2,8 +2,8 @@
 
 require 'addressable'
 require 'aranha/parsers/source_address/fetch_content_error'
-require 'faraday'
-require 'faraday/retry'
+require 'eac_envs/http/error'
+require 'eac_envs/http/request'
 
 module Aranha
   module Parsers
@@ -39,16 +39,10 @@ module Aranha
         end
 
         def content
-          conn = ::Faraday.new do |f|
-            f.request :retry # retry transient failures
-            f.response :follow_redirects # follow redirects
-          end
-          c = conn.get(url)
-          return c.body if c.status == 200
-
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
-            "Get #{url} returned #{c.status.to_i}", c
-          )
+          request = ::EacEnvs::Http::Request.new.url(url).retry(true).follow_redirect(true)
+          request.response.body_str
+        rescue ::EacEnvs::Http::Error => e
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError, e.message, request
         end
 
         def serialize

data/sub/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.17.0'
+    VERSION = '0.17.1'
   end
 end

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/source_address'
+require 'eac_envs/http/rspec/echo_server'
+require 'eac_ruby_utils/yaml'
+
+::RSpec.describe ::Aranha::Parsers::SourceAddress do
+  describe '#detect_sub' do
+    let(:http_server) { ::EacEnvs::Http::Rspec::EchoServer.http }
+
+    around { |example| http_server.on_active(&example) }
+
+    include_examples 'source_target_fixtures', __FILE__
+
+    def source_data(source_file)
+      source = ::EacRubyUtils::Yaml.load_file(source_file)
+      url = source_url_get(source)
+      %w[scheme host port].each { |attr| url.send("#{attr}=", http_server.root_url.send(attr)) }
+      if source.is_a?(::Hash)
+        source[:url] = url.to_s
+      else
+        source = url.to_s
+      end
+      ::JSON.parse(described_class.detect_sub(source).content)
+    end
+
+    # @return [Addressable::URI]
+    def source_url_get(source)
+      (source.is_a?(::Hash) ? source.fetch(:url) : source).to_uri
+    end
+  end
+end

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.source.yml

@@ -0,0 +1,6 @@
+---
+:method: :get
+:url: http://getdata.net
+:params:
+  :headers:
+  - abc

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_get.target.yaml

@@ -0,0 +1,10 @@
+---
+ssl: false
+method: GET
+uri: "/"
+body: 
+headers:
+  user-agent: Faraday v2.7.4
+  accept-encoding: gzip,deflate
+  accept: "*/*"
+  host: localhost:8080

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.source.yml

@@ -0,0 +1,5 @@
+---
+:method: :post
+:url: http://postdata.net
+:params:
+  :key1: :value1

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/hash_http_post.target.yaml

@@ -0,0 +1,12 @@
+---
+ssl: false
+method: POST
+uri: "/"
+body: 
+headers:
+  user-agent: Faraday v2.7.4
+  accept-encoding: gzip,deflate
+  content-length: '0'
+  accept: "*/*"
+  host: localhost:8080
+  content-type: application/x-www-form-urlencoded

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.source.yml

@@ -0,0 +1 @@
+--- http://postdata.net

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address/detect_sub_spec_files/http_get.target.yaml

@@ -0,0 +1,10 @@
+---
+ssl: false
+method: GET
+uri: "/"
+body: 
+headers:
+  user-agent: Faraday v2.7.4
+  accept-encoding: gzip,deflate
+  accept: "*/*"
+  host: localhost:8080

data/sub/avm/avm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.17'
+  s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
   s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.7'

data/sub/avm/lib/avm/data/package/build_directory.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/fs/temp'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      module BuildDirectory
+        private
+
+        attr_writer :build_directory
+
+        # @return [EacRubyUtils::Fs::Temp::Directory]
+        def build_directory
+          @build_directory || raise('@build_directory is blank')
+        end
+
+        def on_build_directory
+          ::EacRubyUtils::Fs::Temp.on_directory do |directory|
+            self.build_directory = directory
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/data/package/dump.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/build_directory'
 require 'avm/data/rotate'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
@@ -10,6 +11,7 @@ module Avm
       class Dump
         enable_speaker
         enable_listable
+        include ::Avm::Data::Package::BuildDirectory
 
         DEFAULT_EXPIRE_TIME = 1.day
         DEFAULT_FILE_EXTENSION = '.tar'
@@ -45,8 +47,10 @@ module Avm
         def run
           raise "Cannot run: #{cannot_run_reason}" unless runnable?
 
-          build_dir = dump_units_to_build_directory
-          package_file = create_package_file(build_dir)
+          package_file = on_build_directory do
+            dump_units_to_build_directory
+            create_package_file
+          end
           rotate
           move_download_to_final_dest(package_file)
         end
@@ -100,15 +104,13 @@ module Avm
         end
 
         def dump_units_to_build_directory
-          dir = ::Dir.mktmpdir
-          package.dump_units_to_directory(dir)
-          dir
+          package.dump_units_to_directory(build_directory)
         end
 
-        def create_package_file(build_dir)
+        def create_package_file
           package_path = new_build_path
-          infom "Creating package \"#{package_path}\" from \"#{build_dir}\"..."
-          Dir.chdir(build_dir) do
+          infom "Creating package \"#{package_path}\" from \"#{build_directory}\"..."
+          ::Dir.chdir(build_directory.to_path) do
             ::Minitar.pack('.', File.open(::File.expand_path(package_path), 'wb'))
           end
           package_path

data/sub/avm/lib/avm/data/package/load.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/build_directory'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
@@ -8,13 +9,9 @@ module Avm
     class Package
       class Load
         enable_speaker
+        include ::Avm::Data::Package::BuildDirectory
 
-        attr_reader :package, :data_file_path
-
-        def initialize(package, data_file_path)
-          @package = package
-          @data_file_path = data_file_path
-        end
+        common_constructor :package, :data_file_path
 
         def runnable?
           cannot_run_reason.blank?
@@ -29,8 +26,10 @@ module Avm
         def run
           raise "Cannot run: #{cannot_run_reason}" unless runnable?
 
-          build_dir = extract_packages_to_build_directory
-          package.load_units_from_directory(build_dir)
+          on_build_directory do
+            extract_packages_to_build_directory
+            package.load_units_from_directory(build_directory)
+          end
         end
 
         def data_file_exist?
@@ -38,9 +37,7 @@ module Avm
         end
 
         def extract_packages_to_build_directory
-          dir = ::Dir.mktmpdir
-          ::Minitar.unpack(data_file_path, dir)
-          dir
+          ::Minitar.unpack(data_file_path, build_directory.to_path)
         end
       end
     end

data/sub/avm/lib/avm/data/package.rb

@@ -18,8 +18,11 @@ module Avm
         end
       end
 
+      # @return [Avm::Data::Package] Return +self+.
       def add_unit(identifier, unit)
         units[identifier.to_sym] = unit
+
+        self
       end
 
       def dump(data_path, options = {})

data/sub/avm/lib/avm/data/unit.rb

@@ -46,6 +46,11 @@ module Avm
         end
       end
 
+      # @return [Struct(:key, :subpath), nil]
+      def installation_files_data
+        nil
+      end
+
       def load(data_path)
         run_callbacks :load do
           infom "Loading unit \"#{name}\" from \"#{data_path}\"..."

data/sub/avm/lib/avm/instances/data/files_unit.rb

@@ -39,10 +39,17 @@ module Avm
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
         end
 
+        # @return [Struct(:key, :subpath), nil]
+        def installation_files_data
+          return nil unless fs_path_subpath.relative?
+
+          ::Struct.new(:key, :subpath).new(fs_path_subpath.basename.to_path, fs_path_subpath)
+        end
+
         # @return [EacRubyUtils::Envs::Command]
         def instance_command(*args)
           args = ['sudo', '-Hu', sudo_user] + args if sudo_user.present?
-          instance.host_env.command(*args)
+          instance.host_env.command(*args).chdir('/')
         end
 
         # @return [String, nil]

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.66.1'
+  VERSION = '0.67.0'
 end

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

@@ -13,7 +13,7 @@ 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.14'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
   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/base.rb

@@ -9,7 +9,6 @@ module Avm
   module EacAsciidoctorBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
         AUTHOR_EMAIL_ENTRY_PATH = 'install.email'
         AUTHOR_NAME_ENTRY_PATH = 'install.name'
         AUTHOR_NAME_INITIALS_ENTRY_PATH = 'install.name_initials'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.18.0'
+    VERSION = '0.18.1'
   end
 end

data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.52'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -6,7 +6,6 @@ module Avm
   module EacLatexBase0
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
-        FILES_UNITS = {}.freeze
       end
     end
   end