avm 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 056fb39001835d22921692f1801a184d8b94852259e282520eb992ce5ffa29f4
-  data.tar.gz: 4f951bd5a35dfe20f25c27f67e7c6ee6c1db3cc4a6d9a8529d614b57bd655cee
+  metadata.gz: aea575c3e0ebcc43678325a4a682ea17c915ecae1eb6d133335b3e94ace56ca3
+  data.tar.gz: 2ed8fc21068a44f5ae816aa098a866650f32511b09afca2e75af2b620cd89f9b
 SHA512:
-  metadata.gz: 69a12b474da5a2aa07e41250569f4ce0786e51800958157b6d437a74480f5244e5f2846ca7b8ee2c495a5907adf8c7d289f7eef8e313244cc8ccc8f2066ef29e
-  data.tar.gz: a52eb72873f40f8fe55ed3009ecb3b3914512f8a17159f1dbed1aeda3383d76911947c7eef2ccb7a33af1a3c8294ee0767f18a6dc4a03cf78a8faa1f9f998325
+  metadata.gz: 3c87d398c755f55f71a827167bfbe0131d08d5df55af5497ccc7fd239cd059e59c9f251dbe448ca13df30c31da76e147dc2bd8e0d1501130000a219313b5e39d
+  data.tar.gz: e188963cfc504522f52eb86e7de7490427c194496c61e2d6771bdfdd697de9d9e6647cc0c1c772c6f19b3799bdd05c3054f999caa8168708a29e910d19398431

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Install
+          def auto_access
+            read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_URL).present? ? 'ssh' : 'local'
+          end
+
+          def auto_install_hostname
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME)
+          end
+
+          def auto_install_port
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_PORT) || 22
+          end
+
+          def auto_install_username
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+          end
+
+          def auto_install_url
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::INSTALL_URL) ||
+              auto_install_url_by_parts
+          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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Data Database Filesystem Mailer Ruby Source System Web]
+          %w[Admin Data Database Filesystem Install Mailer Ruby Source System Web]
             .each do |class_name|
             include const_get(class_name)
           end

data/lib/avm/instances/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/with_application_stereotype'
-require 'avm/with_dynamic_runners'
+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'
@@ -14,8 +14,8 @@ module Avm
       enable_simple_cache
       require_sub __FILE__, include_modules: true
       include ::Avm::Instances::Entries
-      include ::Avm::WithDynamicRunners
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::With::ExtraSubcommands
+      include ::Avm::With::ApplicationStereotype
 
       lists.add_string :access, :local, :ssh
 

data/lib/avm/instances/entry_keys.rb

@@ -5,6 +5,8 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Instances
     module EntryKeys
+      URI_FIELDS = %i[fragment hostname password path port query scheme url username].freeze
+
       class << self
         def all
           all_keys.to_a
@@ -43,17 +45,16 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
-        admin: %w[username password api_key],
-        database: %w[id hostname limit name password port system timeout username extra],
+        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,
         mailer: {
           '' => %w[id from reply_to],
-          smtp: %w[address port domain username password authentication openssl_verify_mode
-                   starttls_auto tls]
+          smtp: URI_FIELDS + %w[address domain authentication openssl_verify_mode starttls_auto tls]
         },
-        ssh: %w[hostname port url username],
-        web: %w[authority hostname path port scheme url userinfo]
+        web: URI_FIELDS + %w[authority userinfo]
       }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end

data/lib/avm/instances.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avm
   module Instances
-    require 'avm/applications/base'
-    require 'avm/instances/entries'
+    require_sub __FILE__
   end
 end

data/lib/avm/scms/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/with_application_stereotype'
+require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -8,7 +8,7 @@ module Avm
     class Base
       enable_abstract_methods
       enable_simple_cache
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::With::ApplicationStereotype
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname

data/lib/avm/source_generators/base.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/with_application_stereotype'
+require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module SourceGenerators
     class Base
-      include ::Avm::WithApplicationStereotype
+      include ::Avm::With::ApplicationStereotype
       common_constructor :target_path do
         self.target_path = target_path.to_pathname
       end

data/lib/avm/sources/base.rb

@@ -2,8 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
-require 'avm/with_application_stereotype'
-require 'avm/with_dynamic_runners'
+require 'avm/with/application_stereotype'
+require 'avm/with/extra_subcommands'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -11,8 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
-      include ::Avm::WithApplicationStereotype
-      include ::Avm::WithDynamicRunners
+      include ::Avm::With::ApplicationStereotype
+      include ::Avm::With::ExtraSubcommands
       compare_by :path
       enable_abstract_methods
       enable_simple_cache

data/lib/avm/version.rb

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

