avm 0.70.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e2eb2f46518de88aca96c5a8cedf9c64abb72b862a657a195ef6ff081547cf4
-  data.tar.gz: 0e516460bb5620cd9ceb9f6bfbfd04db263760a1ec294f1d67c8fe43c78dd81c
+  metadata.gz: 9ffe2b9afc29fb661c8ba611355b5404deaea76ff43aa31c59180035e8942acf
+  data.tar.gz: f66cf38833ff6ab3a0b1be19f739ce0620b79d8614828396440d11aade4d4525
 SHA512:
-  metadata.gz: 2eb9e691468af8f7e927c2dc99c8d7a1ff5472a5cfa846bab185416062fd9e2ec338fe38a374837f4cc260aa2bbf9380b7bd85b156d53779087f4a14970b3e89
-  data.tar.gz: 01dac660041abddfcebfa4b1bc56bcfe21d775c6393b6c575b0dba1ba3bec2286f0dfe15505ee3b17bc9222332dbd28e17f3333c0282f89bec9f4b178cef4442
+  metadata.gz: 52928731a9e75e5b7664b01b2ebe21121fa848b79220e80e6c216beecd03eb8593a3abf876086d69123fe1a15d11310395cd5edbfa2875cf3814978d4b8e36de
+  data.tar.gz: 560b52184f5ec719930168746726ab02c8768bc514a1f10cec54d5e5b08a0649c1b61711a59796fff5cdebc689faf80c2a4cd6400db54965ba953c6bbcaf49d2

data/lib/avm/data/clearer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Clearer
+      enable_speaker
+
+      common_constructor :storage
+
+      # @return [self]
+      def perform
+        storage.clear
+      end
+    end
+  end
+end

data/lib/avm/data/package/clear.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      class Clear
+        enable_method_class
+        enable_speaker
+        common_constructor :package
+
+        # @return [void]
+        def result
+          package.units.each do |identifier, unit|
+            infov 'Clearing unit', identifier
+            unit.clear
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/data/package/dump.rb

@@ -14,7 +14,6 @@ module Avm
         include ::Avm::Data::Package::BuildDirectory
 
         DEFAULT_EXPIRE_TIME = 1.day
-        DEFAULT_FILE_EXTENSION = '.tar'
 
         attr_reader :package, :data_file_path, :existing
 
@@ -73,15 +72,6 @@ module Avm
 
         private
 
-        def download
-          infom 'Downloading dump...'
-          download_path = find_download_path
-          dump_command.system!(output_file: download_path)
-          fatal_error "File \"#{download_path}\" not saved" unless ::File.exist?(download_path)
-          fatal_error "File \"#{download_path}\" is empty" if ::File.zero?(download_path)
-          download_path
-        end
-
         def move_download_to_final_dest(download_path)
           ::FileUtils.mkdir_p(::File.dirname(data_file_path))
           ::FileUtils.mv(download_path, data_file_path)

data/lib/avm/data/package.rb

@@ -6,9 +6,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Data
     class Package
-      require_sub __FILE__
+      require_sub __FILE__, require_mode: :kernel
       include ::Avm::Data::Callbacks
 
+      DATA_FILE_EXTENSION = '.tar'
+
       def initialize(options)
         options = options.to_options_consumer
         units = options.consume(:units)
@@ -25,6 +27,11 @@ module Avm
         self
       end
 
+      # @return [String]
+      def data_file_extension
+        DATA_FILE_EXTENSION
+      end
+
       def dump(data_path, options = {})
         ::Avm::Data::Package::Dump.new(self, data_path, options)
       end
@@ -46,7 +53,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/docker/runner.rb

@@ -116,10 +116,6 @@ module Avm
       def version?
         !parsed.no_version?
       end
-
-      def instance
-        runner_context.call(:instance)
-      end
     end
   end
 end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/data/package/dump'
 require 'avm/self/instance'
 
 module Avm
@@ -15,7 +14,7 @@ module Avm
               .if_present do |v|
               ::File.join(
                 v,
-                "#{id}#{::Avm::Instances::Data::Package::Dump::DEFAULT_FILE_EXTENSION}"
+                "#{id}#{data_package.data_file_extension}"
               )
             end
           end

data/lib/avm/instances/base.rb

@@ -34,6 +34,16 @@ module Avm
         self.suffix = suffix.to_s
       end
 
+      # @return [Avm::Instances::Data::Package]
+      def data_package
+        @data_package ||= data_package_create
+      end
+
+      # @return [Avm::Instances::Data::Package]
+      def data_package_create
+        ::Avm::Instances::Data::Package.new(self)
+      end
+
       # @return [String]
       def id
         ::Avm::Instances::Ids.build(application.id, suffix)

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,18 +1,18 @@
 # 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}#{extension}"
+            "#{b}_#{identifier}#{dump_path_extension}"
           end
         end
 

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.33'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.116'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.116'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -238,12 +238,15 @@ files:
 - lib/avm/applications/base/publishing.rb
 - lib/avm/applications/base/stereotype.rb
 - lib/avm/data/callbacks.rb
+- lib/avm/data/clearer.rb
 - lib/avm/data/package.rb
 - lib/avm/data/package/build_directory.rb
+- lib/avm/data/package/clear.rb
 - lib/avm/data/package/dump.rb
 - 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