eac_tools 0.68.0 → 0.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63f09025e8e8556ee1d7ff523a4b446e31d3fd41f2cbc61fba7bbf0e6d71750
-  data.tar.gz: 2d3999c05d5c690f2a99b50a683476f73e1dc48d280822b6b9f4ba67f36e5481
+  metadata.gz: 154479f83d348a92c4679896b5823cde655434bff03318a87f1327504a60b666
+  data.tar.gz: 1af0723d19a94caaf7eae6af5fc4151cf2bd2bb108e29c335dfe721e1f4714ff
 SHA512:
-  metadata.gz: 6c2aa0133d8cffca359ad2c33d6a22e8fa6dd1753c27392674b2ec9989d1ec252f7b66450668456afcd766b38119a9afeff4ecff2bfa1e03f689354cc3d6f682
-  data.tar.gz: 98273baeb8b792a5196e5f22a5babae50e91832fb09e1b5734a47c22209ad93021c09821bf5cc980501fd89b9dc79acb85cbe93f12ac5386d9dbb88b4eb20b52
+  metadata.gz: 0103ea3d0b34d1e27e9e940c9e654e968bd4dde5b348c38180fd3bd95f9c569712c95dcd53ff37f1e5cd90db4d95c6c8542429f3ac71ed2037fd162bbc507264
+  data.tar.gz: 1d6bc0ab13de8660b2baa316fd86333e3ecff40217f52ea35023598781dd8f1a98ab6aedf8143791a99d4f56b55dc0dad6f2578bb1c6e6629f035bd455572a31

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.68.0)
-      avm (~> 0.74)
+    eac_tools (0.69.0)
+      avm (~> 0.75)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -17,18 +17,18 @@ PATH
       avm-eac_webapp_base0 (~> 0.17, >= 0.17.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.3)
-      avm-tools (~> 0.150)
+      avm-tools (~> 0.151)
       eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.18.0)
+    aranha-parsers (0.19.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.4)
-      eac_envs-http (~> 0.3, >= 0.3.1)
-      eac_ruby_utils (~> 0.116)
-      nokogiri (~> 1.14, >= 1.14.4)
+      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_ruby_utils (~> 0.117)
+      nokogiri (~> 1.15, >= 1.15.1)
       ofx-parser (~> 1.1)
 
 PATH
@@ -174,9 +174,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.150.0)
-      aranha-parsers (~> 0.18)
-      avm (~> 0.74)
+    avm-tools (0.151.0)
+      aranha-parsers (~> 0.19)
+      avm (~> 0.75)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
       avm-files (~> 0.6, >= 0.6.2)
@@ -192,8 +192,8 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.74.0)
-      aranha-parsers (~> 0.18)
+    avm (0.75.0)
+      aranha-parsers (~> 0.19)
       eac_cli (~> 0.35)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
@@ -335,7 +335,7 @@ GEM
     htmlbeautifier (1.4.2)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.5)
     minitar (0.9)
     minitest (5.18.0)
     multipart-post (2.3.0)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.68.0'
+  VERSION = '0.69.0'
 end

data/sub/aranha-parsers/aranha-parsers.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport', '>= 4.0.0'
   s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
-  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.116'
-  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.4'
+  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
+  s.add_dependency 'nokogiri', '~> 1.15', '>= 1.15.1'
   s.add_dependency 'ofx-parser', '~> 1.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/aranha-parsers/lib/aranha/parsers/html/node/default.rb

@@ -10,11 +10,6 @@ module Aranha
         class Default < ::Aranha::Parsers::Html::Node::Base
           require_sub __FILE__, include_modules: true
 
-          def array_value(node, xpath)
-            r = node_set_value(node, xpath).map { |n| n.text.strip }
-            r.join('|')
-          end
-
           def join_value(node, xpath)
             m = ''
             node_set_value(node, xpath).each do |n|

data/sub/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

data/sub/avm/avm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.18'
+  s.add_dependency 'aranha-parsers', '~> 0.19'
   s.add_dependency 'eac_cli', '~> 0.35'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.7'

data/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/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/sub/avm/lib/avm/version.rb

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

data/sub/avm-tools/avm-tools.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.add_dependency 'aranha-parsers', '~> 0.18'
-  s.add_dependency 'avm', '~> 0.74'
+  s.add_dependency 'aranha-parsers', '~> 0.19'
+  s.add_dependency 'avm', '~> 0.75'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.3'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'

data/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/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/sub/avm-tools/lib/avm/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.69.0
 platform: ruby
 authors:
 - Put here the authors
 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: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.75'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.75'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +292,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.150'
+        version: '0.151'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.150'
+        version: '0.151'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1098,6 +1098,7 @@ files:
 - sub/avm-tools/lib/avm/tools/runner_with/include_exclude.rb
 - sub/avm-tools/lib/avm/tools/runner_with/instance_data_clear.rb
 - sub/avm-tools/lib/avm/tools/runner_with/instance_data_dump.rb
+- sub/avm-tools/lib/avm/tools/runner_with/instance_data_load.rb
 - sub/avm-tools/lib/avm/tools/runner_with/instance_data_performer.rb
 - sub/avm-tools/lib/avm/tools/self.rb
 - sub/avm-tools/lib/avm/tools/version.rb
@@ -1139,6 +1140,7 @@ files:
 - sub/avm/lib/avm/data/callbacks.rb
 - sub/avm/lib/avm/data/clearer.rb
 - sub/avm/lib/avm/data/dumper.rb
+- sub/avm/lib/avm/data/loader.rb
 - sub/avm/lib/avm/data/package.rb
 - sub/avm/lib/avm/data/package/base_performer.rb
 - sub/avm/lib/avm/data/package/build_directory.rb