avm 0.31.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea575c3e0ebcc43678325a4a682ea17c915ecae1eb6d133335b3e94ace56ca3
-  data.tar.gz: 2ed8fc21068a44f5ae816aa098a866650f32511b09afca2e75af2b620cd89f9b
+  metadata.gz: 7f010253f1247e81a5935385a2c1070e5d4217948b31258c5e4286d3b1453fee
+  data.tar.gz: 000a1a2a76b966b3f353c251cbb8ded41cf9719cf9b13f056f768d6a16d6c377
 SHA512:
-  metadata.gz: 3c87d398c755f55f71a827167bfbe0131d08d5df55af5497ccc7fd239cd059e59c9f251dbe448ca13df30c31da76e147dc2bd8e0d1501130000a219313b5e39d
-  data.tar.gz: e188963cfc504522f52eb86e7de7490427c194496c61e2d6771bdfdd697de9d9e6647cc0c1c772c6f19b3799bdd05c3054f999caa8168708a29e910d19398431
+  metadata.gz: a9f61d3c21cef4aaed1a8c5c4eecbcc20aab3247c8a28098f0aefff9818a578bb3e8450aff34b9b1bcced1ecbbb58ce3f011ee426d470e51cb840396fd98a8d8
+  data.tar.gz: c6019a2b01b64630a9c61d870e48d35a3e4ded56c6e67e1be74fdfa524d7700c72b55cae69a188ac1f3df318c8a0d7aca87c1eac7eda5f0f4b2be807c6da8069

data/lib/avm/applications/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entries'
+require 'avm/entries/base'
 require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,7 +9,7 @@ module Avm
     class Base
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
+      include ::Avm::Entries::Base
 
       LOCAL_INSTANCE_SUFFIX = 'dev'
 

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module AutoValues
+      class Entry
+        class << self
+          def auto_value_method_name(suffix)
+            "auto_#{suffix.to_s.gsub('.', '_')}"
+          end
+        end
+
+        common_constructor :entries_provider, :suffix
+
+        def auto_value_method
+          self.class.auto_value_method_name(suffix)
+        end
+
+        def found?
+          entries_provider.respond_to?(auto_value_method, true)
+        end
+
+        def value
+          entries_provider.if_respond(auto_value_method)
+        end
+      end
+    end
+  end
+end

data/lib/avm/entries/auto_values.rb

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

data/lib/avm/{instances/entries.rb → entries/base.rb}

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/instances/entry'
+require 'avm/entries/entry'
 
 module Avm
-  module Instances
-    module Entries
+  module Entries
+    module Base
+      def entries_provider_id
+        id
+      end
+
       def entry(suffix, options = {})
-        ::Avm::Instances::Entry.new(self, suffix, options)
+        ::Avm::Entries::Entry.new(self, suffix, options)
       end
 
       def path_prefix
-        @path_prefix ||= [id].freeze
+        @path_prefix ||= [entries_provider_id].freeze
       end
 
       def read_entry(entry_suffix, options = {})

data/lib/avm/{instances → entries}/entry.rb

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
+require 'avm/entries/auto_values/entry'
 require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Instances
+  module Entries
     class Entry
-      class << self
-        def auto_value_method_name(suffix)
-          "auto_#{suffix.to_s.gsub('.', '_')}"
-        end
-      end
-
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        parent.respond_to?(auto_value_method, true) ? parent.send(auto_value_method) : nil
-      end
-
-      def auto_value_method
-        self.class.auto_value_method_name(suffix)
+        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
       end
 
       def full_path

data/lib/avm/entries.rb

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

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

@@ -6,11 +6,11 @@ module Avm
       module AutoValues
         module Admin
           def auto_admin_email
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.email')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.email')
           end
 
           def auto_admin_name
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.name')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'admin.name')
           end
         end
       end

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

@@ -61,7 +61,7 @@ module Avm
           def database_auto_common(suffix)
             database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
-              inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, database_key)
+              inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, database_key)
           end
 
           def database_port_by_system

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

@@ -8,29 +8,30 @@ module Avm
       module AutoValues
         module Filesystem
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url
-            auto_fs_url_with_ssh || auto_fs_url_without_ssh
+            auto_fs_url_with_install || auto_fs_url_without_install
           end
 
-          def auto_fs_url_with_ssh
-            read_entry_optional('ssh.url').if_present do |ssh_url|
+          def auto_fs_url_with_install
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL)
+              .if_present do |install_url|
               read_entry_optional('fs_path').if_present do |fs_path|
