avm 0.90.1 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9c4437aefbdf73bfb8400b858046e1fe62d016f2a34f59e7dd9a5e73242048
-  data.tar.gz: ad8db14ba70cafa75e13d8b12b3ff0b4c3b0ae041ba00e650671809610118068
+  metadata.gz: 15b1096b5fdec594a25fe5197312d72392f7e46fece8012263421f80f2d827a4
+  data.tar.gz: 49250daa335c7484229ad130bcb978133a0891bd7b9d41793ae20b8f85668e39
 SHA512:
-  metadata.gz: 4746c4276ceddd25671695ccf8e52109c5817018dab1130919b7f7261f9e645e59e93ad5307dee32dc370d8dbc66592df5a98e46db4145aa81decfeea0f44dbe
-  data.tar.gz: 5c135e4dbbd75af455e2330b14660bedc236233805cbe181c415ace85f4f31c9727b817eb1d59b616501e0b87d59a73cef8529cb44b6f06bd605608448d68dc4
+  metadata.gz: fc2292dc7acbfbdef138d2e8a8c97e87f96f2e4947669c11f399f1fd3ab45b73f2808e43d29a9ed5fe24f320b61bf26876b7333cb9d1fd2c6ae50254ac2957d8
+  data.tar.gz: 937555ba04232ed2364767d3420ccf4046096e5edeacfb378bb728afc7b296601ca97c94e739fd4fc7246dc306482af4980bb1a6cd0227cfa24ef2dc15cd59f6

data/lib/avm/applications/base/local_source.rb

@@ -10,7 +10,7 @@ module Avm
       module LocalSource
         # @return [Pathname]
         def local_source_path
-          (local_source_path_entry.value || auto_local_source_path).to_pathname
+          user_local_source_path || auto_local_source_path
         end
 
         # @return [EacConfig::Entry]
@@ -18,6 +18,11 @@ module Avm
           ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
         end
 
+        # @return [Path, nil]
+        def user_local_source_path
+          local_source_path_entry.value.if_present(&:to_pathname)
+        end
+
         private
 
         # @return [Avm::Sources::Base]

data/lib/avm/docker/runner.rb

@@ -7,6 +7,7 @@ module Avm
   module Docker
     class Runner
       DOCKER_DEFAULT_REGISTRY_METHOD = :docker_default_registry
+      DOCKER_DEFAULT_REGISTRY_NAME = 'local'
 
       enable_speaker
       enable_simple_cache
@@ -33,6 +34,11 @@ module Avm
         container_run
       end
 
+      # @return [EacDocker::Registry, nil]
+      def docker_default_registry
+        ::EacDocker::Registry.new(default_docker_registry_name)
+      end
+
       private
 
       def setup
@@ -65,6 +71,11 @@ module Avm
         instance.docker_container
       end
 
+      # @return [String]
+      def default_docker_registry_name
+        DOCKER_DEFAULT_REGISTRY_NAME
+      end
+
       def docker_image
         instance.docker_image
       end

data/lib/avm/instances/data/package.rb

@@ -18,8 +18,8 @@ module Avm
           instance.data_default_dump_path.to_pathname
         end
 
-        def load(*args, &block)
-          instance.on_disabled_processes { super(*args, &block) }
+        def load(...)
+          instance.on_disabled_processes { super }
         end
       end
     end

data/lib/avm/instances/data/unit.rb

@@ -21,8 +21,8 @@ module Avm
           instance.data_package.units.key(self) || raise("No identifier found for #{self}")
         end
 
-        def load(*args, &block)
-          instance.on_disabled_processes { super(*args, &block) }
+        def load(...)
+          instance.on_disabled_processes { super }
         end
       end
     end

