avm 0.7.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be29c02f4be9deec23c40452cf17ad0ce0478c6ae32508690d0a54bc9c4987a
-  data.tar.gz: e63f5d086715190a1803f4289a48f9e25e56094d570d62f6ed5c22b0ceeb6084
+  metadata.gz: 4bc589fce7e7ecab9f13ac06d9f48990995ae1709ad593cb9a18053715f46508
+  data.tar.gz: a0e0fd0693719a46d2bd3d943b70cf13cef07ab89e96961a4f60f2fec343d3de
 SHA512:
-  metadata.gz: 372b53edca7fe1187fa0faa39e145437779a3608b7ce7d248b2d5fe753520079c0542dda99a80b4936f09438f6bda1fceebdb78ce1b741e14854f10160468085
-  data.tar.gz: 02bd6cdb0cdb4f02e7a202d69de40ca2c5f1c981af6198e8ce1e93b36380b0d39a436d36a358e58856675df9e040080ad6879367e013228cd6bfa3efb3e66735
+  metadata.gz: 767b4cb523ef822a6a58a799efb5f839cd22c5dd251abd7d25267c45cb7d8fdb52fddd177c02cd7bf2866f73c555a3ad840394611d5817cc5339ead385eab4c4
+  data.tar.gz: 450c6420ff3864834e4e1cc1191671d7f655c34be7deb60131fbf19651c9e07dff056d73646bd483f8cccec62bcbe1134771d3968030daae4a3d36ef110cf94e

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

@@ -7,6 +7,7 @@ module Avm
     class Base
       module AutoValues
         module Database
+          DEFAULT_EXTRA = ''
           DEFAULT_HOSTNAME = '127.0.0.1'
           DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
@@ -18,6 +19,10 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
           DEFAULT_TIMEOUT = 5000
 
+          def auto_database_extra
+            database_auto_common('hostname') || DEFAULT_EXTRA
+          end
+
           def auto_database_name
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID,
                                   ::Avm::Instances::EntryKeys::DATABASE_NAME) || id

data/lib/avm/instances/entry_keys.rb

@@ -43,7 +43,7 @@ module Avm
 
       {
         '' => %w[fs_path host_id source_instance_id],
-        database: %w[id hostname limit name password port system timeout username],
+        database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
         mailer: {
           '' => %w[id from reply_to],

data/lib/avm/instances/runner.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'avm/runners/base'
 require 'eac_cli/core_ext'
 
 module Avm
   module Instances
-    class Runner
+    class Runner < ::Avm::Runners::Base
       class << self
         def instance_class
           ::Avm.const_get(stereotype_name).const_get('Instance')

data/lib/avm/registry/base.rb

@@ -12,11 +12,11 @@ module Avm
       def detect(*registered_initialize_args)
         detect_optional(*registered_initialize_args) ||
           raise("No registered module valid for #{registered_initialize_args}" \
-            " (Module suffix: #{module_suffix})")
+            " (Module suffix: #{module_suffix}, Available: #{registered_modules.join(', ')})")
       end
 
       def detect_optional(*registered_initialize_args)
-        registered_modules.lazy.map { |klass| klass.new(*registered_initialize_args) }
+        registered_modules.reverse.lazy.map { |klass| klass.new(*registered_initialize_args) }
                           .find(&:valid?)
       end
 
@@ -39,18 +39,20 @@ module Avm
       private
 
       def registered_modules_uncached
-        (single_registered_modules + provider_registered_modules)
-          .select { |v| valid_registered_module?(v) }.uniq.sort_by { |s| [s.name] }
+        registered_gems.flat_map { |registry| modules_from_registry(registry) }
+                       .select { |v| valid_registered_module?(v) }.uniq
       end
 
-      def single_registered_modules
-        single_instance_registry.registered.map(&:registered_module)
+      def modules_from_registry(registry)
+        if registry.registry.module_suffix == provider_module_suffix
+          registry.registered_module.new.all
+        else
+          [registry.registered_module]
+        end
       end
 
-      def provider_registered_modules
-        provider_registry.registered.map(&:registered_module).flat_map do |provider_class|
-          provider_class.new.all
-        end
+      def registered_gems
+        (single_instance_registry.registered + provider_registry.registered).sort
       end
 
       def single_instance_registry_uncached

data/lib/avm/registry.rb

@@ -7,7 +7,7 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :source_stereotypes
+    lists.add_symbol :category, :instance_stereotypes, :runners, :scms, :sources
 
     class << self
       enable_simple_cache

data/lib/avm/runners/base.rb

@@ -19,10 +19,6 @@ module Avm
 
       delegate :command_argument, :stereotype_name, to: :class
 
-      runner_with :help, :subcommands do
-        subcommands
-      end
-
       def to_s
         stereotype_name
       end

data/lib/avm/scms/base.rb

@@ -20,6 +20,11 @@ module Avm
         self.class.name.demodulize
       end
 
+      # @return [Enumerable<Avm::Scms::Base>]
+      def subs
+        raise_abstract_method __method__
+      end
+
       def to_s
         name
       end

data/lib/avm/scms/inflector.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module Scms
+    class Inflector
+      class << self
+        def default_instance
+          @default_instance ||= new
+        end
+      end
+
+      ISSUE_POINTER_NAME_PREFIX = 'issue_'
+      POINTER_NAME_TO_ISSUE_PATTERN = /\A#{Regexp.quote(ISSUE_POINTER_NAME_PREFIX)}(\d+)\z/.freeze
+      POINTER_NAME_TO_ISSUE_PARSER = POINTER_NAME_TO_ISSUE_PATTERN.to_parser { |m| m[1] }
+
+      # @return [String, nil]
+      def pointer_name_to_issue_id(pointer_name)
+        POINTER_NAME_TO_ISSUE_PARSER.parse(pointer_name)
+      end
+    end
+  end
+end

data/lib/avm/sources/base/configuration.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/yaml'
+require 'shellwords'
+
+module Avm
+  module Sources
+    class Base
+      module Configuration
+        # @return [Array<String>, nil]
+        def read_configuration_as_shell_words(key)
+          configuration[key].if_present do |v|
+            v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v.to_s)
+          end
+        end
+
+        private
+
+        # @return [Hash]
+        def configuration_uncached
+          ::Avm::Sources::Configuration::FILENAMES.each do |filename|
+            file_path = path.join(filename)
+            return ::EacRubyUtils::Yaml.load_file(file_path).with_indifferent_access if
+            file_path.exist?
+          end
+          {}
+        end
+
+        # @return [Avm::Sources::Configuration]
+        def old_configuration_uncached
+          ::Avm::Sources::Configuration.find_in_path(path)
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/base/testing.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Testing
+        # @return [Avm::Sources::Tester]
+        def tester
+          tester_class.new(self)
+        end
+
+        # @return [Class<Avm::Sources::Tester>
+        def tester_class
+          Avm::Sources::Tester
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/base.rb

