avm 0.43.0 → 0.45.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da90158349f77578925f4185dcf817f3d086ba8939cf6fe2a0057d5acebce8d6
-  data.tar.gz: 68bdb121438447bb34a59526adb61af042922a59f0d31226cae3ad10c9b66bf4
+  metadata.gz: edce5f54d8e35b2991eca7c296980c8102a3f9de6079df2c3841660d91a5a09a
+  data.tar.gz: 1f3bb4e92e4a1d342490b54843f505c641479eec2af609dfb5c70ee81de4101f
 SHA512:
-  metadata.gz: 6842223c4c7006bad23a1b1bd283b389ca20fdb63acb2a6264a84cf737fefc43406167cedfab09843aaddb7620295b1b1fb70b445ce517bd7752ebd0e66982fe
-  data.tar.gz: c4d9bd5b0994d480ae7ff9b8a48edfdfb1fd20b849c5cd99adee4fb3e6ff645b7dbeba8092771b475e6284254f13109340f0c7d58eb8ccdf0a97d9f2d1ba0b86
+  metadata.gz: 2f827370664e3b78a4808a57227b5791da8a9185522a11081a6d50f05493648135e0734a680f2abbc1fc902775249f4011cad1f669bef8f6127258edd7b357f9
+  data.tar.gz: c95a5acd8db7c9c8ceb104cd203c9a30bdd1438de79309869cac1c3ed1ab1d8178b91f42b436a63ec312a54fe6ef9166c9f7395d26b35b826633856f7d43af03

data/lib/avm/entries/auto_values/entry.rb

@@ -8,15 +8,22 @@ module Avm
     module AutoValues
       class Entry
         class << self
-          def auto_value_method_name(suffix)
-            "auto_#{suffix.to_s.gsub('.', '_')}"
+          # @param path [EacConfig::EntryPath]
+          # @return String
+          def auto_value_method_name(path)
+            "auto_#{::EacConfig::EntryPath.assert(path).to_string.gsub('.', '_')}"
           end
         end
 
-        common_constructor :entries_provider, :suffix
+        # @!method initialize(entries_provider, path)
+        #   @param entries_provider
+        #   @param path [EacConfig::EntryPath]
+        common_constructor :entries_provider, :path do
+          self.path = ::EacConfig::EntryPath.assert(path)
+        end
 
         def auto_value_method
-          self.class.auto_value_method_name(suffix)
+          self.class.auto_value_method_name(path)
         end
 
         def found?

data/lib/avm/entries/base/uri_components_entries_values/component_factory.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class ComponentFactory
+          enable_method_class
+          common_constructor :owner, :component
+
+          def result
+            component_class.new(owner, component)
+          end
+
+          def component_class
+            specific_class || generic_class
+          end
+
+          def generic_class
+            parent_class.const_get('GenericComponent')
+          end
+
+          def parent_class
+            ::Avm::Entries::Base::UriComponentsEntriesValues
+          end
+
+          def specific_class
+            return nil unless parent_class.const_defined?(specific_class_basename)
+
+            parent_class.const_get(specific_class_basename)
+          end
+
+          def specific_class_basename
+            [component, 'component'].join('_').camelize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/generic_component.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class GenericComponent
+          common_constructor :owner, :component
+          delegate :entries_provider_class, :prefix, to: :owner
+
+          def auto_method_name
+            ['auto', component_method_name].join('_')
+          end
+
+          def component_method_name
+            [prefix, component].join('_')
+          end
+
+          def define_auto_method(&block)
+            entries_provider_class.define_method(auto_method_name, &block)
+          end
+
+          def define_inherited_value_proc_method(&block)
+            entries_provider_class.define_method(inherited_value_proc_name, &block)
+          end
+
+          def entry_key_path
+            ::EacConfig::EntryPath.assert([prefix, component])
+          end
+
+          def id_component
+            @id_component ||= owner.component_factory('id')
+          end
+
+          def inherited_value_proc_name
+            [component_method_name, 'inherited_value_proc'].join('_')
+          end
+
+          def setup
+            outer_self = self
+            define_auto_method do
+              uri_component_entry_value(outer_self.entry_key_path.to_string)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/path_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class PathComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            super
+            define_inherited_value_proc_method { |value| value + '/' + id }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values/url_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class UrlComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            outer_self = self
+            define_auto_method do
+              inherited_entry_value(outer_self.id_component.entry_key_path.to_string,
+                                    outer_self.entry_key_path.to_string) ||
+                outer_self.auto_install_url_by_parts(self)
+            end
+          end
+
+          def auto_install_url_by_parts(entries_provider)
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(entries_provider, 'install').value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base/uri_components_entries_values.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        require_sub __FILE__
+        common_constructor :entries_provider_class, :prefix, :extra_fields
+
+        ENTRIES_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
+
+        def fields
+          ENTRIES_FIELDS + extra_fields
+        end
+
+        def result
+          fields.map { |field| component_factory(field).setup }
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/base.rb

