eac_tools 0.64.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514082c79fd68acecc065cb4bfcac5debaa5e114e3a53e64962888d0b2cb2ebd
-  data.tar.gz: bdbc2be06b220888e839844b9562fed56431c3dd5b70ebc771a18ab5a6809ca1
+  metadata.gz: 47a797b3de79a663eae4d7dc4c3cdc600756b13f53386dbcd88fb4732b195eeb
+  data.tar.gz: 263a4b784e9cb99e1a9c023efdd2f048d4b83dfb73247300f6fe92db97c76dd7
 SHA512:
-  metadata.gz: e6674ee3ea87209102c847f980c389666c0bc02d5e82252bc962beb86cebfa58f0bfcd8ff498ee4bdb7db79b56238953c11f1e02d40f3fa43342589a8ab5d1c6
-  data.tar.gz: 203ae1b9a4a08408f276adf59c5dd4ba0fab61137653200a5c71f3b0620afca96b5b0500b0ec9fe7762e1fcaeed11a4d77b84e6bc46756a89c03b69f454bda46
+  metadata.gz: ad1076587dc04620251e5a391e0c169467aaaae2db7c725589322abad1f84c2c14e53056f07db414549e80864b3775e18105d1c3a25a7e2db2fb6c3adcaa97c8
+  data.tar.gz: f38150d6c56ceb13ff86d8c921fa6867a3cb65e4f36050f2fcf790558832f0b4d1641f7fefdc125a276b1cab512538668b8d30396ff5c0bf50cfc5cb0c43c3bc

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.64.0)
-      avm (~> 0.70)
+    eac_tools (0.65.0)
+      avm (~> 0.71)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
-      avm-eac_postgresql_base0 (~> 0.5)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
       avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
@@ -17,8 +17,8 @@ PATH
       avm-eac_webapp_base0 (~> 0.17)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
-      avm-tools (~> 0.146)
-      eac_ruby_utils (~> 0.114)
+      avm-tools (~> 0.147)
+      eac_ruby_utils (~> 0.115)
 
 PATH
   remote: sub/aranha-parsers
@@ -67,9 +67,9 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.5.0)
-      avm (~> 0.70)
-      eac_ruby_utils (~> 0.114)
+    avm-eac_postgresql_base0 (0.5.1)
+      avm (~> 0.71)
+      eac_ruby_utils (~> 0.115)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -173,9 +173,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.146.0)
+    avm-tools (0.147.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
-      avm (~> 0.70)
+      avm (~> 0.71)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       avm-files (~> 0.6, >= 0.6.2)
@@ -191,14 +191,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.70.0)
+    avm (0.71.0)
       aranha-parsers (~> 0.17, >= 0.17.1)
       eac_cli (~> 0.33)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.115)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -261,7 +261,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.114.0)