@@ -7,16 +7,20 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Sources
     class Base
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
+      compare_by :path
+      enable_abstract_methods
       enable_simple_cache
       enable_listable
       lists.add_symbol :option, :parent
       common_constructor :path, :options, default: [{}] do
-        self.path = path.to_pathname
-        self.options = self.class.lists.option.hash_keys_validate!(options)
+        self.path = path.to_pathname.expand_path
+        self.options = ::Avm::Sources::Base.lists.option.hash_keys_validate!(options)
       end
 
-      delegate :locale, to: :configuration
+      abstract_methods :update, :valid?
+
+      delegate :locale, to: :old_configuration
       delegate :to_s, to: :path
 
       # @return [Avm::Sources::Base]
@@ -33,35 +37,15 @@ module Avm
 
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
-        git_repo.subrepos
-                .map { |subrepo| self.class.new(subrepo.subpath.expand_path(path), parent: self) }
-      end
-
-      def update
-        stereotype.update_source(self)
+        scm.subs.map { |subrepo| self.class.new(subrepo.path, parent: self) }
       end
 
       private
 
-      # @return [Avm::Sources::Configuration]
-      def configuration_uncached
-        ::Avm::Sources::Configuration.find_in_path(path) || ::Avm::Sources::Configuration.new
-      end
-
-      # @return [EacGit::Local]
-      def git_repo_uncached
-        ::EacGit::Local.new(path)
-      end
-
       # @return [Avm::Scms::Base]
       def scm_uncached
         ::Avm::Registry.scms.detect(path)
       end
-
-      # @return [Avm::SourceStereotypes::Base]
-      def stereotype_uncached
-        ::Avm::Registry.source_stereotypes.detect(self)
-      end
     end
   end
 end

data/lib/avm/sources/tester.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Tester
+      enable_abstract_methods
+      common_constructor :source
+
+      abstract_methods :result, :logs
+
+      # @return [EacFs::Logs]
+      def logs
+        raise_abstract_method __method__
+      end
+
+      # @return [Avm::Sources::Tests::Result]
+      def result
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