@@ -7,6 +7,13 @@ module Avm
   module Entries
     module Base
       require_sub __FILE__, require_dependency: true
+      common_concern
+
+      module ClassMethods
+        def uri_components_entries_values(prefix, extra_fields = [])
+          ::Avm::Entries::Base::UriComponentsEntriesValues.new(self, prefix, extra_fields).result
+        end
+      end
 
       def entries_provider_id
         id

data/lib/avm/entries/jobs/base.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/with_variables_source'
+require 'avm/result'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      module Base
+        common_concern do
+          include ::ActiveSupport::Callbacks
+          include ::Avm::Entries::Jobs::WithVariablesSource
+
+          enable_speaker
+          enable_simple_cache
+          enable_listable
+          common_constructor :instance, :options, default: [{}] do
+            if option_list.present?
+              self.options = option_list.hash_keys_validate!(options.symbolize_keys)
+            end
+          end
+          define_callbacks(*jobs)
+        end
+
+        module ClassMethods
+          def jobs
+            const_get('JOBS').dup
+          end
+        end
+
+        module InstanceMethods
+          def option_list
+            nil
+          end
+
+          def run
+            start_banner if respond_to?(:start_banner)
+            run_jobs
+            ::Avm::Result.success('Done!')
+          rescue ::Avm::Result::Error => e
+            e.to_result
+          end
+
+          protected
+
+          def run_jobs
+            jobs.each do |job|
+              run_callbacks job do
+                send(job)
+              end
+            end
+          end
+
+          def jobs
+            self.class.jobs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/jobs/variables_source/read_entry.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        class ReadEntry
+          enable_method_class
+          common_constructor :variables_source, :path, :options, default: [{}]
+          delegate :instance, :job, to: :variables_source
+
+          def result
+            return result_from_job if result_from_job?
+            return result_from_instance_method if result_from_instance_method?
+
+            result_from_instance_entry
+          end
+
+          private
+
+          def path_method_name
+            path.gsub('.', '_').underscore
+          end
+
+          def result_from_instance_entry
+            instance.read_entry(path, options)
+          end
+
+          def result_from_instance_method
+            instance.send(path_method_name)
+          end
+
+          def result_from_instance_method?
+            instance.respond_to?(path_method_name, true)
+          end
+
+          def result_from_job
+            job.send(path_method_name)
+          end
+
+          def result_from_job?
+            job.respond_to?(path_method_name, true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/jobs/variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Jobs
+      class VariablesSource
+        require_sub __FILE__, require_dependency: true
+        common_constructor :job
+        delegate :instance, to: :job
+      end
+    end
+  end
+end

data/lib/avm/entries/jobs/with_variables_source.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/variables_source'
+
+module Avm
+  module Entries
+    module Jobs
+      module WithVariablesSource
+        def variables_source
+          ::Avm::Entries::Jobs::VariablesSource.new(self)
+        end
+      end
+    end
+  end
+end

data/lib/avm/{jobs.rb → entries/jobs.rb}

@@ -3,7 +3,9 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Jobs
-    require_sub __FILE__
+  module Entries
+    module Jobs
+      require_sub __FILE__
+    end
   end
 end

data/lib/avm/entries/keys_constants_set.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class KeysConstantsSet
+      common_constructor :entries_provider_class, :prefix, :suffixes
+
+      # @return [Array<String>]
+      def result
+        if suffixes.is_a?(::Hash)
+          keys_consts_set_from_hash
+        elsif suffixes.is_a?(::Enumerable)
+          keys_consts_set_from_enum
+        else
+          raise "Unmapped suffixes class: #{suffixes.class}"
+        end
+      end
+
+      private
+
+      # @return [String]
+      def key_const_set(prefix, suffix)
+        key = [prefix, suffix].reject(&:blank?).join('.')
+        entries_provider_class.const_set(key.gsub('.', '_').upcase, key)
+        key
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_enum
+        suffixes.map { |suffix| key_const_set(prefix, suffix) }
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_hash
+        suffixes.flat_map do |k, v|
+          self.class.new(entries_provider_class, prefix.to_s + (k.blank? ? '' : ".#{k}"), v).result
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base/entry_keys.rb

@@ -13,7 +13,7 @@ module Avm
           end
 
           define_method "#{method_name}_optional" do
-            read_entry(key, required: false)
+            read_entry_optional(key)
           end
         end
       end

data/lib/avm/instances/base/install.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Install
+        common_concern do
+          uri_components_entries_values 'install', %w[data_path email groupname]
+        end
+
+        def install_data_path_inherited_value_proc(value)
+          value + '/' + id
+        end
+
+        def install_groupname_default_value
+          read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base/web.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Web
+        common_concern do
+          uri_components_entries_values 'web'
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base.rb

@@ -12,8 +12,8 @@ module Avm
       enable_abstract_methods
       enable_listable
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
+      require_sub __FILE__, include_modules: true
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 

data/lib/avm/instances/entry_keys.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/keys_constants_set'
 require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
@@ -14,19 +15,7 @@ module Avm
         end
 
         def keys_consts_set(prefix, suffixes)
-          if suffixes.is_a?(::Hash)
-            keys_consts_set_from_hash(prefix, suffixes)
-          elsif suffixes.is_a?(::Enumerable)
-            keys_consts_set_from_enum(prefix, suffixes)
-          else
-            raise "Unmapped suffixes class: #{suffixes.class}"
-          end
-        end
-
-        def key_const_set(prefix, suffix)
-          key = [prefix, suffix].reject(&:blank?).join('.')
-          const_set(key.gsub('.', '_').upcase, key)
-          all_keys << key
+          all_keys.merge(::Avm::Entries::KeysConstantsSet.new(self, prefix, suffixes).result)
         end
 
         private
@@ -34,14 +23,6 @@ module Avm
         def all_keys
           @all_keys ||= ::Set.new
         end
-
-        def keys_consts_set_from_enum(prefix, suffixes)
-          suffixes.each { |suffix| key_const_set(prefix, suffix) }
-        end
-
-        def keys_consts_set_from_hash(prefix, suffixes)
-          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
-        end
       end
 
       {
@@ -54,7 +35,7 @@ module Avm
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]
         },
