avm 0.68.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e1377fa15fec46de929ea19865c646a3505e4b017ce614d90f78dadd2251cd
-  data.tar.gz: d79b5728e7c89b32e20ec430c87cbe9dbb0f50644645f796edf67da2ce7cbef6
+  metadata.gz: 2e2eb2f46518de88aca96c5a8cedf9c64abb72b862a657a195ef6ff081547cf4
+  data.tar.gz: 0e516460bb5620cd9ceb9f6bfbfd04db263760a1ec294f1d67c8fe43c78dd81c
 SHA512:
-  metadata.gz: 18d7483e604e82fbe29ea9adfe1ba16463def7927faf24f074557fa37b58012d29251ebf4e85bd422a048a2e1c71608a3e8c7606e18517df6f745b3fc5b5ff8d
-  data.tar.gz: 02b27be5b600b610ec0e6cf334682ec853160def0406fa317ab288da4d0c553d07f0cc54553d05952303572900d73699e6c57a040a3e3f2ddceab43fde1eafba
+  metadata.gz: 2eb9e691468af8f7e927c2dc99c8d7a1ff5472a5cfa846bab185416062fd9e2ec338fe38a374837f4cc260aa2bbf9380b7bd85b156d53779087f4a14970b3e89
+  data.tar.gz: 01dac660041abddfcebfa4b1bc56bcfe21d775c6393b6c575b0dba1ba3bec2286f0dfe15505ee3b17bc9222332dbd28e17f3333c0282f89bec9f4b178cef4442

data/lib/avm/data/package.rb

@@ -45,9 +45,20 @@ module Avm
         end
       end
 
+      # @param id [Symbol]
+      # @return [Avm::Data::Unit]
+      def unit(identifier)
+        units[identifier.to_sym] || raise("No unit found with identifier \"#{identifier}\"")
+      end
+
       def units
         @units ||= {}
       end
+
+      # @return [Enumerable<String>]
+      def units_ids
+        units.keys
+      end
     end
   end
 end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner/context'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    class Base
+      class SubcommandParent
+        enable_simple_cache
+        common_constructor :instance
+
+        private
+
+        def runner_context_uncached
+          ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+
+        def runner_argv
+          [instance.class.name.split('::')[-2].dasherize, instance.id]
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/data/files_unit.rb

@@ -17,7 +17,7 @@ module Avm
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        before_load :clear_files
+        before_load :clear
 
         # @return [Pathname]
         def files_path
@@ -33,7 +33,7 @@ module Avm
           instance_command('tar', '-xzf', '-', '-C', files_path)
         end
 
-        def clear_files
+        def clear
           infom "Removing all files under #{files_path}..."
           instance_command('mkdir', '-p', files_path).execute!
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!

data/lib/avm/instances/data/unit.rb

@@ -8,6 +8,18 @@ module Avm
     module Data
       class Unit < ::Avm::Data::Unit
         common_constructor :instance
+
+        # @return [Pathname]
+        def data_default_dump_path
+          instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
+            "#{b}_#{identifier}#{extension}"
+          end
+        end
+
+        # @return [String]
+        def identifier
+          instance.data_package.units.key(self) || raise("No identifier found for #{self}")
+        end
       end
     end
   end

data/lib/avm/instances/entry_keys.rb

@@ -28,6 +28,7 @@ module Avm
       {
         '' => %w[name source_instance_id],
         admin: URI_FIELDS + %w[api_key],
+        data: %w[default_dump_path],
         database: URI_FIELDS + %w[id limit name system timeout extra],
         docker: %w[registry],
         install: URI_FIELDS + %w[id data_path email groupname],

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.114'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +288,7 @@ files:
 - lib/avm/instances/base/dockerizable.rb
 - lib/avm/instances/base/entry_keys.rb
 - lib/avm/instances/base/install.rb
+- lib/avm/instances/base/subcommand_parent.rb
 - lib/avm/instances/base/web.rb
 - lib/avm/instances/data.rb
 - lib/avm/instances/data/files_unit.rb