data/lib/avm/with/application_stereotype.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ApplicationStereotype
+      common_concern do
+        include ClassMethods
+      end
+
+      module ClassMethods
+        # @return [Avm::ApplicationStereotype::Base]
+        def application_stereotype
+          @application_stereotype ||=
+            ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
+        end
+
+        # @return [String]
+        def application_stereotype_name
+          stereotype_namespace_module.name.demodulize
+        end
+
+        # @return [Module]
+        def stereotype_namespace_module
+          module_parent.module_parent
+        end
+      end
+
+      def stereotype_namespace_module
+        self.class.stereotype_namespace_module
+      end
+    end
+  end
+end

data/lib/avm/with/extra_subcommands.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ExtraSubcommands
+      # @return [Hash<String, EacCli::Runner>]
+      def extra_available_subcommands
+        extra_available_subcommands_from_runners_module
+      end
+
+      # @return [Hash<String, EacCli::Runner>]
+      def extra_available_subcommands_from_runners_module
+        self.class.ancestors.reverse.inject({}) do |a, e|
+          a.merge(RunnersFromModule.new(e).result)
+        end
+      end
+
+      class RunnersFromModule
+        enable_simple_cache
+        common_constructor :the_module
+
+        # @return [Hash<String, EacCli::Runner>]
+        def result
+          return {} if runners_module.blank?
+
+          ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
+        end
+
+        def runners_module_uncached
+          return nil if the_module.module_parent.blank?
+
+          begin
+            the_module.module_parent.const_get('Runners')
+          rescue ::NameError
+            nil
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: eac_docker
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
+        version: '0.97'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
+        version: '0.97'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -217,11 +217,11 @@ files:
 - lib/avm/instances.rb
 - lib/avm/instances/base.rb
 - lib/avm/instances/base/auto_values.rb
-- lib/avm/instances/base/auto_values/access.rb
 - lib/avm/instances/base/auto_values/admin.rb
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/filesystem.rb
+- lib/avm/instances/base/auto_values/install.rb
 - lib/avm/instances/base/auto_values/mailer.rb
 - lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
@@ -288,8 +288,8 @@ files:
 - lib/avm/sync.rb
 - lib/avm/version.rb
 - lib/avm/version_number.rb
-- lib/avm/with_application_stereotype.rb
-- lib/avm/with_dynamic_runners.rb
+- lib/avm/with/application_stereotype.rb
+- lib/avm/with/extra_subcommands.rb
 homepage: 
 licenses: []
 metadata: {}

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Access
-          def auto_access
-            read_entry_optional('ssh.url').present? ? 'ssh' : 'local'
-          end
-
-          def auto_ssh_hostname
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.hostname')
-          end
-
-          def auto_ssh_port
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.port') || 22
-          end
-
-          def auto_ssh_username
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.username')
-          end
-
-          def auto_ssh_url
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.url') ||
-              auto_ssh_url_by_parts
-          end
-
-          def auto_ssh_url_by_parts
-            read_entry_optional('ssh.hostname').if_present do |a|
-              a = read_entry_optional('ssh.username').if_present(a) { |v| "#{v}@#{a}" }
-              a = read_entry_optional('ssh.port').if_present(a) { |v| "#{a}:#{v}" }
-              "ssh://#{a}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/with_application_stereotype.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module WithApplicationStereotype
-    common_concern do
-      include ClassMethods
-    end
-
-    module ClassMethods
-      # @return [Avm::ApplicationStereotype::Base]
-      def application_stereotype
-        @application_stereotype ||=
-          ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
-      end
-
-      # @return [String]
-      def application_stereotype_name
-        stereotype_namespace_module.name.demodulize
-      end
-
-      # @return [Module]
-      def stereotype_namespace_module
-        module_parent.module_parent
-      end
-    end
-
-    def stereotype_namespace_module
-      self.class.stereotype_namespace_module
-    end
-  end
-end

data/lib/avm/with_dynamic_runners.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner_with/subcommands'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module WithDynamicRunners
-    # @return [Hash<String, EacCli::Runner>]
-    def extra_available_subcommands
-      extra_available_subcommands_from_runners_module
-    end
-
-    # @return [Hash<String, EacCli::Runner>]
-    def extra_available_subcommands_from_runners_module
-      self.class.ancestors.reverse.inject({}) do |a, e|
-        a.merge(RunnersFromModule.new(e).result)
-      end
-    end
-
-    class RunnersFromModule
-      enable_simple_cache
-      common_constructor :the_module
-
-      # @return [Hash<String, EacCli::Runner>]
-      def result
-        return {} if runners_module.blank?
-
-        ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
-      end
-
-      def runners_module_uncached
-        return nil if the_module.module_parent.blank?
-
-        begin
-          the_module.module_parent.const_get('Runners')
-        rescue ::NameError
-          nil
-        end
-      end
-    end
-  end
-end