-        web: URI_FIELDS + %w[authority userinfo]
+        web: URI_FIELDS
       }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end

data/lib/avm/rspec/setup.rb

@@ -5,17 +5,16 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Rspec
     module Setup
-      def self.extended(obj)
-        obj.setup_in_avm_registry_example
-        obj.setup_not_in_avm_registry_example
-      end
+      EXAMPLES = %w[entries_values in_avm_registry not_in_avm_registry].freeze
 
-      def setup_in_avm_registry_example
-        require 'avm/rspec/shared_examples/in_avm_registry'
+      def self.extended(obj)
+        obj.setup_examples
       end
 
-      def setup_not_in_avm_registry_example
-        require 'avm/rspec/shared_examples/not_in_avm_registry'
+      def setup_examples
+        EXAMPLES.each do |example|
+          require "avm/rspec/shared_examples/#{example}"
+        end
       end
     end
   end

data/lib/avm/rspec/shared_examples/entries_values.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'entries_values' do |spec_file, expected_values|
+  describe '#read_entry' do
+    config_path = spec_file.to_pathname
+    config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
+    ::EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, config_path)
+
+    expected_values.each do |instance_id, values|
+      values.each do |input, expected|
+        context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
+          let(:instance) { described_class.by_id(instance_id) }
+
+          it ".read_entry should return \"#{expected}\"" do
+            expect(instance.read_entry(input)).to eq(expected)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.8
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +73,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,21 +83,21 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +107,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +117,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +235,18 @@ files:
 - lib/avm/entries/base/uri_component_entry_value/default_value.rb
 - lib/avm/entries/base/uri_component_entry_value/inherited_value.rb
 - lib/avm/entries/base/uri_component_entry_value/url_entry_value.rb
+- lib/avm/entries/base/uri_components_entries_values.rb
+- lib/avm/entries/base/uri_components_entries_values/component_factory.rb
+- lib/avm/entries/base/uri_components_entries_values/generic_component.rb
+- lib/avm/entries/base/uri_components_entries_values/path_component.rb
+- lib/avm/entries/base/uri_components_entries_values/url_component.rb
 - lib/avm/entries/entry.rb
+- lib/avm/entries/jobs.rb
+- lib/avm/entries/jobs/base.rb
+- lib/avm/entries/jobs/variables_source.rb
+- lib/avm/entries/jobs/variables_source/read_entry.rb
+- lib/avm/entries/jobs/with_variables_source.rb
+- lib/avm/entries/keys_constants_set.rb
 - lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
 - lib/avm/instances.rb
