eac_tools 0.40.0 → 0.42.0

data/sub/eac_fs/lib/eac_fs/comparator/build.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  class Comparator
+    class Build
+      TRUNCATE_FILE_CONTENT = "__TRUNCATED__\n"
+
+      enable_method_class
+      common_constructor :comparator, :root
+      delegate :rename_files, :truncate_files, to: :comparator
+
+      # @return [Hash]
+      def result
+        build(root)
+      end
+
+      private
+
+      def build(obj)
+        if obj.file?
+          build_file(obj)
+        elsif obj.directory?
+          build_directory(obj)
+        else
+          raise "Unknown filesystem object \"#{obj}\""
+        end
+      end
+
+      # @param dir [Pathname]
+      # @return [Hash]
+      def build_directory(dir)
+        dir.children.map do |child|
+          [fs_object_basename(child), build(child)]
+        end.to_h
+      end
+
+      # @param file [Pathname]
+      # @return [Hash]
+      def build_file(file)
+        truncate_file?(file) ? TRUNCATE_FILE_CONTENT : file.read
+      end
+
+      # @return [String]
+      def fs_object_basename(obj)
+        rename_files.inject(obj.basename.to_path) { |a, e| e.apply(a) }
+      end
+
+      def truncate_file?(file)
+        truncate_files.any? do |pattern|
+          file.basename.fnmatch?(pattern)
+        end
+      end
+    end
+  end
+end

data/sub/eac_fs/lib/eac_fs/comparator.rb

@@ -4,51 +4,15 @@ require 'eac_ruby_utils/core_ext'
 
 module EacFs
   class Comparator
-    require_sub __FILE__
-
-    TRUNCATE_FILE_CONTENT = "__TRUNCATED__\n"
+    require_sub __FILE__, require_dependency: true
 
     enable_immutable
     immutable_accessor :rename_file, :truncate_file, type: :array
 
-    # @return [Hash]
-    def build(obj)
-      if obj.file?
-        build_file(obj)
-      elsif obj.directory?
-        build_directory(obj)
-      else
-        raise "Unknown filesystem object \"#{obj}\""
-      end
-    end
-
     alias rename_file_push rename_file
 
     def rename_file(from, to)
       rename_file_push(::EacFs::Comparator::RenameFile.new(from, to))
     end
-
-    private
-
-    # @param dir [Pathname]
-    # @return [Hash]
-    def build_directory(dir)
-      dir.children.map do |child|
-        [fs_object_basename(child), build(child)]
-      end.to_h
-    end
-
-    # @param file [Pathname]
-    # @return [Hash]
-    def build_file(file)
-      return TRUNCATE_FILE_CONTENT if truncate_files.include?(file.basename.to_path)
-
-      file.read
-    end
-
-    # @return [String]
-    def fs_object_basename(obj)
-      rename_files.inject(obj.basename.to_path) { |a, e| e.apply(a) }
-    end
   end
 end

data/sub/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/rspec/stub_speaker'
+require 'eac_ruby_utils/speaker'
 
 module EacRubyUtils
   module Rspec
@@ -13,6 +15,13 @@ module EacRubyUtils
         obj.rspec_config.setup_manager = obj
         obj.rspec_config.include(::EacRubyUtils::Rspec::Setup::SetupManager)
       end
+
+      # @return [self]
+      def stub_eac_speaker
+        ::EacRubyUtils::Speaker.context.push(::EacRubyUtils::Rspec::StubSpeaker.new)
+
+        self
+      end
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb

@@ -28,8 +28,7 @@ module EacRubyUtils
 
       def value
         parsed_options.order.each do |method|
-          value = send("value_by_#{method}")
-          return value if value
+          return send("value_by_#{method}") if send("value_by_#{method}?")
         end
         return parsed_options.default if parsed_options.respond_to?(OPTION_DEFAULT)
         return nil unless parsed_options.required
@@ -39,16 +38,26 @@ module EacRubyUtils
 
       def value_by_constant
         source.class.const_get(constant_name)
-      rescue NameError
-        nil
+      end
+
+      def value_by_constant?
+        source.class.const_defined?(constant_name)
       end
 
       def value_by_method
-        source.respond_to?(key, true) ? source.send(key) : nil
+        source.send(key)
+      end
+
+      def value_by_method?
+        source.respond_to?(key, true)
       end
 
       def value_by_settings_object
-        source.settings_object[key.to_s] || source.settings_object[key.to_sym]
+        source.settings_object.fetch(key)
+      end
+
+      def value_by_settings_object?
+        source.settings_object.key?(key)
       end
 
       private

