avm 0.74.0 → 0.75.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69fd41323b3ec2e08b3339520c7ac89b6a0a1f8504f662033e68f9a5f8d43eed
-  data.tar.gz: 32aa288f19bcfc07f494479e1c1fe04c660d77fdc3435e63c81ff9beb1ea97b2
+  metadata.gz: 283b2992d153ecb696d270dca06440c1211ad0986d2bcccbba13d59880ec8241
+  data.tar.gz: df2da2e866a10834d9b2d7c07e921f332de3b64937592bad04eb0c334cd1b3a6
 SHA512:
-  metadata.gz: 9fac0d42acc16cc1cf70b6c5331c20171356354400de3473aa5341d8b2c01d7b6c6ea168778359d50a867e6637678b5ad85f0f8ccc7aa5ff44f5c126728576a1
-  data.tar.gz: 36ae852382bacaeb8918cb351d3e9a7bff8db59476bd8ca3fa1ec88fcb20dbcad5546027b5b49a5789387017d59b1cc7b0d40fedb0c20c20f2234a0a3a28cf25
+  metadata.gz: 57b1246b460a76df268e0b1021e27e7a38ba6056225b5c363fa8ad53b52d5ec09d092518709060cab4fc8b472cce619d8a8b84ed9ff398e502ee5b827613d40b
+  data.tar.gz: 4552cfce3a392507c560938a8ae956278fe03b335d50c5213e4aecfde007b5beaa66012fc0c32a24ab0736f2dae4b5b85e0b3310c7c803a96c6d74e240fae775

data/lib/avm/data/dumper.rb

@@ -9,22 +9,17 @@ module Avm
   module Data
     class Dumper < ::Avm::Data::Performer
       DEFAULT_EXPIRE_TIME = 1.day
+      DEFAULT_OVERWRITE = false
+      DEFAULT_ROTATE = true
 
       enable_speaker
       enable_listable
-      lists.add_symbol :existing, :denied, :overwrite, :rotate, :rotate_expired
-      immutable_accessor :existing, :expire_time, :target_path
+      immutable_accessor :expire_time, :target_path
+      immutable_accessor :overwrite, :rotate, type: :boolean
 
-      # @return [String, nil]
+      # @return [nil]
       def cannot_perform_reason
-        return nil if !target_path.exist? ||
-                      [EXISTING_OVERWRITE, EXISTING_ROTATE].include?(existing)
-
-        if existing == EXISTING_DENIED
-          'Data exist and overwriting is denied'
-        elsif existing == EXISTING_ROTATE_EXPIRED && !target_path_expired?
-          'Data exist and yet is not expired'
-        end
+        nil
       end
 
       # @return [Pathname]
@@ -37,7 +32,7 @@ module Avm
 
       # @return [Boolean]
       def target_path_expired?
-        target_path_time.if_present(false) { |v| v >= expire_time }
+        target_path_time.if_present(true) { |v| v >= expire_time }
       end
 
       # @return [ActiveSupport::Duration, nil]
@@ -60,16 +55,20 @@ module Avm
         raise "\"#{temp_data_path}\" is not a file" unless temp_data_path.file?
       end
 
+      # @return [String, nil]
+      def do_rotate
+        return unless target_path.exist?
+        return unless rotate?
+
+        infom "Rotating \"#{target_path}\"..."
+        ::Avm::Data::Rotate.new(target_path).run
+      end
+
       # @return [Array<Symbol>]
       def excluded_units
         excludes.map(&:to_sym).sort
       end
 
-      # @return [Symbol, nil]
-      def existing_set_filter(value)
-        value.nil? ? nil : self.class.lists.existing.value_validate!(value)
-      end
-
       # @return [ActiveSupport::Duration]
       def expire_time_get_filter(value)
         value || DEFAULT_EXPIRE_TIME
@@ -91,13 +90,21 @@ module Avm
 
       # @return [self]
       def internal_perform
+        use_current? ? internal_perform_use_current : internal_perform_new
+      end
+
+      def internal_perform_new
         on_temp_data_file do
           build_temp_data_file
-          rotate
+          do_rotate
           move_data_to_target_path
         end
       end
 
+      def internal_perform_use_current
+        infom "Dump \"#{target_path}\" exists and is unexpired"
+      end
+
       def move_data_to_target_path
         ::FileUtils.mv(temp_data_path, target_path.assert_parent)
       end