-                "#{ssh_url}#{fs_path}"
+                "#{install_url}#{fs_path}"
               end
             end
           end
 
-          def auto_fs_url_without_ssh
-            return nil if read_entry_optional('ssh.url').present?
+          def auto_fs_url_without_install
+            return nil if read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present?
 
             read_entry_optional('fs_path').if_present do |fs_path|
               "file://#{fs_path}"

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

@@ -12,22 +12,22 @@ module Avm
           end
 
           def auto_install_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
           end
 
           def auto_install_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
           end
 
           def auto_install_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_install_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::INSTALL_URL) ||
               auto_install_url_by_parts
           end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entry'
+require 'avm/entries/auto_values/entry'
+require 'avm/entries/entry'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -11,15 +12,15 @@ module Avm
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
             .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
             .each do |mailer_key|
-            define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
+            define_method ::Avm::Entries::AutoValues::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end
           end
 
           def auto_mailer_id
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
                                   ::Avm::Instances::EntryKeys::MAILER_ID) ||
-              read_entry_optional(::Avm::Instances::EntryKeys::HOST_ID)
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_ID)
           end
 
           private

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

@@ -6,7 +6,7 @@ module Avm
       module AutoValues
         module Ruby
           def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ruby.version')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
           end
         end
       end

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

@@ -8,12 +8,12 @@ module Avm
       module AutoValues
         module System
           def auto_system_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.username') ||
-              read_entry_optional('ssh.username')
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.username') ||
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_system_groupname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.groupname') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'system.groupname') ||
               read_entry_optional('system.username')
           end
         end

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

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     class Base
       module AutoValues
-        extend ::ActiveSupport::Concern
+        require_sub __FILE__
 
-        included do
+        common_concern do
           %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
             .each do |class_name|
             include const_get(class_name)

data/lib/avm/instances/base.rb

@@ -4,7 +4,7 @@ require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/instances/entries'
+require 'avm/entries/base'
 
 module Avm
   module Instances
@@ -13,7 +13,7 @@ module Avm
       enable_listable
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
+      include ::Avm::Entries::Base
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 
@@ -51,11 +51,11 @@ module Avm
       end
 
       def host_env_uncached
-        access = read_entry(:access, list: ::Avm::Instances::Base.lists.access.values)
-        case access
+        install_uri = entry(::Avm::Instances::EntryKeys::INSTALL_URL).value.to_uri
+        case install_uri.scheme
         when 'local' then ::EacRubyUtils::Envs.local
-        when 'ssh' then ::EacRubyUtils::Envs.ssh(read_entry('ssh.url'))
-        else raise("Unmapped access value: \"#{access}\"")
+        when 'ssh' then ::EacRubyUtils::Envs.ssh(install_uri)
+        else raise("Unmapped access value: \"#{install_uri}\"")
         end
       end
 

data/lib/avm/instances/entry_keys.rb

