avm-tools 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c43972836fb5b4414055f3b478a1f85e814c1c86bf84d2975031c7aa1890902
-  data.tar.gz: c0ab56207e455dee36a9dc480b23f8e1d6e494421913c830dd746779d9293f4d
+  metadata.gz: d6a03e86cba8b7cc3cefba9163e093176460fc22f9155414ad6cc113ebe3cd5d
+  data.tar.gz: bd31ac49d42c4020a81543f099b5cdc693628821601ef196f185b675d03285ed
 SHA512:
-  metadata.gz: 1e482a38d4fa941481cf58e635776884ed86fece1df69e458b2be979de63f67f345ae738218d4f911ac6e0c184811eb6b77d88dce6b6169670e7e7fc48ae3781
-  data.tar.gz: 5a969b9d92a2b1d21dd85f99d0d286a7e4f01bc9d101d60632d43eea5a70fea98e41bbf00f7a2331c62e7855b9c079b5171eae5208ee25354b8b40eb9dd9a2b1
+  metadata.gz: 01b434bc5a5bc72b9de6ab1679886ef5587fba84e1095d114702dfae4d180b169fcc8c823df7adef6965a4c1a0b9c266649f0de86eb912bb0f5e3141663369a3
+  data.tar.gz: ee37b11970672b1c90b313517807349381f93ae0fd892e6d85dd0c7dbcbd766efe7073351a5bf4f5dc316516983ca7368636acbd1e7154b8911a44e548831972

data/lib/avm/configs.rb

@@ -4,8 +4,19 @@ require 'eac_ruby_utils/console/configs'
 
 module Avm
   class << self
+    attr_reader :configs_storage_path
+
     def configs
-      @configs ||= ::EacRubyUtils::Console::Configs.new('avm-tools')
+      @configs ||= ::EacRubyUtils::Console::Configs.new('avm-tools', configs_options)
+    end
+
+    def configs_options
+      configs_storage_path.if_present({}) { |v| { storage_path: v } }
+    end
+
+    def configs_storage_path=(path)
+      @configs_storage_path = path
+      @configs = nil
     end
   end
 end

data/lib/avm/instances/base.rb

@@ -1,14 +1,20 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
+::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Instances
     class Base
+      include ::EacRubyUtils::Listable
       include ::EacRubyUtils::SimpleCache
+      include ::Avm::Instances::Base::AutoValues
       include ::Avm::Instances::Entries
 
+      lists.add_string :access, :local, :ssh
+
       ID_PATTERN = /\A([a-z]+(?:\-[a-z]+)*)_(.+)\z/.freeze
 
       class << self
@@ -44,10 +50,11 @@ module Avm
       end
 
       def host_env_uncached
