avm-tools 0.149.0 → 0.151.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9d3ec974736d535de064589ef2af6f4fae2b149e043675200df92b851eea30
-  data.tar.gz: 8da5ec56f8c81c6cdaa403534c33d88586c64eda07e7a706674ffc650f27908f
+  metadata.gz: c60d219cf0cd61916b844199ecf17b1e097a24831776d6b4269affecfc3a482d
+  data.tar.gz: c92fc021d025e424f14c0a39cde75e8441bead7ec59a9eb89fe1165b557cc8d7
 SHA512:
-  metadata.gz: 45591b92498af434eaae3eb096134b6d8952593fdaeffea04d143e76a534593ad689ce15f2c2f39164f2b625696749aabfb6992c648444631a345fdb3fd00f9f
-  data.tar.gz: 91962893c6add83e548ad9a02bd9c2ef69a759eb6e8d1f002483f44afeff041f35968957c9a2c44b33a7274e416f7c7c53c45e78bef215bc2234783ae6a9fff3
+  metadata.gz: 382924d03ba66a9b11f54caed5fc5ec47944b279b6b87a95efa97e77aeb89586fd8c737b34185920e18c6c5019bfd3b82d7203f275add9a5e92240e9daab1504
+  data.tar.gz: f237e441c5abd9ac5e5a41e77074391d7df475c2f85029725f34d433dac02a35968bdeab5846426bb537eb499a49c449768e7dba846a71b4fcfaf172d2cd3737

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/data/package/dump'
 require 'avm/instances/runner'
 require 'eac_cli/core_ext'
 
@@ -10,53 +9,8 @@ module Avm
       class Instance < ::Avm::Instances::Runner
         class Data
           class Dump
-            DUMP_EXPIRE_TIME = 1.day
-            NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
-              'dump was expired.'
-
-            runner_with :help do
-              desc 'Dump utility for EacRailsBase instance.'
-              bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
-              pos_arg :dump_path, optional: true
-            end
-
-            # @return [String]
-            def help_extra_text
-              "Default dump path: \"#{default_dump_path}\""
-            end
-
-            def run
-              infov 'Instance to dump', "#{instance} (#{instance.class})"
-              if package_dump.runnable?
-                package_dump.run
-              else
-                warn(package_dump.cannot_run_reason)
-              end
-              success("Dump path: \"#{dump_path}\"")
-              dump_path
-            end
-
-            private
-
-            def package_dump_uncached
-              instance
-                .data_package.dump(dump_path, existing: package_dump_existing)
-            end
-
-            def dump_path
-              parsed.dump_path || default_dump_path
-            end
-
-            def default_dump_path
-              instance.data_default_dump_path
-            end
-
-            def package_dump_existing
-              if parsed.rewrite?
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE
-              else
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
-              end
+            runner_with :help, :include_exclude, :instance_data_dump do
+              desc 'Dump utility for instance.'
             end
           end
         end

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

@@ -9,46 +9,8 @@ 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
-            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)
+            runner_with :help, :include_exclude, :instance_data_load do
+              desc 'Load utility for instance.'
             end
           end
         end

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

@@ -10,28 +10,7 @@ module Avm
         class Data
           class Unit
             class Dump
-              runner_with :help do
-                pos_arg :dump_path, optional: true
-              end
-
-              def run
-                data_owner.dump(dump_path)
-              end
-
-              # @return [String]
-              def help_extra_text
-                "Default dump path: \"#{default_dump_path}\""
-              end
-
-              # @return [Pathname]
-              def dump_path
-                (parsed.dump_path || default_dump_path).to_pathname
-              end
-
-              # @return [String]
-              def default_dump_path
-                data_owner.data_default_dump_path
-              end
+              runner_with :help, :instance_data_dump
             end
           end
         end

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

@@ -10,18 +10,7 @@ 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
-
-              # @return [Pathname]
-              def dump_path
-                parsed.dump_path.to_pathname
-              end
+              runner_with :help, :instance_data_load
             end
           end
         end

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

@@ -2,7 +2,7 @@
 
 require 'avm/data/clearer'
 require 'eac_cli/core_ext'
-require 'eac_cli/runner'
+require 'avm/tools/runner_with/instance_data_performer'
 
 module Avm
   module Tools
@@ -10,19 +10,12 @@ module Avm
       module InstanceDataClear
         common_concern do
           enable_simple_cache
-          include ::EacCli::Runner
+          include ::Avm::Tools::RunnerWith::InstanceDataPerformer
         end
 
-        def run
-          performer.perform
-        end
-
-        private
-
-        def performer_uncached
-          %i[include exclude].inject(::Avm::Data::Clearer.new(data_owner)) do |a1, e1|
-            if_respond(e1, []).inject(a1) { |a2, e2| a2.send(e1, e2) }
-          end
+        # @return [Class]
+        def data_performer_class
+          ::Avm::Data::Clearer
         end
       end
     end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avm/data/dumper'
+require 'eac_cli/core_ext'
+require 'avm/tools/runner_with/instance_data_performer'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module InstanceDataDump
+        common_concern do
+          enable_simple_cache
+          runner_definition do
+            bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
+            pos_arg :dump_path, optional: true
+          end
+
+          set_callback :run, :after do
+            success("Dump path: \"#{dump_path}\"")
+            dump_path
+          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.'
+
+        # @return [Class]
+        def data_performer_class
+          ::Avm::Data::Dumper
+        end
+
+        # @return [String]
+        def help_extra_text
+          "Default dump path: \"#{default_dump_path}\""
+        end
+
+        private
+
+        # @return [Avm::Data::Dumper]
+        def data_performer_uncached
+          r = super.overwrite(parsed.rewrite?)
+          parsed.dump_path.if_present(r) { |v| r.target_path(v.to_pathname) }
+        end
+
+        # @return [Pathname]
+        def dump_path
+          data_performer.target_path
+        end
+
+        def default_dump_path
+          data_performer.default_dump_path
+        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_package).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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_cli/runner'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module InstanceDataPerformer
+        acts_as_abstract :data_performer_class
+        common_concern do
+          enable_simple_cache
+          include ::EacCli::Runner
+        end
+
+        def run
+          if data_performer.performable?
+            data_performer.perform
+          else
+            fatal_error("Cannot perform: #{data_performer.cannot_perform_reason}")
+          end
+        end
+
+        private
+
+        # @return [Avm::Data::Performer]
+        def data_performer_uncached
+          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
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.149.0'
+    VERSION = '0.151.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.149.0
+  version: 0.151.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-23 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.73'
+        version: '0.75'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.73'
+        version: '0.75'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +311,9 @@ files:
 - lib/avm/tools/runner_with.rb
 - 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
 - template/avm/self/docker_image/Dockerfile