avm 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f010253f1247e81a5935385a2c1070e5d4217948b31258c5e4286d3b1453fee
-  data.tar.gz: 000a1a2a76b966b3f353c251cbb8ded41cf9719cf9b13f056f768d6a16d6c377
+  metadata.gz: 8d1057f254c35e9a58a3e175d41bc3269a1870a436ae6f9c4906d1f0c1235e74
+  data.tar.gz: 4954952889777c08c9b0af69cf1c10b151e998b54a866c080960558cef5c83cb
 SHA512:
-  metadata.gz: a9f61d3c21cef4aaed1a8c5c4eecbcc20aab3247c8a28098f0aefff9818a578bb3e8450aff34b9b1bcced1ecbbb58ce3f011ee426d470e51cb840396fd98a8d8
-  data.tar.gz: c6019a2b01b64630a9c61d870e48d35a3e4ded56c6e67e1be74fdfa524d7700c72b55cae69a188ac1f3df318c8a0d7aca87c1eac7eda5f0f4b2be807c6da8069
+  metadata.gz: f5e770babac5244337114c9c9a537d1d9d8e589d64850feced6f699d12b789b82a7281e878a115dbc83476b60a22f27badd800cd73045bf8fa9af3f855c88cd5
+  data.tar.gz: 411a518bf695992eb94aac4c5765f553bc2355f44bac229712809a33eb9ceb87c36247feb9f832928b8e40516d3d6f4a2b153989965f1ff48837543919dbc30b

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -216,8 +216,10 @@ files:
 - 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
@@ -230,7 +232,6 @@ 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

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