data/lib/avm/launcher/context/instance_discovery/root_instance_paths.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'ruby-progressbar'
+require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceDiscovery
+        class RootInstancePaths
+          acts_as_instance_method
+          enable_speaker
+
+          common_constructor :owner
+
+          # @return [Array<Avm::Launcher::Paths::Logical>]
+          def result
+            application_user_local_source_paths.map do |path|
+              ::Avm::Launcher::Paths::Logical.new(owner.context, nil, path.to_path,
+                                                  "/#{path.basename}")
+            end
+          end
+
+          private
+
+          # @param application [Avm::Applications::Base]
+          # @return [Pathname, nil]
+          def application_user_local_source_path(application) # rubocop:disable Metrics/MethodLength
+            if application.user_local_source_path.blank?
+              warn "Application \"#{application}\" does not have a user local source set"
+              nil
+            elsif application.user_local_source_path.directory?
+              infov application,
+                    "user local source found in \"#{application.user_local_source_path}"
+              application.user_local_source_path
+            else
+              warn "Application \"#{application}\"'s local source path is not a directory"
+              nil
+            end
+          end
+
+          # @return [Array<Pathname>]
+          def application_user_local_source_paths
+            ::Avm::Registry.applications.available.sort_by { |a| [a.id] }.map do |application|
+              application_user_local_source_path(application)
+            end.compact_blank.uniq.sort
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_discovery.rb

@@ -2,23 +2,34 @@
 
 require 'ruby-progressbar'
 require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     class Context
       class InstanceDiscovery
-        attr_reader :instances
+        enable_simple_cache
 
-        def initialize(context)
-          @context = context
+        # @!method instances
+        #   @return [Array<Avm::Launcher::Instances::Base>]
+
+        # @!method initialize(context)
+        #   @param context [Avm::Launcher::Context]
+        common_constructor :context
+
+        private
+
+        # @return [Array<Avm::Launcher::Instances::Base>]
+        def instances_uncached
           @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
-          @instances = path_instances(@context.root, nil)
+          root_instance_paths.flat_map { |path| path_instances(path, nil) }
         ensure
           @progress&.finish
         end
 
-        private
-
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @param parent_instance [Avm::Launcher::Instances::Base]
+        # @return [Array<Avm::Launcher::Instances::Base>]
         def path_instances(path, parent_instance)
           update_progress_format(path)
           on_rescued_path_instances(path) do |r|
@@ -32,6 +43,8 @@ module Avm
           end
         end
 
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @return [Array<Avm::Launcher::Instances::Base>]
         def on_rescued_path_instances(path)
           r = []
           begin
@@ -42,14 +55,20 @@ module Avm
           r
         end
 
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @return [void]
         def update_progress_format(path)
           @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
         end
 
+        # @param path [Array<Avm::Launcher::Paths::Logical>]
+        # @return [void]
         def update_progress_count(children)
           @progress.total += children.count
           @progress.increment
         end
+
+        require_sub __FILE__, require_mode: :kernel
       end
     end
   end

data/lib/avm/launcher/context.rb

@@ -29,14 +29,14 @@ module Avm
         end
       end
 
-      attr_reader :root, :settings, :cache_root
+      attr_reader :settings, :cache_root
       attr_accessor :publish_options, :recache, :instance_manager
 
       CONFIG_PATH_PREFIX = 'launcher'
+      FS_OBJECT_ID = 'unique'
 
       def initialize(options = {})
         @options = options.with_indifferent_access
-        @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
         @settings = ::Avm::Launcher::Context::Settings.new(build_option(:settings_file))
         @cache_root = build_option(:cache_root)
         @publish_options = { new: false, confirm: false, stereotype: nil }
@@ -45,7 +45,7 @@ module Avm
       end
 
       def fs_object_id
-        root.real.variableize
+        FS_OBJECT_ID
       end
 
       def instance(name)

data/lib/avm/launcher/paths/real.rb

@@ -7,7 +7,7 @@ module Avm
         def initialize(path)
           raise "Argument path is not a string: \"#{path}\"|#{path.class}" unless path.is_a?(String)
 
-          super(path)
+          super
         end
 
         def subpath(relative_path)