+    eac_ruby_utils (0.115.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'eac_ruby_utils', '~> 0.115'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'

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

@@ -46,7 +46,7 @@ module Avm
       end
 
       # @param id [Symbol]
-      # @return [Avm::Data::Unit]
+      # @return [Avm::Data::UnitWithCommands]
       def unit(identifier)
         units[identifier.to_sym] || raise("No unit found with identifier \"#{identifier}\"")
       end

data/sub/avm/lib/avm/data/unit.rb

@@ -6,72 +6,43 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Data
     class Unit
-      include ::Avm::Data::Callbacks
-
+      acts_as_abstract(
+        do_clear: [],
+        do_dump: [:dump_path],
+        do_load: [:dump_path],
+        dump_path_extension: []
+      )
       enable_speaker
+      include ::Avm::Data::Callbacks
 
-      %w[dump load].each do |action|
-        method_name = "#{action}_command"
-        class_eval <<~CODE, __FILE__, __LINE__ + 1
-          # Should be overrided.
-          # @return [EacRubyUtils::Envs::Command]
-          def #{method_name}
-            fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
-          end
-        CODE
-      end
-
-      def extension
-        singleton_class.const_get('EXTENSION')
-      rescue NameError
-        ''
-      end
-
-      def name
-        self.class
-      end
-
-      def load_from_directory(directory, identifier)
-        load(unit_on_directory_path(directory, identifier))
-      end
-
-      def dump_to_directory(directory, identifier)
-        dump(unit_on_directory_path(directory, identifier))
+      # @param dump_path [Pathname]
+      # @return [void]
+      def clear
+        run_callbacks(:dump) { do_clear }
       end
 
-      def dump(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def dump(dump_path)
         run_callbacks :dump do
-          infom "Dumping unit \"#{name}\" to \"#{data_path}\"..."
-          do_dump(data_path)
+          infom "Dumping unit \"#{name}\" to \"#{dump_path}\"..."
+          do_dump(dump_path)
         end
       end
 
-      # @return [Struct(:key, :subpath), nil]
-      def installation_files_data
-        nil
-      end
-
-      def load(data_path)
+      # @param dump_path [Pathname]
+      # @return [void]
+      def load(dump_path)
         run_callbacks :load do
-          infom "Loading unit \"#{name}\" from \"#{data_path}\"..."
-          do_load(data_path)
+          clear
+          infom "Loading unit \"#{name}\" from \"#{dump_path}\"..."
+          do_load(dump_path)
         end
       end
 
-      protected
-
-      def do_dump(data_path)
-        dump_command.execute!(output_file: data_path)
-      end
-
-      def do_load(data_path)
-        load_command.execute!(input_file: data_path)
-      end
-
-      private
-
-      def unit_on_directory_path(directory, identifier)
-        ::File.join(directory, "#{identifier}#{extension}")
+      # @return [String]
+      def name
+        self.class.name
       end
     end
   end

data/sub/avm/lib/avm/data/unit_with_commands.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/data/callbacks'
+require 'avm/data/unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class UnitWithCommands < ::Avm::Data::Unit
+      acts_as_abstract
+
+      abstract_method :dump_command
+      abstract_method :load_command
+
+      # @return [String]
+      def dump_path_extension
+        singleton_class.const_get('EXTENSION')
+      rescue NameError
+        ''
+      end
+
+      def load_from_directory(directory, identifier)
+        load(unit_on_directory_path(directory, identifier))
+      end
+
+      def dump_to_directory(directory, identifier)
+        dump(unit_on_directory_path(directory, identifier))
+      end
+
+      # @return [Struct(:key, :subpath), nil]
+      def installation_files_data
+        nil
+      end
+
+      protected
+
+      def do_dump(data_path)
+        dump_command.execute!(output_file: data_path)
+      end
+
+      def do_load(data_path)
+        load_command.execute!(input_file: data_path)
+      end
+
+      private
+
+      def unit_on_directory_path(directory, identifier)
+        ::File.join(directory, "#{identifier}#{dump_path_extension}")
+      end
+    end
+  end
+end

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

@@ -17,8 +17,6 @@ module Avm
           self.options = self.class.lists.option.hash_keys_validate!(options)
         end
 
-        before_load :clear
-
         # @return [Pathname]
         def files_path
           fs_path_subpath
@@ -33,8 +31,7 @@ module Avm
           instance_command('tar', '-xzf', '-', '-C', files_path)
         end
 
-        def clear
-          infom "Removing all files under #{files_path}..."
+        def do_clear
           instance_command('mkdir', '-p', files_path).execute!
           instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
         end

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

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'avm/data/unit'
+require 'avm/data/unit_with_commands'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Instances
     module Data
-      class Unit < ::Avm::Data::Unit
+      class Unit < ::Avm::Data::UnitWithCommands
         common_constructor :instance
 
         # @return [Pathname]
         def data_default_dump_path
           instance.data_default_dump_path.to_pathname.basename_sub('.*') do |b|
-            "#{b}_#{identifier}#{extension}"
+            "#{b}_#{identifier}#{dump_path_extension}"
           end
         end
 

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

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

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.70'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'avm', '~> 0.71'
+  s.add_dependency 'eac_ruby_utils', '~> 0.115'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb

@@ -12,10 +12,7 @@ module Avm
         TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
           "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
-        before_load :clear
-
-        def clear
-          info 'Clearing database (Dropping all tables)...'
+        def do_clear
           ts = tables
           if ts.empty?
             info 'Database has no tables'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

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

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'avm', '~> 0.70'
+  s.add_dependency 'avm', '~> 0.71'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Instance < ::Avm::Instances::Runner
+        class Data
+          class Unit
+            class Load
+              runner_with :help do
+                pos_arg :dump_path
+              end
+
+              def run
+                runner_context.call(:data_unit).load(dump_path)
+              end
+
+              # @return [Pathname]
+              def dump_path
+                parsed.dump_path.to_pathname
+              end
+            end
+          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.146.0'
+    VERSION = '0.147.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/acts_as_abstract.rb

@@ -35,13 +35,34 @@ module EacRubyUtils
     end
 
     module ClassMethods
+      # @param name [Symbol]
+      # @param arguments [Enumerable<Symbol>]
+      # @return [void]
+      def abstract_method(name, *arguments)
+        define_method name.to_sym do |*_the_args|
+          raise_abstract_method(name.to_sym, arguments)
+        end
+      end
+
+      # @param methods_names [Enumerable<Object>] Each item can be a symbolizable or a hash.
+      # @return [void]
       def abstract_methods(*methods_names)
         methods_names.each do |method_name|
-          define_method method_name do
-            raise_abstract_method(method_name)
+          if method_name.is_a?(::Hash)
+            abstract_methods_from_hash(method_name)
+          else
+            abstract_method(method_name)
           end
         end
       end
+
+      private
+
+      # @param hash [Hash]
+      # @return [void]
+      def abstract_methods_from_hash(hash)
+        hash.each { |name, arguments| abstract_method(name, *arguments) }
+      end
     end
 
     module InstanceMethods
@@ -59,9 +80,9 @@ module EacRubyUtils
         self.class.abstract_methods.include?(method_name.to_sym)
       end
 
-      def raise_abstract_method(method_name)
-        raise ::NoMethodError, "Abstract method \"#{method_name}\" hit in \"#{self}\"" \
-          " (Class: #{self.class})"
+      def raise_abstract_method(method_name, arguments = [])
+        raise ::NoMethodError, "Abstract method #{method_name}(#{arguments.join(', ')}) hit in " \
+          "#{self}\" (Class: #{self.class})"
       end
     end
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.114.0'
+  VERSION = '0.115.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.65.0
 platform: ruby
 authors:
 - Put here the authors
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,6 +109,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -280,28 +286,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.146'
+        version: '0.147'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.146'
+        version: '0.147'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.115'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.115'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -1059,6 +1065,7 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/instance/data/unit.rb
 - sub/avm-tools/lib/avm/tools/runner/instance/data/unit/clear.rb
 - sub/avm-tools/lib/avm/tools/runner/instance/data/unit/dump.rb
+- sub/avm-tools/lib/avm/tools/runner/instance/data/unit/load.rb
 - sub/avm-tools/lib/avm/tools/runner/instance/info.rb
 - sub/avm-tools/lib/avm/tools/runner/launcher.rb
 - sub/avm-tools/lib/avm/tools/runner/launcher/instances.rb
@@ -1124,6 +1131,7 @@ files:
 - sub/avm/lib/avm/data/package/load.rb
 - sub/avm/lib/avm/data/rotate.rb
 - sub/avm/lib/avm/data/unit.rb
+- sub/avm/lib/avm/data/unit_with_commands.rb
 - sub/avm/lib/avm/docker.rb
 - sub/avm/lib/avm/docker/container.rb
 - sub/avm/lib/avm/docker/image.rb