eac_tools 0.67.1 → 0.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0650351188a8e6d37ba2f6de9f72aaafea66701164cd576ada4fb32ffaba32cc'
-  data.tar.gz: 748edc307ad72537a3bbfa167e537fcf9747f44b1ed49b71e58e24fa470de65b
+  metadata.gz: f63f09025e8e8556ee1d7ff523a4b446e31d3fd41f2cbc61fba7bbf0e6d71750
+  data.tar.gz: 2d3999c05d5c690f2a99b50a683476f73e1dc48d280822b6b9f4ba67f36e5481
 SHA512:
-  metadata.gz: e08048e32da53d1cb6a81053e9412661102a9d1fdb2e2f9370a6a783b4a0e09b3edfa0cb96a79b452578bfed7ab443ee61f89208b786a600ec3679be0247e224
-  data.tar.gz: f5e0fa874e7a5c6992a0f7a0fac38ed3c85a0b2005857eaabf22ec3faab481d3852e8f971d5b0415c474a1ca704878f62341366f4bcf15bcc0820f0891bed9b4
+  metadata.gz: 6c2aa0133d8cffca359ad2c33d6a22e8fa6dd1753c27392674b2ec9989d1ec252f7b66450668456afcd766b38119a9afeff4ecff2bfa1e03f689354cc3d6f682
+  data.tar.gz: 98273baeb8b792a5196e5f22a5babae50e91832fb09e1b5734a47c22209ad93021c09821bf5cc980501fd89b9dc79acb85cbe93f12ac5386d9dbb88b4eb20b52

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.67.1)
-      avm (~> 0.73, >= 0.73.1)
+    eac_tools (0.68.0)
+      avm (~> 0.74)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -17,7 +17,7 @@ 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.149)
+      avm-tools (~> 0.150)
       eac_ruby_utils (~> 0.117)
 
 PATH
@@ -174,13 +174,13 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.149.0)
+    avm-tools (0.150.0)
       aranha-parsers (~> 0.18)
-      avm (~> 0.73)
+      avm (~> 0.74)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
       avm-files (~> 0.6, >= 0.6.2)
-      avm-git (~> 0.13, >= 0.13.2)
+      avm-git (~> 0.13, >= 0.13.3)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14, >= 0.14.1)
@@ -192,7 +192,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.73.1)
+    avm (0.74.0)
       aranha-parsers (~> 0.18)
       eac_cli (~> 0.35)
       eac_config (~> 0.12)

data/lib/eac_tools/version.rb

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

data/sub/avm/lib/avm/data/dumper.rb

@@ -0,0 +1,127 @@
+# 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 Dumper < ::Avm::Data::Performer
+      DEFAULT_EXPIRE_TIME = 1.day
+
+      enable_speaker
+      enable_listable
+      lists.add_symbol :existing, :denied, :overwrite, :rotate, :rotate_expired
+      immutable_accessor :existing, :expire_time, :target_path
+
+      # @return [String, 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
+      end
+
+      # @return [Pathname]
+      def default_dump_path
+        r = data_owner.data_default_dump_path
+        include_excludes_path_suffix.if_present(r) do |v|
+          r.basename_sub('.*') { |b| "#{b}#{v}#{r.extname}" }
+        end
+      end
+
+      # @return [Boolean]
+      def target_path_expired?
+        target_path_time.if_present(false) { |v| v >= expire_time }
+      end
+
+      # @return [ActiveSupport::Duration, nil]
+      def target_path_time
+        target_path.exist? ? ::Time.now - ::File.mtime(target_path) : nil
+      end
+
+      protected
+
+      attr_reader :temp_data_path
+
+      # @return [Array<Symbol>]
+      def all_units
+        data_owner.units.keys.sort
+      end
+
+      def build_temp_data_file
+        data_owner.dump(temp_data_path, *include_excludes_arguments)
+        raise "\"#{temp_data_path}\" do not exist" unless temp_data_path.exist?
+        raise "\"#{temp_data_path}\" is not a file" unless temp_data_path.file?
+      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
+      end
+
+      # @return [String]
+      def include_excludes_path_suffix
+        return nil unless data_owner.respond_to?(:units)
+
+        r = included_units.any? ? included_units : all_units
+        r -= excluded_units if excluded_units.any?
+        r.any? && r != all_units ? "_#{r.join('-')}" : ''
+      end
+
+      # @return [Array<Symbol>]
+      def included_units
+        includes.map(&:to_sym).sort
+      end
+
+      # @return [self]
+      def internal_perform
+        on_temp_data_file do
+          build_temp_data_file
+          rotate
+          move_data_to_target_path
+        end
+      end
+
+      def move_data_to_target_path
+        ::FileUtils.mv(temp_data_path, target_path.assert_parent)
+      end
+
+      def on_temp_data_file
+        ::EacRubyUtils::Fs::Temp.on_file do |file|
+          @temp_data_path = file.to_pathname
+          yield
+        end
+      end
+
+      # @return [String, nil]
+      def rotate
+        return unless target_path.exist?
+        return unless existing == EXISTING_ROTATE
+
+        infom "Rotating \"#{target_path}\"..."
+        ::Avm::Data::Rotate.new(target_path).run
+      end
+
+      # @return [Pathname]
+      def target_path_get_filter(value)
+        (value || default_dump_path).to_pathname
+      end
+    end
+  end
+end

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

