avm-tools 0.71.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1459b957df5b13191a6411437651630d19ef6db3b12f62441d59238ede4679
-  data.tar.gz: 816d7f150ca0aa5e5cc573a77395b92c36fcba8fb41429f93dadc94f506233d8
+  metadata.gz: acf6e22d7179f5a2ad489b5091ef57883c91d94020815952bc3135df2f1cfd7d
+  data.tar.gz: 4f4eb1ef234e44157bc7b66dc44b2903e2c881e3406f31ee6a183eebba3f2ec0
 SHA512:
-  metadata.gz: 422c93704e878d5894ac17e38f4df881d98a70ebd90696fa98fa9968b583710e2c2f7ff2f31cefb1df3fd9b01f2536d7ae6ee26ea35f6a98d5ae113415cec610
-  data.tar.gz: 3720efd94cdeb9dc295f53f7ac22e3460bf67f6e8c5ee1ef654ee4f3320de65138dfc70538d6bc2e2ae4f1b589c81960ca685af5685a4778f42158a59ce9118c
+  metadata.gz: c0fbaaa584f10fc580e2f6c1c2635b673b9f481603b00a5851c2894955cc930d748111d3eb15a5e7069d0f35ac93fe6da7e1519e757822e03641eae989bf08f3
+  data.tar.gz: 8040458407704e5d6541556dfc03929ff6cf753e7e1fec83ac835602faac08327fece6b7e684cf58f80ddf1938d8ade8059fd2f6343f78010ca437228947e4e0

data/lib/avm/instances/application.rb

@@ -13,6 +13,10 @@ module Avm
         @id = id.to_s
       end
 
+      def to_s
+        id
+      end
+
       def instance(suffix)
         ::Avm::Instances::Base.new(self, suffix)
       end

data/lib/avm/instances/base.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
+require 'avm/instances/entry_keys'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
@@ -62,7 +63,7 @@ module Avm
       private
 
       def source_instance_uncached
-        ::Avm::Instances::Base.by_id(read_entry(:source_instance_id))
+        ::Avm::Instances::Base.by_id(read_entry(::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID))
       end
     end
   end

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

@@ -10,19 +10,20 @@ module Avm
           end
 
           def auto_ssh_hostname
-            inherited_entry_value(:host_id, 'ssh.hostname')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.hostname')
           end
 
           def auto_ssh_port
-            inherited_entry_value(:host_id, 'ssh.port') || 22
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.port') || 22
           end
 
           def auto_ssh_username
-            inherited_entry_value(:host_id, 'ssh.username')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.username')
           end
 
           def auto_ssh_url
-            inherited_entry_value(:host_id, 'ssh.url') || auto_ssh_url_by_parts
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.url') ||
+              auto_ssh_url_by_parts
           end
 
           def auto_ssh_url_by_parts

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

@@ -6,11 +6,11 @@ module Avm
       module AutoValues
         module Admin
           def auto_admin_email
-            inherited_entry_value(:host_id, 'admin.email')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.email')
           end
 
           def auto_admin_name
-            inherited_entry_value(:host_id, 'admin.name')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.name')
           end
         end
       end

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

@@ -46,7 +46,7 @@ module Avm
           def database_auto_common(suffix)
             database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
-              inherited_entry_value(:host_id, database_key)
+              inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, database_key)
           end
 
           def database_port_by_system

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

@@ -8,11 +8,15 @@ module Avm
           FS_PATH_KEY = :fs_path
 
           def auto_fs_path
-            inherited_entry_value(:host_id, FS_PATH_KEY) { |v| v + '/' + id }
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, FS_PATH_KEY) do |v|
+              v + '/' + id
+            end
           end
 
           def auto_data_fs_path
-            inherited_entry_value(:host_id, :data_fs_path) { |v| v + '/' + id }
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, :data_fs_path) do |v|
+              v + '/' + id
+            end
           end
 
           def auto_fs_url

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

@@ -6,7 +6,7 @@ module Avm
       module AutoValues
         module Ruby
           def auto_ruby_version
-            inherited_entry_value(:host_id, 'ruby.version')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ruby.version')
           end
         end
       end

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

@@ -8,12 +8,12 @@ module Avm
       module AutoValues
         module System
           def auto_system_username