data/lib/avm/sources/tests/builder.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'avm/sources/tests/performer'
+require 'avm/sources/tests/single'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module Tests
+      class Builder
+        require_sub __FILE__
+        enable_immutable
+
+        immutable_accessor :include_main, :include_subs, type: :boolean
+        immutable_accessor :include_id, type: :array
+        common_constructor :main_source
+
+        def immutable_constructor_args
+          [main_source]
+        end
+
+        # @return [Avm::Sources::Tests::Performer]
+        def performer
+          ::Avm::Sources::Tests::Performer.new(self)
+        end
+
+        def selected_units
+          (select_units_from_subs + select_units_from_main + select_units_from_ids).sort.uniq
+        end
+
+        private
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def available_units
+          @available_units ||= ([main_source] + main_source.subs)
+                               .map { |a_source| create_unit(a_source) }
+        end
+
+        def available_units_from_main
+          create_units([main_source])
+        end
+
+        def available_units_from_subs
+          create_units(main_source.subs)
+        end
+
+        # @return [Avm::Sources::Tests::Single]
+        def create_unit(source)
+          ::Avm::Sources::Tests::Single.new(self, source)
+        end
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def create_units(sources)
+          sources.map { |a_source| create_unit(a_source) }
+        end
+
+        # @return [Avm::Sources::Tests::Single]
+        def create_unit_by_id(source_id)
+          r = available_units.find { |unit| unit.id == source_id }
+          return r if r
+
+          raise ::ArgumentError, "Source not found with ID=#{source_id}" \
+            "(Available: #{available_units.map(&:id).join(', ')})"
+        end
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def select_units_from_ids
+          include_ids.map { |source_id| create_unit_by_id(source_id) }
+        end
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def select_units_from_main
+          include_main? ? available_units_from_main : []
+        end
+
+        # @return [Array<Avm::Sources::Tests::Single>]
+        def select_units_from_subs
+          include_subs? ? available_units_from_subs : []
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/tests/performer.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/sources/tests/result'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module Tests
+      class Performer
+        enable_simple_cache
+
+        common_constructor(:owner)
+
+        def non_failed_units
+          units.reject(&:failed?)
+        end
+
+        def failed_units
+          units.select(&:failed?)
+        end
+
+        # @return [Boolean]
+        def successful?
+          failed_units.none?
+        end
+
+        protected
+
+        def units_uncached
+          owner.selected_units
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/tests/result.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_cli/enum'
+
+module Avm
+  module Sources
+    module Tests
+      class Result < ::EacCli::Enum
+        enum :failed, :red
+        enum :nonexistent, :white
+        enum :sucessful, :green
+      end
+    end
+  end
+end

data/lib/avm/sources/tests/single.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/sources/tests/result'
+require 'eac_ruby_utils/core_ext'
+require 'eac_fs/logs'
+
+module Avm
+  module Sources
+    module Tests
+      class Single
+        MAIN_SOURCE_ID = '#main'
+
+        compare_by :order_group, :id
+        enable_simple_cache
+        enable_speaker
+
+        common_constructor :builder, :source
+
+        delegate :logs, :result, to: :tester
+        delegate :to_s, to: :id
+
+        def failed?
+          result == ::Avm::Sources::Tests::Result::FAILED
+        end
+
+        # @return [String]
+        def id
+          if main?
+            MAIN_SOURCE_ID
+          else
+            relative_path_from_main_source.to_s
+          end
+        end
+
+        def main?
+          relative_path_from_main_source.to_s == '.'
+        end
+
+        def order_group
+          main? ? 1 : 0
+        end
+
+        # @return [Pathname]
+        def relative_path_from_main_source
+          source.path.relative_path_from(builder.main_source.path)
+        end
+
+        private
+
+        def tester_uncached
+          source.tester
+        end
+      end
+    end
+  end
+end

data/lib/avm/sources/tests.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    module Tests
+      require_sub __FILE__
+    end
+  end
+end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +230,24 @@ files:
 - lib/avm/runners/base.rb
 - lib/avm/scms/base.rb
 - lib/avm/scms/commit.rb
+- lib/avm/scms/inflector.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
-- lib/avm/source_stereotypes/base.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
+- lib/avm/sources/base/configuration.rb
+- lib/avm/sources/base/testing.rb
 - lib/avm/sources/configuration.rb
 - lib/avm/sources/configuration/_locale.rb
 - lib/avm/sources/configuration/_rubocop.rb
 - lib/avm/sources/configuration/_tests.rb
+- lib/avm/sources/tester.rb
+- lib/avm/sources/tests.rb
+- lib/avm/sources/tests/builder.rb
+- lib/avm/sources/tests/performer.rb
+- lib/avm/sources/tests/result.rb
+- lib/avm/sources/tests/single.rb
 - lib/avm/sync.rb
 - lib/avm/version.rb
 - lib/avm/version_number.rb

data/lib/avm/source_stereotypes/base.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module SourceStereotypes
-    class Base
-      enable_abstract_methods
-      abstract_methods :valid?
-      common_constructor :source
-
-      def name
-        self.class.name
-      end
-
-      def to_s
-        name
-      end
-    end
-  end
-end