@@ -1,109 +1,43 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/base_performer'
 require 'avm/data/package/build_directory'
-require 'avm/data/rotate'
 require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
 module Avm
   module Data
     class Package
-      class Dump
-        enable_speaker
-        enable_listable
+      class Dump < ::Avm::Data::Package::BasePerformer
+        enable_method_class
         include ::Avm::Data::Package::BuildDirectory
 
-        DEFAULT_EXPIRE_TIME = 1.day
+        attr_reader :target_path
 
-        attr_reader :package, :data_file_path, :existing
-
-        lists.add_string :existing, :denied, :overwrite, :rotate, :rotate_expired
-
-        def initialize(package, data_file_path, options = {})
-          @package = package
-          @data_file_path = data_file_path
-          options = options.to_options_consumer
-          @existing, @expire_time = options.consume(:existing, :expire_time)
-          options.validate
-          self.class.lists.existing.value_validate!(@existing)
-        end
-
-        def runnable?
-          cannot_run_reason.blank?
-        end
-
-        def cannot_run_reason
-          return nil if !data_file_exist? ||
-                        [EXISTING_OVERWRITE, EXISTING_ROTATE].include?(existing)
-
-          if existing == EXISTING_DENIED
-            'Data exist and overwriting is denied'
-          elsif existing == EXISTING_ROTATE_EXPIRED && !data_file_expired?
-            'Data exist and yet is not expired'
-          end
+        def initialize(package, target_path, options = {})
+          super(package, options)
+          @target_path = target_path.to_pathname
         end
 
-        def run
-          raise "Cannot run: #{cannot_run_reason}" unless runnable?
-
-          package_file = on_build_directory do
+        # @return [void]
+        def result
+          on_build_directory do
             dump_units_to_build_directory
             create_package_file
           end
-          rotate
-          move_download_to_final_dest(package_file)
-        end
-
-        def data_file_exist?
-          ::File.exist?(data_file_path)
-        end
-
-        def data_file_time
-          data_file_exist? ? ::Time.now - ::File.mtime(data_file_path) : nil
-        end
-
-        def data_file_expired?
-          data_file_time.if_present(false) { |v| v >= expire_time }
-        end
-
-        def expire_time
-          @expire_time || DEFAULT_EXPIRE_TIME
-        end
-
-        private
-
-        def move_download_to_final_dest(download_path)
-          ::FileUtils.mkdir_p(::File.dirname(data_file_path))
-          ::FileUtils.mv(download_path, data_file_path)
-        end
-
-        def rotate
-          return unless data_file_exist?
-          return unless existing == EXISTING_ROTATE
-
-          infom "Rotating \"#{data_file_path}\"..."
-          ::Avm::Data::Rotate.new(data_file_path).run
         end
 