-            inherited_entry_value(:host_id, 'system.username') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.username') ||
               read_entry_optional('ssh.username')
           end
 
           def auto_system_groupname
-            inherited_entry_value(:host_id, 'system.groupname') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.groupname') ||
               read_entry_optional('system.username')
           end
         end

data/lib/avm/instances/entry.rb

@@ -5,6 +5,12 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Instances
     class Entry
+      class << self
+        def auto_value_method_name(suffix)
+          "auto_#{suffix.to_s.gsub('.', '_')}"
+        end
+      end
+
       common_constructor :parent, :suffix, :options
 
       def auto_value
@@ -12,7 +18,7 @@ module Avm
       end
 
       def auto_value_method
-        "auto_#{suffix.to_s.gsub('.', '_')}"
+        self.class.auto_value_method_name(suffix)
       end
 
       def full_path

data/lib/avm/instances/entry_keys.rb

@@ -3,17 +3,48 @@
 module Avm
   module Instances
     module EntryKeys
-      {
-        database: %w[id hostname name password port system username],
-        web: %w[authority hostname path port scheme url userinfo]
-      }.each do |prefix, suffixes|
-        suffixes.each do |suffix|
-          key = "#{prefix}.#{suffix}"
+      class << self
+        def all
+          all_keys.to_a
+        end
+
+        def keys_consts_set(prefix, suffixes)
+          if suffixes.is_a?(::Hash)
+            keys_consts_set_from_hash(prefix, suffixes)
+          elsif suffixes.is_a?(::Enumerable)
+            keys_consts_set_from_enum(prefix, suffixes)
+          else
+            raise "Unmapped suffixes class: #{suffixes.class}"
+          end
+        end
+
+        def key_const_set(prefix, suffix)
+          key = [prefix, suffix].reject(&:blank?).join('.')
           const_set(key.gsub('.', '_').upcase, key)
+          all_keys << key
+        end
+
+        private
+
+        def all_keys
+          @all_keys ||= ::Set.new
+        end
+
+        def keys_consts_set_from_enum(prefix, suffixes)
+          suffixes.each { |suffix| key_const_set(prefix, suffix) }
+        end
+
+        def keys_consts_set_from_hash(prefix, suffixes)
+          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
         end
       end
 
-      FS_PATH = 'fs_path'
+      {
+        '' => %w[fs_path host_id source_instance_id],
+        database: %w[id hostname name password port system username],
+        ssh: %w[hostname port url username],
+        web: %w[authority hostname path port scheme url userinfo]
+      }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end
 end

data/lib/avm/tools/runner/instance.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Instance < ::EacRubyUtils::Console::DocoptRunner
+        require_sub __FILE__
+        runner_with
+
+        runner_definition do
+          desc 'Utilities for generic instances.'
+          pos_arg :instance_id
+          subcommands
+        end
+
+        private
+
+        def instance_uncached
+          ::Avm::Instances::Base.by_id(options['<instance_id>'])
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/instance/info.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Instance < ::EacRubyUtils::Console::DocoptRunner
+        class Info < ::EacRubyUtils::Console::DocoptRunner
+          runner_with
+
+          runner_definition do
+            desc 'Show info about a instance.'
+          end
+
+          def run
+            base_banner
+            entry_keys_banner
+          end
+
+          private
+
+          def base_banner
+            infov 'ID', instance.id
+            infov 'Application ID', instance.application.id
+            infov 'Suffix', instance.suffix
+          end
+
+          def entry_keys_banner
+            ::Avm::Instances::EntryKeys.all.each do |key|
+              infov key, instance.read_entry_optional(key)
+            end
+          end
+
+          def instance
+            context(:instance)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.71.0'
+    VERSION = '0.72.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -493,6 +493,8 @@ files:
 - lib/avm/tools/runner/git/revisions_test.rb
 - lib/avm/tools/runner/git/subrepo.rb
 - lib/avm/tools/runner/git/subrepo/check.rb
+- lib/avm/tools/runner/instance.rb
+- lib/avm/tools/runner/instance/info.rb
 - lib/avm/tools/runner/launcher.rb
 - lib/avm/tools/runner/launcher/instances.rb
 - lib/avm/tools/runner/launcher/projects.rb