avm-tools 0.150.0 → 0.151.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bab59c8dee4bea0f37e1c0d6e9d5cebff9b299aa8f0381ea9e64c47e3404b80
-  data.tar.gz: 5479c8cfa3d9da70d5359ca226eb051f7854b30bdb68de2ac3579b6eb95b5f54
+  metadata.gz: bfb9ed8f8b1418ecd980d2e3d540bca717ba403dbbf758ba3bfa39375c433db4
+  data.tar.gz: 18781412c293f956a786b2f9da16218b8cf6c042273189c806e0a069572c466f
 SHA512:
-  metadata.gz: ed6c7a23f72685841427cbd84fe08cac9b92e42d3c4f5bee6794c05d2680a1cdbfbb3e24d9d92ab93524a07e88e46f121dc1b41f8b0f9147a885a82f616a1f3c
-  data.tar.gz: d45232d1d1ac68ea6f1080ee6a73a22c908ed8c9f530ac0ec2d5a5a0261b6e277080d25a8eb844ef1e1596865a6a522756b7ba7c3c009a5e0b6bf0f9bf79675c
+  metadata.gz: 9582c923d0a7eaecf6449c73b00f694080404b6d598a1118c419cf8dd502a1bfc83fcb3153b21b5e5ea10ae309f2e64aff8167b9d34b2495aa3de5945412ebbe
+  data.tar.gz: 43843c16118268169b44dd69eda28f77ea2c96e39c0f9f604fcc9d252b29a47158907a645436e62effb703172b2a035ae119fe27d6c5ef5fa729bb54e229a2c9

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

@@ -9,46 +9,13 @@ module Avm
       class Instance < ::Avm::Instances::Runner
         class Data
           class Load
-            runner_with :help do
-              desc 'Load utility for EacRailsBase instance.'
-              arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
-              pos_arg :dump_path, optional: true
+            runner_with :help, :include_exclude, :instance_data_load do
+              desc 'Load utility for instance.'
             end
 
-            def run
-              return fatal_error("Dump \"#{dump_path}\" does not exist") unless
-              ::File.exist?(dump_path)
-
-              load_dump
-              success("Dump loaded from \"#{dump_path}\"")
-            end
-
-            def dump_path_uncached
-              return parsed.dump_path.to_s if parsed.dump_path.present?
-              return source_instance_dump_path if parsed.source_instance.present?
-
-              raise "Dump path unknown (Options: #{parsed})"
-            end
-
-            def source_instance_dump_path
-              runner_context.call(:instance).class.by_id(parsed.source_instance).run_subcommand(
-                ::Avm::Tools::Runner::Instance::Data::Dump, []
-              )
-            end
-
-            def load_dump
-              info "Loading dump \"#{dump_path}\"..."
-              package_load.run
-            end
-
-            def dump_instance_method
-              :dump_database
-            end
-
-            private
-
-            def package_load_uncached
-              runner_context.call(:instance).data_package.load(dump_path)
+            # @return [Avm::Instances::Data::Package]
+            def source_instance_data_owner
+              source_instance.data_package
             end
           end
         end

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

@@ -10,17 +10,11 @@ module Avm
         class Data
           class Unit
             class Load
-              runner_with :help do
-                pos_arg :dump_path
-              end
-
-              def run
-                data_owner.load(dump_path)
-              end
+              runner_with :help, :instance_data_load
 
-              # @return [Pathname]
-              def dump_path
-                parsed.dump_path.to_pathname
+              # @return [Avm::Instances::Data::Unit]
+              def source_instance_data_owner
+                source_instance.data_package.unit(data_owner.identifier)
               end
             end
           end

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

@@ -28,14 +28,10 @@ module Avm
           end
 
           def entry_keys_banner
-            ::Avm::Instances::EntryKeys.all.each do |key|
+            instance.entry_keys.each do |key|
               infov key, instance.read_entry_optional(key)
             end
           end
-
-          def instance
-            runner_context.call(:instance)
-          end
         end
       end
     end

data/lib/avm/tools/runner_with/instance_data_dump.rb

@@ -10,8 +10,6 @@ module Avm
       module InstanceDataDump
         common_concern do
           enable_simple_cache
-          include ::Avm::Tools::RunnerWith::InstanceDataPerformer
-
           runner_definition do
             bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
             pos_arg :dump_path, optional: true
