avm 0.64.1 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d0d9543dd537c7dec9ad3b7958426558e9b0ca7f7763345e5beb9b55f4fea3
-  data.tar.gz: faf52cfe3e69406c5a3d36b1485aee475e9d8ee44aebb4d2bc10baec99e6c83a
+  metadata.gz: 2944015b38061efc50472926c45c9d9696c6960d0d150226481249f86ee5d2d1
+  data.tar.gz: c8e3d32b157f5e8ff06ce1904fa702fdd7a5ae425e3d1da9e8327332c71b9693
 SHA512:
-  metadata.gz: 77a8de4846a96ad91dd3809131ba510b1c113b81718eead76461993982c4420f5d09a67ff45b79dd1daef102c82d1268776262c0fe809fe607428d5f2b410d23
-  data.tar.gz: fcb16b18c37d910c32a114dffe9e60367cd03ea768475d464f6324f696a799c0a6ceae30a2d7b4b099dcdde5a9f5bc90d9b03fb97d27d6ce16ac8a9741c9cdd6
+  metadata.gz: 792dfd5ec8d14e1fd1723962a4b6ab1da06e998a0d3bb1204ae4801c76a94130969010a3be542fd4d08f07b77ab896b7cedce265a29f9a40430a0f490670f567
+  data.tar.gz: f76e19d8af260f6ff840960b655362c2c47dd9292030c26eb7e0c72667f37e72051f3460b517a7057655da7b9b4dc7b9a89851452fd3de78f4f96c9c46aca9eb

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

@@ -7,8 +7,9 @@ module Avm
     class Base
       module AutoValues
         module Database
+          LOCAL_ADDRESS = '127.0.0.1'
           DEFAULT_EXTRA = ''
-          DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
             'postgresql' => 5432,
@@ -19,8 +20,16 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
           DEFAULT_TIMEOUT = 5000
 
-          def auto_database_extra
-            database_auto_common('hostname') || DEFAULT_EXTRA
+          %w[extra hostname limit system timeout].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || self.class.const_get("default_#{attr}".upcase)
+            end
+          end
+
+          %w[username password].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || id
+            end
           end
 
           def auto_database_name
@@ -28,34 +37,10 @@ module Avm
                                   ::Avm::Instances::EntryKeys::DATABASE_NAME) || id
           end
 
-          def auto_database_hostname
-            database_auto_common('hostname') || DEFAULT_HOSTNAME
-          end
-
-          def auto_database_limit
-            database_auto_common('limit') || DEFAULT_LIMIT
-          end
-
-          def auto_database_password
-            database_auto_common('password') || id
-          end
-
           def auto_database_port
             database_auto_common('port') || database_port_by_system
           end
 
-          def auto_database_username
-            database_auto_common('username') || id
-          end
-
-          def auto_database_system
-            database_auto_common('system') || DEFAULT_SYSTEM
-          end
-
-          def auto_database_timeout
-            database_auto_common('timeout') || DEFAULT_TIMEOUT
-          end
-
           private
 
           def database_auto_common(suffix)

data/lib/avm/launcher/paths/logical.rb

@@ -2,13 +2,13 @@
 
 require 'avm/launcher/paths/real'
 require 'avm/launcher/stereotype'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     module Paths
       class Logical
-        include ::Comparable
-        include ::EacRubyUtils::SimpleCache
+        enable_simple_cache
 
         class << self
           def from_h(context, hash)
@@ -17,18 +17,11 @@ module Avm
           end
         end
 
-        attr_reader :context, :real, :logical, :parent_path
-
-        def initialize(context, parent_path, real, logical)
-          @context = context
-          @parent_path = parent_path
-          @real = ::Avm::Launcher::Paths::Real.new(real)
-          @logical = logical
+        common_constructor :context, :parent_path, :real, :logical do
+          self.real = ::Avm::Launcher::Paths::Real.new(real)
         end
 
-        def <=>(other)
-          [logical, real] <=> [other.logical, other.real]
-        end
+        compare_by :logical, :real
 
         def to_s
           logical

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.64.1
+  version: 0.65.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -287,7 +287,6 @@ files:
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.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
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Ruby
-          def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
-          end
-        end
-      end
-    end
-  end
-end