@@ -44,12 +44,12 @@ module Avm
       end
 
       {
-        '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        '' => %w[data_fs_path fs_path name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS,
+        install: URI_FIELDS + %w[id],
         mailer: {
           '' => %w[id from reply_to],
           smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]

data/lib/avm/registry/source_generators.rb

@@ -8,8 +8,9 @@ module Avm
     class SourceGenerators < ::Avm::Registry::FromGems
       # @return [Avm::Instances::Base, nil]
       def class_detect(klass, detect_args)
-        stereotype_name, target_path = detect_args
-        klass.application_stereotype.name == stereotype_name ? klass.new(target_path) : nil
+        detect_args = detect_args.dup
+        stereotype_name = detect_args.shift
+        klass.application_stereotype.name == stereotype_name ? klass.new(*detect_args) : nil
       end
     end
   end

data/lib/avm/source_generators/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/source_generators/option_list'
 require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
@@ -7,8 +8,22 @@ module Avm
   module SourceGenerators
     class Base
       include ::Avm::With::ApplicationStereotype
-      common_constructor :target_path do
+
+      class << self
+        # @return [Avm::SourceGenerators::OptionList]
+        def option_list
+          Avm::SourceGenerators::OptionList.new
+        end
+      end
+
+      common_constructor :target_path, :options, default: [{}] do
         self.target_path = target_path.to_pathname
+        self.options = option_list.validate(options)
+      end
+
+      # @return [Avm::SourceGenerators::OptionList]
+      def option_list
+        self.class.option_list
       end
 
       def perform

data/lib/avm/source_generators/option.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Avm
+  module SourceGenerators
+    class Option
+      common_constructor :name, :description, default: [nil] do
+        self.name = name.to_sym
+      end
+    end
+  end
+end

data/lib/avm/source_generators/option_list.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/option'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module SourceGenerators
+    class OptionList
+      enable_immutable
+      immutable_accessor :option, type: :array
+
+      alias immutable_option option
+
+      def option(*args)
+        immutable_option(::Avm::SourceGenerators::Option.new(*args))
+      end
+
+      # @return [Hash<Symbol, String>]
+      def validate(options_hash)
+        options_hash.transform_keys { |k| validate_option(k) }
+      end
+
+      def validate_option(option_name)
+        option_name = option_name.to_sym
+
+        return option_name if options.any? { |option| option.name == option_name }
+
+        raise "No option found with name \"#{option_name}\""
+      end
+    end
+  end
+end

data/lib/avm/source_generators/runner.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_cli/core_ext'
+
+module Avm
+  module SourceGenerators
+    class Runner
+      OPTION_NAME_VALUE_SEPARATOR = ':'
+
+      runner_with :help do
+        arg_opt '-o', '--option', 'Option for generator.', repeat: true, optional: true
+        pos_arg :stereotype_name
+        pos_arg :target_path
+      end
+
+      def run
+        start_banner
+        generate
+      end
+
+      def generate
+        infom 'Generating...'
+        generator.perform
+        success "Source generated in \"#{generator.target_path}\""
+      end
+
+      def start_banner
+        infov 'Stereotype', stereotype_name
+        infov 'Target path', target_path
+        infov 'Generator', generator.class
+      end
+
+      def generator_uncached
+        ::Avm::Registry.source_generators
+          .detect_optional(stereotype_name, target_path, options) ||
+          fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
+      end
+
+      delegate :stereotype_name, to: :parsed
+
+      # @return [Hash<String, String>]
+      def options
+        parsed.option.map { |v| v.split(OPTION_NAME_VALUE_SEPARATOR) }.to_h
+      end
+
+      def target_path
+        parsed.target_path.to_pathname
+      end
+    end
+  end
+end

data/lib/avm/sources/runner.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Sources
+    class Runner
+      runner_with :help, :subcommands do
+        desc 'Root command for sources.'
+        arg_opt '-C', '--path', 'Path to the source.', default: '.'
+        subcommands
+      end
+
+      def extra_available_subcommands
+        optional_source.if_present({}, &:extra_available_subcommands)
+      end
+
+      def source_banner
+        infov 'Source', source
+      end
+
+      # @return [Pathname]
+      def source_path
+        parsed.path.to_pathname
+      end
+
+      private
+
+      def source_uncached
+        ::Avm::Registry.sources.detect(source_path)
+      end
+
+      def optional_source_uncached
+        ::Avm::Registry.sources.detect_optional(source_path)
+      end
+    end
+  end
+end

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -213,6 +213,11 @@ files:
 - lib/avm/docker/container.rb
 - lib/avm/docker/image.rb
 - lib/avm/docker/runner.rb
+- lib/avm/entries.rb
+- lib/avm/entries/auto_values.rb
+- lib/avm/entries/auto_values/entry.rb
+- lib/avm/entries/base.rb
+- lib/avm/entries/entry.rb
 - lib/avm/executables.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
@@ -230,8 +235,6 @@ files:
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb
 - lib/avm/instances/docker_image.rb
-- lib/avm/instances/entries.rb
-- lib/avm/instances/entry.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/instances/runner.rb
 - lib/avm/jobs.rb
@@ -269,6 +272,9 @@ files:
 - lib/avm/self/instance/entry_keys.rb
 - lib/avm/source_generators.rb
 - lib/avm/source_generators/base.rb
+- lib/avm/source_generators/option.rb
+- lib/avm/source_generators/option_list.rb
+- lib/avm/source_generators/runner.rb
 - lib/avm/sources.rb
 - lib/avm/sources/base.rb
 - lib/avm/sources/base/configuration.rb
@@ -280,6 +286,7 @@ files:
 - lib/avm/sources/base/testing.rb
 - lib/avm/sources/configuration.rb
 - lib/avm/sources/configuration/rubocop.rb
+- lib/avm/sources/runner.rb
 - lib/avm/sources/tests.rb
 - lib/avm/sources/tests/builder.rb
 - lib/avm/sources/tests/performer.rb