avm 0.91.0 → 0.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24587b61abe782918bcfe1b372328d0e9f9ca88db23c9c3990883a8cd88d444b
-  data.tar.gz: 2b1f1f7d2aa5cb42e8ca326d659b7b749aa7f50278c81347432dbc4e68a32b8d
+  metadata.gz: 2c1fee20bfe64a0b6d97f7866255914971859fb503ab18825eaf9be01a137aad
+  data.tar.gz: 964391eaa0ac606596e4aeb3b87ecd0c4ffcc1c78cadb86e98569e6ab660e06d
 SHA512:
-  metadata.gz: c97c2ad6f2857a9b6ccf70f0854b02e39cda4c555aec46174fc7a19ab41f440e7a1b505f6e3c1f377423efad38738a8e843417b30038dda054f151715402401e
-  data.tar.gz: b0231edc3a011674a2c2cbf048ad4efc66139171f91798e175dc867f889b94888d4086350f27a916f94471956f3f366e0242ffb7c832b9e0ae37589fd6647828
+  metadata.gz: 03a07968e45e58c41fcf6a5aed935b78f116b51e4fc536c9cd408b316404d5f8ac24ae262bd1d77e584fda8ad62641a13062b529a859483895389ac7ca6db732
+  data.tar.gz: a1f51632e1d257cfbf50197c60bc9f8bd3acd18a9e136911387b12257b296373f72bf640de5b5cf09c187770ca47b0e3b8cf5a0b18efb264d0757893924c7db8

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/entries/entry.rb

@@ -22,6 +22,11 @@ module Avm
         context_entry.found?
       end
 
+      # @return [Boolean]
+      def found?
+        context_found?
+      end
+
       def full_path
         (parent.path_prefix + suffix_as_array).join('.')
       end

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

@@ -18,6 +18,11 @@ module Avm
               )
             end
           end
+
+          # @return [Boolean]
+          def auto_data_allow_loading
+            local? || !production?
+          end
         end
       end
     end

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

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/applications/base/local_instance'
+
 module Avm
   module Instances
     class Base
       module AutoValues
         module Source
           def auto_source_instance_id
-            "#{application.id}_dev"
+            [application.id, ::Avm::Applications::Base::LocalInstance::LOCAL_INSTANCE_SUFFIX]
+              .join('_')
           end
         end
       end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Production
+        DEFAULT_PRODUCTION = true
+        PRODUCTION_KEY = 'production'
+
+        # @return [Boolean]
+        def default_production?
+          DEFAULT_PRODUCTION
+        end
+
+        # @return [Boolean]
+        def production?
+          if production_entry.found?
+            production_entry.value.to_bool
+          else
+            default_production?
+          end
+        end
+
+        # @return [Avm::Entries::Entry]
+        def production_entry
+          entry(PRODUCTION_KEY)
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/ids'
+require 'avm/applications/base/local_instance'
 require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
@@ -61,6 +62,11 @@ module Avm
         end
       end
 
+      # @return [Boolean]
+      def local?
+        suffix == ::Avm::Applications::Base::LocalInstance::LOCAL_INSTANCE_SUFFIX
+      end
+
       private
 
       def source_instance_uncached

data/lib/avm/instances/data/loading_denied_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    module Data
+      class LoadingDeniedError < ::RuntimeError
+      end
+    end
+  end
+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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/data/unit_with_commands'
+require 'avm/instances/data/loading_denied_error'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -9,6 +10,14 @@ module Avm
       class Unit < ::Avm::Data::UnitWithCommands
         common_constructor :instance
 
+        # @return [void]
+        # @raise Avm::Instances::Data::Unit
+        def check_load_permission!
+          return if instance.data_allow_loading
+
+          raise ::Avm::Instances::Data::LoadingDeniedError, "Instance: #{instance}"
+        end
+
         # @return [Pathname]
         def data_default_dump_path
           instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
@@ -21,8 +30,9 @@ 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(...)
+          check_load_permission!
+          instance.on_disabled_processes { super }
         end
       end
     end

data/lib/avm/instances/entry_keys.rb

@@ -28,7 +28,7 @@ module Avm
       {
         '' => %w[name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
-        data: %w[default_dump_path],
+        data: %w[allow_loading default_dump_path],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         install: URI_FIELDS + %w[id data_path email groupname],

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/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/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.91.0'
+  VERSION = '0.93.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.91.0
+  version: 0.93.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-07-05 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.42'
   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.42'
 - !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
@@ -269,10 +257,12 @@ files:
 - lib/avm/instances/base/entry_keys.rb
 - lib/avm/instances/base/install.rb
 - lib/avm/instances/base/processes.rb
+- lib/avm/instances/base/production.rb
 - lib/avm/instances/base/subcommand_parent.rb
 - lib/avm/instances/base/web.rb
 - lib/avm/instances/data.rb
 - lib/avm/instances/data/files_unit.rb
+- lib/avm/instances/data/loading_denied_error.rb
 - lib/avm/instances/data/package.rb
 - lib/avm/instances/data/unit.rb
 - lib/avm/instances/docker_image.rb