@@ -109,19 +116,27 @@ module Avm
         end
       end
 
-      # @return [String, nil]
-      def rotate
-        return unless target_path.exist?
-        return unless existing == EXISTING_ROTATE
+      # @return [Boolean]
+      def overwrite_get_filter(value)
+        value.nil? ? DEFAULT_OVERWRITE : value
+      end
 
-        infom "Rotating \"#{target_path}\"..."
-        ::Avm::Data::Rotate.new(target_path).run
+      def rotate_get_filter(value)
+        value.nil? ? DEFAULT_ROTATE : value
       end
 
       # @return [Pathname]
       def target_path_get_filter(value)
         (value || default_dump_path).to_pathname
       end
+
+      # @return [Boolean]
+      def use_current?
+        return false unless target_path.exist?
+        return false if overwrite?
+
+        !target_path_expired?
+      end
     end
   end
 end

data/lib/avm/data/loader.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/data/performer'
+require 'avm/data/rotate'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module Data
+    class Loader < ::Avm::Data::Performer
+      immutable_accessor :source_path
+
+      # @return [String, nil]
+      def cannot_perform_reason
+        return 'Source path not set' if source_path.blank?
+        return "\"#{source_path}\" is not a file" unless source_path.file?
+
+        nil
+      end
+
+      protected
+
+      def internal_perform
+        data_owner.load(source_path, *include_excludes_arguments)
+      end
+    end
+  end
+end

data/lib/avm/data/package/load.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/base_performer'
 require 'avm/data/package/build_directory'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
@@ -7,37 +8,27 @@ require 'minitar'
 module Avm
   module Data
     class Package
-      class Load
+      class Load < ::Avm::Data::Package::BasePerformer
+        enable_method_class
         enable_speaker
         include ::Avm::Data::Package::BuildDirectory
 
-        common_constructor :package, :data_file_path
+        attr_reader :source_path
 
-        def runnable?
-          cannot_run_reason.blank?
+        def initialize(package, source_path, options = {})
+          super(package, options)
+          @source_path = source_path.to_pathname
         end
 
-        def cannot_run_reason
-          return nil if data_file_exist?
-
-          "Data file \"#{data_file_path}\" does not exist"
-        end
-
-        def run
-          raise "Cannot run: #{cannot_run_reason}" unless runnable?
-
+        def result
           on_build_directory do
             extract_packages_to_build_directory
-            package.load_units_from_directory(build_directory)
+            package.load_units_from_directory(build_directory, selected_units)
           end
         end
 
-        def data_file_exist?
-          ::File.exist?(data_file_path)
-        end
-
         def extract_packages_to_build_directory
-          ::Minitar.unpack(data_file_path, build_directory.to_path)
+          ::Minitar.unpack(source_path.to_path, build_directory.to_path)
         end
       end
     end

data/lib/avm/data/package.rb

@@ -32,10 +32,6 @@ module Avm
         DATA_FILE_EXTENSION
       end
 
-      def load(data_path)
-        ::Avm::Data::Package::Load.new(self, data_path)
-      end
-
       def dump_units_to_directory(directory, selected_units = nil)
         run_callbacks :dump do
           (selected_units || units).each do |identifier, unit|
@@ -44,9 +40,11 @@ module Avm
         end
       end
 
-      def load_units_from_directory(directory)
+      def load_units_from_directory(directory, selected_units = nil)
         run_callbacks :load do
-          units.each { |identifier, unit| unit.load_from_directory(directory, identifier) }
+          (selected_units || units).each do |identifier, unit|
+            unit.load_from_directory(directory, identifier)
+          end
         end
       end
 

data/lib/avm/data/performer.rb

@@ -19,7 +19,7 @@ module Avm
 
       # @return [self]
       def perform
-        raise "Cannot run: #{cannot_run_reason}" unless performable?
+        raise "Cannot run: #{cannot_perform_reason}" unless performable?
 
         internal_perform
 

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.75.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-21 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,7 @@ files:
 - lib/avm/data/callbacks.rb
 - lib/avm/data/clearer.rb
 - lib/avm/data/dumper.rb
+- lib/avm/data/loader.rb
 - lib/avm/data/package.rb
 - lib/avm/data/package/base_performer.rb
 - lib/avm/data/package/build_directory.rb