data/sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support/hash_with_indifferent_access'
 require 'eac_ruby_utils/require_sub'
 
 module EacRubyUtils
@@ -15,8 +16,11 @@ module EacRubyUtils
       %w[settings_object method constant]
     end
 
+    # return [ActiveSupport::HashWithIndifferentAccess]
     def settings_object
-      respond_to?(settings_object_name) ? send(settings_object_name) : {}
+      ActiveSupport::HashWithIndifferentAccess.new(
+        respond_to?(settings_object_name) ? send(settings_object_name) : {}
+      )
     end
 
     def settings_object_name

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.106.1'
+  VERSION = '0.107.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb

@@ -16,6 +16,10 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
         'method_b'
       end
 
+      def key_f
+        nil
+      end
+
       def settings
         { 'key_b' => 'setting_b', key_c: 'setting_c' }
       end
@@ -33,9 +37,12 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
       [:key_b] => 'setting_b',
       ['key_b', { order: %w[constant method settings_object] }] => 'method_b',
       ['key_c'] => 'setting_c',
-      ['key_d'] => 'constant_d'
+      ['key_d'] => 'constant_d',
+      ['key_f'] => nil
     }.each do |args, expected_value|
-      it { expect(stub.setting_value(*args)).to eq(expected_value) }
+      context "when args are \"#{args}\"" do
+        it { expect(stub.setting_value(*args)).to eq(expected_value) }
+      end
     end
 
     it do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0.55'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -148,20 +148,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +165,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,7 +175,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -228,20 +222,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +305,10 @@ files:
 - 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
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/base.rb
+- 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/header_macro_value.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/runners.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners/base.rb
@@ -324,17 +316,22 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/base.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb
 - 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/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
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec_files/doc1.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec_files/doc2.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec_files/doc2/doc2_1.html
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec_files/index.html
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec.rb
-- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/index.adoc
+- sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc
 - sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/base_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/rubocop_spec.rb
 - sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb
-- sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/index.adoc
+- sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc
 - sub/avm-eac_generic_base0/Gemfile
 - sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec
 - sub/avm-eac_generic_base0/lib/avm/eac_generic_base0.rb
@@ -587,6 +584,10 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base/rubocop.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/dependencies.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/gemfile_lock.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/options.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/version_builder.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundle_command.rb
@@ -1003,6 +1004,7 @@ files:
 - sub/avm/lib/avm/instances/base/web.rb
 - sub/avm/lib/avm/instances/docker_image.rb
 - sub/avm/lib/avm/instances/entry_keys.rb
+- sub/avm/lib/avm/instances/ids.rb
 - sub/avm/lib/avm/instances/runner.rb
 - sub/avm/lib/avm/launcher.rb
 - sub/avm/lib/avm/launcher/context.rb
@@ -1169,6 +1171,7 @@ files:
 - sub/eac_config/eac_config.gemspec
 - sub/eac_config/lib/eac_config.rb
 - sub/eac_config/lib/eac_config/entry.rb
+- sub/eac_config/lib/eac_config/entry/not_found_error.rb
 - sub/eac_config/lib/eac_config/entry_path.rb
 - sub/eac_config/lib/eac_config/envvars_node.rb
 - sub/eac_config/lib/eac_config/envvars_node/entry.rb
@@ -1230,6 +1233,7 @@ files:
 - sub/eac_fs/lib/eac_fs.rb
 - sub/eac_fs/lib/eac_fs/cached_download.rb
 - sub/eac_fs/lib/eac_fs/comparator.rb
+- sub/eac_fs/lib/eac_fs/comparator/build.rb
 - sub/eac_fs/lib/eac_fs/comparator/rename_file.rb
 - sub/eac_fs/lib/eac_fs/contexts.rb
 - sub/eac_fs/lib/eac_fs/file_info.rb

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'asciidoctor'
-
-module Avm
-  module EacAsciidoctorBase0
-    module Sources
-      class Build
-        class File
-          enable_speaker
-          common_constructor :build, :subpath
-
-          def run
-            infov 'Building', subpath
-            ::Asciidoctor.convert_file source_path.to_path,
-                                       to_file: target_path.to_path, safe: :unsafe, mkdirs: true
-          end
-
-          def source_path
-            build.project.path.join(subpath)
-          end
-
-          def target_path
-            build.target_directory.join(subpath).basename_sub('.*') { |b| "#{b}.html" }
-          end
-        end
-      end
-    end
-  end
-end