data/lib/avm/rspec/setup.rb

@@ -8,7 +8,8 @@ module Avm
     module Setup
       require_sub __FILE__
       EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
-                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry
+                    with_config].freeze
 
       def self.extended(obj)
         obj.setup_examples

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

@@ -4,15 +4,18 @@ require 'eac_fs/comparator'
 require 'eac_ruby_utils/core_ext'
 
 RSpec.shared_examples 'avm_source_generated' do |spec_file, stereotype, options = {}|
-  fixtures_dir = Pathname.new('base_spec_files').expand_path(File.dirname(spec_file))
+  include_context 'spec_paths', spec_file
+  block_on_each_source = options.delete(:block_on_each_source)
 
-  fixtures_dir.children.select(&:directory?).each do |target_dir|
+  spec_paths_controller.fixtures_directory.children.select(&:directory?).each do |target_dir|
     context "when target is \"#{target_dir.basename}\"" do
       let(:source) { avm_source(stereotype, options.merge(target_basename: target_dir.basename)) }
 
       it do
         expect(fs_comparator.build(source.path)).to eq(fs_comparator.build(target_dir))
       end
+
+      instance_exec(&block_on_each_source) if block_on_each_source
     end
   end
 

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

@@ -4,9 +4,7 @@ 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)
+    include_examples 'with_config', spec_file
 
     expected_values.each do |instance_id, values|
       values.each do |input, expected|

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+RSpec.shared_examples 'with_config' do |spec_file|
+  config_path = spec_file.to_pathname
+  config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
+  temp_config_path = EacRubyUtils::Fs::Temp.file
+  FileUtils.cp(config_path, temp_config_path)
+  EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, temp_config_path)
+end

data/lib/avm/source_generators/base.rb

@@ -8,6 +8,8 @@ module Avm
   module SourceGenerators
     class Base
       acts_as_abstract
+      enable_settings_provider
+      enable_speaker
       include ::Avm::With::ApplicationStereotype
 
       class << self
@@ -17,19 +19,29 @@ module Avm
         end
       end
 
+      OPTION_NAME = 'name'
+      JOBS = [].freeze
+
       common_constructor :target_path, :options, default: [{}] do
         self.target_path = target_path.to_pathname
         self.options = option_list.validate(options)
       end
 
+      # @return [String]
+      def name
+        options[OPTION_NAME].if_present(target_path.basename.to_path)
+      end
+
       # @return [Avm::SourceGenerators::OptionList]
       def option_list
         self.class.option_list
       end
 
       def perform
+        start_banner
         assert_clear_directory
         apply_template
+        perform_jobs
       end
 
       def assert_clear_directory
@@ -38,7 +50,25 @@ module Avm
       end
 
       def apply_template
-        template.apply(self, target_path)
+        root_template.apply(self, target_path)
+      end
+
+      def perform_jobs
+        setting_value(:jobs).each do |job|
+          infom "Generating #{job.humanize}..."
+          send("generate_#{job}")
+        end
+      end
+
+      # @return [void]
+      def start_banner
+        infov 'Target path', target_path
+        infov 'Application name', name
+      end
+
+      # @return [EacTemlates::Modules::Base]
+      def root_template
+        template
       end
     end
   end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.90.1
+  version: 0.92.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-05-29 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.40'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -84,34 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +272,7 @@ files:
 - lib/avm/launcher/context.rb
 - lib/avm/launcher/context/instance_collector.rb
 - lib/avm/launcher/context/instance_discovery.rb
+- lib/avm/launcher/context/instance_discovery/root_instance_paths.rb
 - lib/avm/launcher/context/instance_manager.rb
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
 - lib/avm/launcher/context/instance_manager/cached_instances.rb
@@ -337,6 +326,7 @@ files:
 - 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/rspec/shared_examples/with_config.rb
 - lib/avm/runners/base.rb
 - lib/avm/scms.rb
 - lib/avm/scms/auto_commit.rb