avm 0.64.2 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbe828fa402574c8d87792d855971448ab931e26ecfb1ed15ea50acc81169e6
-  data.tar.gz: 3a1c0bc8719b29f23cb8e8b195430ca875592b8f01902e1cddcd80ac64943774
+  metadata.gz: 2944015b38061efc50472926c45c9d9696c6960d0d150226481249f86ee5d2d1
+  data.tar.gz: c8e3d32b157f5e8ff06ce1904fa702fdd7a5ae425e3d1da9e8327332c71b9693
 SHA512:
-  metadata.gz: 7fb5104275aa21de8f5b647cd035df7ddf7cf5a5525138d1485643d931257974de2bcf3adbc735212b7c2e4e3958a4079ebd14d6a9bee1c319f0f9fa4984a90e
-  data.tar.gz: 71880eff3e7920658456b8e5e7fe7998b53ea27c5fed3c612008147ad55e65c12268b6f6a67608fa6c89e684d57711114d803bcbfefe5cd16de1370914f5ffbc
+  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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.64.2
+  version: 0.65.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
@@ -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