@@ -249,19 +254,16 @@ files:
 - lib/avm/instances/base/auto_values.rb
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
-- lib/avm/instances/base/auto_values/install.rb
 - lib/avm/instances/base/auto_values/mailer.rb
 - lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
-- lib/avm/instances/base/auto_values/web.rb
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb
+- lib/avm/instances/base/install.rb
+- lib/avm/instances/base/web.rb
 - lib/avm/instances/docker_image.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/instances/runner.rb
-- lib/avm/jobs.rb
-- lib/avm/jobs/base.rb
-- lib/avm/jobs/variables_source.rb
 - lib/avm/launcher/errors/base.rb
 - lib/avm/launcher/errors/non_project.rb
 - lib/avm/launcher/paths/real.rb
@@ -282,6 +284,7 @@ files:
 - lib/avm/result.rb
 - lib/avm/rspec.rb
 - lib/avm/rspec/setup.rb
+- lib/avm/rspec/shared_examples/entries_values.rb
 - lib/avm/rspec/shared_examples/in_avm_registry.rb
 - lib/avm/rspec/shared_examples/not_in_avm_registry.rb
 - lib/avm/runners/base.rb

data/lib/avm/instances/base/auto_values/install.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/entries/uri_builder'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Install
-          (::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[data_path email groupname])
-            .each do |component|
-            method_suffix = "install_#{component}"
-            define_method "auto_#{method_suffix}" do
-              uri_component_entry_value(
-                ::Avm::Instances::EntryKeys.const_get(method_suffix.underscore.upcase)
-              )
-            end
-          end
-
-          def auto_install_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
-                                  ::Avm::Instances::EntryKeys::INSTALL_URL) ||
-              auto_install_url_by_parts
-          end
-
-          def auto_install_url_by_parts
-            require 'avm/entries/auto_values/uri_entry'
-            ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
-          end
-
-          def install_data_path_inherited_value_proc(value)
-            value + '/' + id
-          end
-
-          def install_groupname_default_value
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-          end
-
-          def install_path_inherited_value_proc(value)
-            install_data_path_inherited_value_proc(value)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/instances/base/auto_values/web.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'addressable'
-require 'avm/instances/entry_keys'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Web
-          def auto_web_authority
-            web_url_as_uri(&:authority)
-          end
-
-          def auto_web_hostname
-            web_url_as_uri(&:host)
-          end
-
-          def auto_web_path
-            web_url_as_uri(&:path)
-          end
-
-          def auto_web_port
-            web_url_as_uri(&:port)
-          end
-
-          def auto_web_scheme
-            web_url_as_uri(&:scheme)
-          end
-
-          def auto_web_userinfo
-            web_url_as_uri(&:userinfo)
-          end
-
-          private
-
-          def web_url_as_uri
-            read_entry_optional(::Avm::Instances::EntryKeys::WEB_URL).if_present do |v|
-              yield(::Addressable::URI.parse(v))
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/jobs/base.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/jobs/variables_source'
-require 'avm/result'
-require 'eac_cli/core_ext'
-
-module Avm
-  module Jobs
-    module Base
-      common_concern do
-        include ::ActiveSupport::Callbacks
-
-        enable_speaker
-        enable_simple_cache
-        enable_listable
-        common_constructor :instance, :options, default: [{}] do
-          if option_list.present?
-            self.options = option_list.hash_keys_validate!(options.symbolize_keys)
-          end
-        end
-        define_callbacks(*jobs)
-      end
-
-      module ClassMethods
-        def jobs
-          const_get('JOBS').dup
-        end
-      end
-
-      module InstanceMethods
-        def option_list
-          nil
-        end
-
-        def run
-          start_banner if respond_to?(:start_banner)
-          run_jobs
-          ::Avm::Result.success('Done!')
-        rescue ::Avm::Result::Error => e
-          e.to_result
-        end
-
-        def variables_source
-          ::Avm::Jobs::VariablesSource.new(self, instance)
-        end
-
-        protected
-
-        def run_jobs
-          jobs.each do |job|
-            run_callbacks job do
-              send(job)
-            end
-          end
-        end
-
-        def jobs
-          self.class.jobs
-        end
-      end
-    end
-  end
-end

data/lib/avm/jobs/variables_source.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Jobs
-    class VariablesSource
-      common_constructor :job, :instance
-
-      def read_entry(path, options = {})
-        entry_from_job(path) || instance.read_entry(path, options)
-      end
-
-      private
-
-      def entry_from_job(path)
-        method = path.gsub('.', '_').underscore
-        return job.send(method) if job.respond_to?(method, true)
-      end
-    end
-  end
-end