avm 0.69.0 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd7769c233c47e084dedc71f52d43c93aef1ed251f9f0ba0fcd9fe25d38b5cd8
-  data.tar.gz: 20400fe033dd9bf515f3c971179b5b22ed6097879c317946e6a59d6f5b0544f7
+  metadata.gz: 02d8da25080bc20bd3138de4a659dcba371fc150255f823c8fac34ac03ecfbf3
+  data.tar.gz: a83f46dd107ca4dd342d9273cb1592d3dd129d6a6da5b2cfb2017d30b5452188
 SHA512:
-  metadata.gz: 447679562bdfd2d1da1d38ee1e34eecb3214d0c4763316cf75b69d2b91661c783b732252992e11e1abafab0f34fd38ab7ba3b505c9ff6381c7e9331a378d3cee
-  data.tar.gz: 38a20f723ac5c348a755cc4b558d89b37acafeafb20e4fc027c314bea5a3717194767ab3afaf533892f16632d250f65ae911bb5b96ca98b7a277769c171fea3b
+  metadata.gz: 56fa769340dc76338317f62a4a8b8dd9537de35b4a29c8a2548db53f739d7f6160fdda83f648df74879f7ad03a7f40c7b8a2622957769833c365d5fad250db24
+  data.tar.gz: c464874fed76e5877450d76633908073d92a3fdaca4f40c4cf4189d491c1b95118a9aa87f4595e1abffb6ca85433709977e507baf0657e30ff7a1dc553bd28de

data/lib/avm/data/package.rb

@@ -46,7 +46,7 @@ module Avm
       end
 
       # @param id [Symbol]
-      # @return [Avm::Data::Unit]
+      # @return [Avm::Data::UnitWithCommands]
       def unit(identifier)
         units[identifier.to_sym] || raise("No unit found with identifier \"#{identifier}\"")
       end

data/lib/avm/data/unit.rb

@@ -6,72 +6,43 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Data
     class Unit
-      include ::Avm::Data::Callbacks
-
+      acts_as_abstract(
+        do_clear: [],
+        do_dump: [:dump_path],
+        do_load: [:dump_path],
+        dump_path_extension: []
+      )
       enable_speaker
+      include ::Avm::Data::Callbacks
 
-      %w[dump load].each do |action|
-        method_name = "#{action}_command"
-        class_eval <<~CODE, __FILE__, __LINE__ + 1
-          # Should be overrided.
-          # @return [EacRubyUtils::Envs::Command]
-          def #{method_name}
-            fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
-          end
-        CODE
-      end
-
-      def extension
-        singleton_class.const_get('EXTENSION')
-      rescue NameError
-        ''
-      end
-
-      def name
-        self.class
-      end
-
-      def load_from_directory(directory, identifier)
-        load(unit_on_directory_path(directory, identifier))
-      end
-
-      def dump_to_directory(directory, identifier)
-        dump(unit_on_directory_path(directory, identifier))
+      # @param dump_path [Pathname]
+      # @return [void]
+      def clear
+        run_callbacks(:dump) { do_clear }
       end
 
-      def dump(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def dump(dump_path)
         run_callbacks :dump do
-          infom "Dumping unit \"#{name}\" to \"#{data_path}\"..."
-          do_dump(data_path)
+          infom "Dumping unit \"#{name}\" to \"#{dump_path}\"..."
+          do_dump(dump_path)
         end
       end
 
-      # @return [Struct(:key, :subpath), nil]
-      def installation_files_data
-        nil
-      end
-
-      def load(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def load(dump_path)
         run_callbacks :load do
-          infom "Loading unit \"#{name}\" from \"#{data_path}\"..."
-          do_load(data_path)
+          clear
+          infom "Loading unit \"#{name}\" from \"#{dump_path}\"..."
+          do_load(dump_path)
         end
       end
 
-      protected
-
-      def do_dump(data_path)
-        dump_command.execute!(output_file: data_path)
-      end
-
-      def do_load(data_path)
-        load_command.execute!(input_file: data_path)
-      end
-
-      private
-
-      def unit_on_directory_path(directory, identifier)
-        ::File.join(directory, "#{identifier}#{extension}")
+      # @return [String]
+      def name
+        self.class.name
       end
     end
   end

data/lib/avm/data/unit_with_commands.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/data/callbacks'
+require 'avm/data/unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class UnitWithCommands < ::Avm::Data::Unit
+      acts_as_abstract
+
+      abstract_method :dump_command
+      abstract_method :load_command
+
+      # @return [String]
+      def dump_path_extension
+        singleton_class.const_get('EXTENSION')
+      rescue NameError
+        ''
+      end
+
+      def load_from_directory(directory, identifier)
+        load(unit_on_directory_path(directory, identifier))
+      end
+
+      def dump_to_directory(directory, identifier)
+        dump(unit_on_directory_path(directory, identifier))
+      end
+
+      # @return [Struct(:key, :subpath), nil]
+      def installation_files_data
+        nil
+      end
+
+      protected
+
+      def do_dump(data_path)
+        dump_command.execute!(output_file: data_path)
+      end
+
+      def do_load(data_path)
+        load_command.execute!(input_file: data_path)
+      end
+
+      private
+
+      def unit_on_directory_path(directory, identifier)
+        ::File.join(directory, "#{identifier}#{dump_path_extension}")
+      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,8 +17,6 @@ module Avm
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        before_load :clear
-
         # @return [Pathname]
         def files_path
           fs_path_subpath
@@ -33,8 +31,7 @@ module Avm
           instance_command('tar', '-xzf', '-', '-C', files_path)
         end
 
-        def clear
-          infom "Removing all files under #{files_path}..."
+        def do_clear
           instance_command('mkdir', '-p', files_path).execute!
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
         end

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

@@ -1,13 +1,25 @@
 # frozen_string_literal: true
 
-require 'avm/data/unit'
+require 'avm/data/unit_with_commands'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module Data
-      class Unit < ::Avm::Data::Unit
+      class Unit < ::Avm::Data::UnitWithCommands
         common_constructor :instance
+
+        # @return [Pathname]
+        def data_default_dump_path
+          instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
+            "#{b}_#{identifier}#{dump_path_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.69.0'
+  VERSION = '0.71.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.69.0
+  version: 0.71.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 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.32'
+        version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        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.113'
+        version: '0.115'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
+        version: '0.115'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - lib/avm/data/package/load.rb
 - lib/avm/data/rotate.rb
 - lib/avm/data/unit.rb
+- lib/avm/data/unit_with_commands.rb
 - lib/avm/docker.rb
 - lib/avm/docker/container.rb
 - lib/avm/docker/image.rb
@@ -288,6 +289,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