@@ -23,6 +21,8 @@ module Avm
           end
         end
 
+        include ::Avm::Tools::RunnerWith::InstanceDataPerformer
+
         DUMP_EXPIRE_TIME = 1.day
         NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
           'dump was expired.'
@@ -41,25 +41,18 @@ module Avm
 
         # @return [Avm::Data::Dumper]
         def data_performer_uncached
-          super.existing(dump_existing)
+          r = super.overwrite(parsed.rewrite?)
+          parsed.dump_path.if_present(r) { |v| r.target_path(v.to_pathname) }
         end
 
         # @return [Pathname]
         def dump_path
-          (parsed.dump_path || default_dump_path).to_pathname
+          data_performer.target_path
         end
 
         def default_dump_path
           data_performer.default_dump_path
         end
-
-        def dump_existing
-          if parsed.rewrite?
-            ::Avm::Data::Package::Dump::EXISTING_ROTATE
-          else
-            ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
-          end
-        end
       end
     end
   end

data/lib/avm/tools/runner_with/instance_data_load.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'avm/data/dumper'
+require 'avm/data/loader'
+require 'eac_cli/core_ext'
+require 'avm/tools/runner_with/instance_data_performer'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module InstanceDataLoad
+        common_concern do
+          enable_simple_cache
+
+          runner_definition do
+            arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
+            bool_opt '-w', '--rewrite'
+            pos_arg :dump_path, optional: true
+          end
+
+          set_callback :run, :after do
+            success("Dump loaded from \"#{dump_path}\"")
+          end
+        end
+
+        include ::Avm::Tools::RunnerWith::InstanceDataPerformer
+
+        # @return [Class]
+        def data_performer_class
+          ::Avm::Data::Loader
+        end
+
+        private
+
+        # @return [Avm::Data::Loader]
+        def data_performer_uncached
+          super.source_path(dump_path)
+        end
+
+        # @return [Pathname]
+        def dump_path_uncached
+          return parsed.dump_path.to_pathname if parsed.dump_path.present?
+          return source_instance_dump_path if parsed.source_instance.present?
+
+          fatal_error "Dump path not set (Options: #{parsed})"
+        end
+
+        # @return [Avm::Instances::Base]
+        def source_instance
+          runner_context.call(:instance).class.by_id(parsed.source_instance)
+        end
+
+        # @return [Avm::Data::Dumper]
+        def source_instance_dumper
+          data_performer_set_includes_excludes(
+            ::Avm::Data::Dumper.new(source_instance_data_owner).overwrite(parsed.rewrite?)
+          )
+        end
+
+        # @return [Pathname]
+        def source_instance_dump_path
+          r = source_instance_dumper
+          r.perform
+          r.target_path
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner_with/instance_data_performer.rb

@@ -17,7 +17,7 @@ module Avm
           if data_performer.performable?
             data_performer.perform
           else
-            warn("Cannot perform: #{data_performer.cannot_perform_reason}")
+            fatal_error("Cannot perform: #{data_performer.cannot_perform_reason}")
           end
         end
 
@@ -25,7 +25,12 @@ module Avm
 
         # @return [Avm::Data::Performer]
         def data_performer_uncached
-          %i[include exclude].inject(data_performer_class.new(data_owner)) do |a1, e1|
+          data_performer_set_includes_excludes(data_performer_class.new(data_owner))
+        end
+
+        # @return [Avm::Data::Performer]
+        def data_performer_set_includes_excludes(data_performer)
+          %i[include exclude].inject(data_performer) do |a1, e1|
             if_respond(e1, []).inject(a1) { |a2, e2| a2.send(e1, e2) }
           end
         end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.150.0'
+    VERSION = '0.151.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.150.0
+  version: 0.151.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-21 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,28 +16,28 @@ 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: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.76'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.76'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ files:
 - lib/avm/tools/runner_with/include_exclude.rb
 - lib/avm/tools/runner_with/instance_data_clear.rb
 - lib/avm/tools/runner_with/instance_data_dump.rb
+- lib/avm/tools/runner_with/instance_data_load.rb
 - lib/avm/tools/runner_with/instance_data_performer.rb
 - lib/avm/tools/self.rb
 - lib/avm/tools/version.rb