avm 0.32.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc4f095582fb4fb51a80f667437b95281791bf218ba89e43ff402e337baaeb3a
-  data.tar.gz: 3b4a59e42bf16ab8ace7031604f43f7e9efb876836c4b3bc33342b1862ba7fa9
+  metadata.gz: 8d1057f254c35e9a58a3e175d41bc3269a1870a436ae6f9c4906d1f0c1235e74
+  data.tar.gz: 4954952889777c08c9b0af69cf1c10b151e998b54a866c080960558cef5c83cb
 SHA512:
-  metadata.gz: ab5e8effc7ce4575c18922fa0c777b2e61bd97cf20cfdb40981a81b166970e00b7fdd3d49b16b3155715743b59b063585e5d8bbc4b7c6edab7c2927597dc36e7
-  data.tar.gz: 7cfaaaf7877b87c4a5de68d4c84ae70c1424f6287635b97b26468f97350d9000e858c1559758eabb8004b98765574cf63d928d8c6f3f609129c68bf5f4a19a98
+  metadata.gz: f5e770babac5244337114c9c9a537d1d9d8e589d64850feced6f699d12b789b82a7281e878a115dbc83476b60a22f27badd800cd73045bf8fa9af3f855c88cd5
+  data.tar.gz: 411a518bf695992eb94aac4c5765f553bc2355f44bac229712809a33eb9ceb87c36247feb9f832928b8e40516d3d6f4a2b153989965f1ff48837543919dbc30b

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/uri_entry.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module AutoValues
+      class UriEntry
+        common_constructor :entries_provider, :suffix
+
+        def found?
+          value.present?
+        end
+
+        def value
+          ::Avm::Entries::UriBuilder.from_all_fields do |field_name|
+            entries_provider.entry([suffix, field_name]).value
+          end.to_uri.to_s
+        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/uri_builder.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class UriBuilder
+      require_sub __FILE__
+
+      FIELDS = %w[scheme user password host port path query fragment].freeze
+      FIELDS_TRANSLATIONS = {
+        username: :user, hostname: :host
+      }.freeze
+      ENTRIES_FIELDS = FIELDS.map do |field|
+        FIELDS_TRANSLATIONS.key(field.to_sym).if_present(field).to_s
+      end
+
+      class << self
+        def from_all_fields(&block)
+          r = new
+          ENTRIES_FIELDS.each do |field_name|
+            field_value = block.call(field_name)
+            r.field_set(field_name, field_value) if field_value.present?
+          end
+          r
+        end
+
+        def from_source(source)
+          if source.is_a?(::Addressable::URI)
+            from_source_uri(source)
+          elsif source.blank?
+            new
+          else
+            raise "Unexpected source: #{source}"
+          end
+        end
+
+        def from_source_uri(source_uri)
+          new(source_uri.to_hash)
+        end
+      end
+
+      common_constructor :data, default: [{}]
+
+      def field_get(name)
+        data[name.to_sym].if_present(&:to_s)
+      end
+
+      def field_set(field, value)
+        tfield = translate_field(field)
+        if FIELDS.include?(tfield)
+          main_field_set(tfield, value)
+        else
+          sub_field_set(tfield, value)
+        end
+      end
+
+      def translate_field(field)
+        if FIELDS_TRANSLATIONS.key?(field.to_sym)
+          FIELDS_TRANSLATIONS.fetch(field.to_sym).to_s
+        else
+          field.to_s
+        end
+      end
+
+      # @return [Addressable::URI, nil]
+      def to_uri
+        to_required_uri
+      rescue ::Addressable::URI::InvalidURIError
+        nil
+      end
+
+      # @return [Addressable::URI]
+      def to_required_uri
+        ::Addressable::URI.new(FIELDS.map { |f| [f.to_sym, field_get(f)] }.to_h)
+      end
+
+      private
+
+      def main_field_set(name, value)
+        data[name.to_sym] = value
+      end
+    end
+  end
+end

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/install.rb

@@ -7,8 +7,10 @@ module Avm
     class Base
       module AutoValues
         module Install
-          def auto_access
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present? ? 'ssh' : 'local'
+          def auto_install_groupname
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME) ||
+              read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
           end
 
           def auto_install_hostname
@@ -33,13 +35,8 @@ module Avm
           end
 
           def auto_install_url_by_parts
-            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_HOSTNAME).if_present do |a|
-              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
-                    .if_present(a) { |v| "#{v}@#{a}" }
-              a = read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_PORT)
-                    .if_present(a) { |v| "#{a}:#{v}" }
-              "ssh://#{a}"
-            end
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(self, 'install').value
           end
         end
       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,7 +12,7 @@ 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

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

@@ -6,14 +6,8 @@ module Avm
   module Instances
     class Base
       module AutoValues
-        require_sub __FILE__
-
-        common_concern do
-          %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
-            .each do |class_name|
-            include const_get(class_name)
-          end
-        end
+        require_sub __FILE__, include_modules: true
+        common_concern
       end
     end
   end

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
 

data/lib/avm/instances/entry_keys.rb

@@ -49,7 +49,7 @@ module Avm
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         fs: %w[url],
-        install: URI_FIELDS + %w[id],
+        install: URI_FIELDS + %w[id groupname],
         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.32.0'
+  VERSION = '0.35.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -213,6 +213,13 @@ 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/auto_values/uri_entry.rb
+- lib/avm/entries/base.rb
+- lib/avm/entries/entry.rb
+- lib/avm/entries/uri_builder.rb
 - lib/avm/executables.rb
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
@@ -225,13 +232,10 @@ files:
 - 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/system.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/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 +273,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 +287,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

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'addressable'
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module System
-          def auto_system_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::INSTALL_ID, 'system.groupname') ||
-              read_entry_optional('system.username')
-          end
-        end
-      end
-    end
-  end
-end