-        def new_build_path
-          f = ::Tempfile.new(self.class.name.parameterize + '-download')
-          path = f.path
-          f.close
-          f.unlink
-          path
-        end
+        protected
 
         def dump_units_to_build_directory
-          package.dump_units_to_directory(build_directory)
+          package.dump_units_to_directory(build_directory, selected_units)
         end
 
         def create_package_file
-          package_path = new_build_path
-          infom "Creating package \"#{package_path}\" from \"#{build_directory}\"..."
+          infom "Creating package \"#{target_path}\" from \"#{build_directory}\"..."
           ::Dir.chdir(build_directory.to_path) do
-            ::Minitar.pack('.', File.open(::File.expand_path(package_path), 'wb'))
+            ::Minitar.pack('.', ::File.open(target_path, 'wb'))
           end
-          package_path
         end
       end
     end

data/sub/avm/lib/avm/data/package.rb

@@ -32,17 +32,15 @@ module Avm
         DATA_FILE_EXTENSION
       end
 
-      def dump(data_path, options = {})
-        ::Avm::Data::Package::Dump.new(self, data_path, options)
-      end
-
       def load(data_path)
         ::Avm::Data::Package::Load.new(self, data_path)
       end
 
-      def dump_units_to_directory(directory)
+      def dump_units_to_directory(directory, selected_units = nil)
         run_callbacks :dump do
-          units.each { |identifier, unit| unit.dump_to_directory(directory, identifier) }
+          (selected_units || units).each do |identifier, unit|
+            unit.dump_to_directory(directory, identifier)
+          end
         end
       end
 

data/sub/avm/lib/avm/instances/data/package.rb

@@ -12,6 +12,11 @@ module Avm
           @instance = instance
           super options
         end
+
+        # @return [Pathname]
+        def data_default_dump_path
+          instance.data_default_dump_path.to_pathname
+        end
       end
     end
   end

data/sub/avm/lib/avm/version.rb

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

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

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.18'
-  s.add_dependency 'avm', '~> 0.73'
+  s.add_dependency 'avm', '~> 0.74'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.3'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
-  s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.2'
+  s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.3'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'

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

@@ -0,0 +1,66 @@
+# 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
+          include ::Avm::Tools::RunnerWith::InstanceDataPerformer
+
+          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
+
+        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
+          super.existing(dump_existing)
+        end
+
+        # @return [Pathname]
+        def dump_path
+          (parsed.dump_path || default_dump_path).to_pathname
+        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
+end

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

@@ -0,0 +1,35 @@
+# 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
+            warn("Cannot perform: #{data_performer.cannot_perform_reason}")
+          end
+        end
+
+        private
+
+        # @return [Avm::Data::Performer]
+        def data_performer_uncached
+          %i[include exclude].inject(data_performer_class.new(data_owner)) do |a1, e1|
+            if_respond(e1, []).inject(a1) { |a2, e2| a2.send(e1, e2) }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.67.1
+  version: 0.68.0
 platform: ruby
 authors:
 - Put here the authors
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.73'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.73.1
+        version: '0.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.73'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.73.1
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -298,14 +292,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.149'
+        version: '0.150'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.149'
+        version: '0.150'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1103,6 +1097,8 @@ files:
 - sub/avm-tools/lib/avm/tools/runner_with.rb
 - 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_performer.rb
 - sub/avm-tools/lib/avm/tools/self.rb
 - sub/avm-tools/lib/avm/tools/version.rb
 - sub/avm-tools/spec/dummy/avm-tools_stub/avm-tools.gemspec
@@ -1142,6 +1138,7 @@ files:
 - sub/avm/lib/avm/applications/base/stereotype.rb
 - 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/package.rb
 - sub/avm/lib/avm/data/package/base_performer.rb
 - sub/avm/lib/avm/data/package/build_directory.rb