-        if read_entry('host') == 'localhost'
-          ::EacRubyUtils::Envs.local
-        else
-          ::EacRubyUtils::Envs.ssh("#{read_entry('user')}@#{read_entry('host')}")
+        access = read_entry(:access, list: ::Avm::Instances::Base.lists.access.values)
+        case access
+        when 'local' then return ::EacRubyUtils::Envs.local
+        when 'ssh' then return ::EacRubyUtils::Envs.ssh(read_entry('ssh.url'))
+        else raise("Unmapped access value: \"#{access}\"")
         end
       end
 

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        extend ::ActiveSupport::Concern
+
+        included do
+          %w[Access Database Filesystem Source].each do |class_name|
+            include const_get(class_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# 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(:host_id, 'ssh.hostname')
+          end
+
+          def auto_ssh_port
+            inherited_entry_value(:host_id, 'ssh.port') || 22
+          end
+
+          def auto_ssh_username
+            inherited_entry_value(:host_id, 'ssh.username')
+          end
+
+          def auto_ssh_url
+            inherited_entry_value(: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/instances/base/auto_values/database.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Database
+          DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_PORTS = {
+            'postgresql' => 5432,
+            'mysql' => 3306,
+            'oracle' => 1521,
+            'sqlserver' => 1433
+          }.freeze
+          DEFAULT_SYSTEM = 'postgresql'
+
+          def auto_database_name
+            inherited_entry_value(:database_id, 'database.name') || id
+          end
+
+          def auto_database_hostname
+            database_auto_common('hostname') || DEFAULT_HOSTNAME
+          end
+
+          def auto_database_password
+            database_auto_common('password')
+          end
+
+          def auto_database_port
+            database_auto_common('port') || database_port_by_system
+          end
+
+          def auto_database_username
+            database_auto_common('username')
+          end
+
+          def auto_database_system
+            database_auto_common('system') || DEFAULT_SYSTEM
+          end
+
+          private
+
+          def database_auto_common(suffix)
+            inherited_entry_value(:database_id, "database.#{suffix}") ||
+              inherited_entry_value(:host_id, "database.#{suffix}")
+          end
+
+          def database_port_by_system
+            read_entry_optional('database.system').if_present do |v|
+              DEFAULT_PORTS.fetch(v)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Filesystem
+          def auto_fs_path
+            inherited_entry_value(:host_id, :fs_path) { |v| v + '/' + id }
+          end
+
+          def auto_data_fs_path
+            inherited_entry_value(:host_id, :data_fs_path) { |v| v + '/' + id }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Source
+          def auto_source_instance_id
+            "#{application.id}_dev"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/entries.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/patches/object/asserts'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/require_sub'
 require 'avm/configs'
+::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
   module Instances
@@ -11,7 +13,11 @@ module Avm
       end
 
       def read_entry(entry_suffix, options = {})
-        ::Avm.configs.read_entry(full_entry_path(entry_suffix), options)
+        entry(entry_suffix, options).value
+      end
+
+      def read_entry_optional(entry_suffix, options = {})
+        entry(entry_suffix, options).optional_value
       end
 
       def full_entry_path(entry_suffix)
@@ -20,6 +26,22 @@ module Avm
         end
         (path_prefix + entry_suffix).join('.')
       end
+
+      def inherited_entry_value(source_entry_suffix, target_entry_suffix, &block)
+        read_entry_optional(source_entry_suffix).if_present do |instance_id|
+          other_entry_value(instance_id, target_entry_suffix).if_present(&block)
+        end
+      end
+
+      def other_entry_value(instance_id, entry_suffix)
+        ::Avm::Instances::Base.by_id(instance_id).read_entry_optional(entry_suffix)
+      end
+
+      private
+
+      def entry(suffix, options)
+        ::Avm::Instances::Entries::EntryReader.new(self, suffix, options)
+      end
     end
   end
 end

data/lib/avm/instances/entries/entry_reader.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Entries
+      class EntryReader
+        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
+          "auto_#{suffix.to_s.gsub('.', '_')}"
+        end
+
+        def full_path
+          (parent.path_prefix + suffix_as_array).join('.')
+        end
+
+        def optional_value
+          read(required: false, noinput: true) || auto_value
+        end
+
+        def read(extra_options = {})
+          ::Avm.configs.read_entry(full_path, options.merge(extra_options))
+        end
+
+        def suffix_as_array
+          if suffix.is_a?(::Array)
+            suffix.dup
+          else
+            ::EacRubyUtils::PathsHash.parse_entry_key(suffix.to_s)
+          end
+        end
+
+        def value
+          optional_value || read
+        end
+      end
+    end
+  end
+end

data/lib/avm/templates/file.rb

@@ -9,7 +9,7 @@ module Avm
       include ::EacRubyUtils::SimpleCache
 
       VARIABLE_DELIMITER = ::Regexp.quote('%%')
-      VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z_][a-z0-9_]*)#{VARIABLE_DELIMITER}/i.freeze
+      VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z0-9\._]*)#{VARIABLE_DELIMITER}/i.freeze
 
       attr_reader :path
 

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.76.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,13 @@ files:
 - lib/avm/instances.rb
 - lib/avm/instances/application.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/database.rb
+- lib/avm/instances/base/auto_values/filesystem.rb
+- lib/avm/instances/base/auto_values/source.rb
 - lib/avm/instances/entries.rb
+- lib/avm/instances/entries/entry_reader.rb
 - lib/avm/patches.rb
 - lib/avm/patches/eac_launcher_git_base.rb
 - lib/avm/patches/object/template.rb