eac_tools 0.65.1 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8723a175022efba79f604084a0180cbeaf95a4f2505c3eeb40c5bb6e305f3a24
-  data.tar.gz: 64b727ef144842f33fb362a51677c595ec12b9703ec68b7ddc686c93f4429f65
+  metadata.gz: 4eaf414401edd6cd32a363aa20ae12bfd3641bfc0c11d8007911f0dfce9738e0
+  data.tar.gz: 56e6df8b4ac42ed7f10cf7b3121d17cc825ce3c4a8e46018101f2ce71316f654
 SHA512:
-  metadata.gz: 5a546f59fb7e0e70180a13ec0cf47a8901b413e017ca5c3118dd6e4485e11dd10d88d1b8e0b49070a1c55972ad51e9ae0b53d8e0d46ea354072e75adbb05d19b
-  data.tar.gz: 185f2fe7167b8f6b338cae914d2763758bd41e9f3aa7b79bcd56131beaab4e96f83dfcf6a2a512ec69afca44063cb58004a4814eeca6c16da19be24c5cff579a
+  metadata.gz: c24f42e05720c894b99c1757654fe045ce0f306f2e2f4c5ef4fdc9477f048aa227e5d4e58c6a1d97ff90ebeede013c331152fbfa354def48591cb6b213a47ab0
+  data.tar.gz: fd0260cb92aee69652efbab55ef85f73ab6b442966d8aeaf0a09b522db6a6dd59dd5a39c6490255878f24c801c1f9557888017c75b6ec66bc2f4ee9f045f41c2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.65.1)
-      avm (~> 0.71)
+    eac_tools (0.67.0)
+      avm (~> 0.73)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -14,11 +14,11 @@ PATH
       avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_webapp_base0 (~> 0.17)
+      avm-eac_webapp_base0 (~> 0.17, >= 0.17.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
-      avm-tools (~> 0.147)
-      eac_ruby_utils (~> 0.116)
+      avm-tools (~> 0.149)
+      eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/aranha-parsers
@@ -127,21 +127,21 @@ PATH
 PATH
   remote: sub/avm-eac_ubuntu_base0
   specs:
-    avm-eac_ubuntu_base0 (0.4.2)
-      avm (~> 0.67, >= 0.67.1)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
+    avm-eac_ubuntu_base0 (0.4.3)
+      avm (~> 0.73)
+      eac_ruby_utils (~> 0.117)
+      eac_templates (~> 0.5)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.17.0)
-      avm (~> 0.70)
+    avm-eac_webapp_base0 (0.17.2)
+      avm (~> 0.73)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_postgresql_base0 (~> 0.5)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
       avm-files (~> 0.6, >= 0.6.2)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -174,17 +174,17 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.147.0)
-      aranha-parsers (~> 0.17, >= 0.17.1)
-      avm (~> 0.71)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
+    avm-tools (0.149.0)
+      aranha-parsers (~> 0.18)
+      avm (~> 0.73)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       avm-files (~> 0.6, >= 0.6.2)
       avm-git (~> 0.13, >= 0.13.2)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_base0 (~> 0.18)
+      eac_ruby_base0 (~> 0.19)
       eac_templates (~> 0.5)
       git (~> 1.18)
       ruby-progressbar (~> 1.13)
@@ -192,14 +192,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.71.0)
-      aranha-parsers (~> 0.17, >= 0.17.1)
-      eac_cli (~> 0.33)
+    avm (0.73.0)
+      aranha-parsers (~> 0.18)
+      eac_cli (~> 0.35)
       eac_config (~> 0.12)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.115)
+      eac_ruby_utils (~> 0.117)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -208,10 +208,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.33.0)
+    eac_cli (0.35.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/eac_config
@@ -265,16 +265,16 @@ PATH
 PATH
   remote: sub/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.18.0)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
-      eac_cli (~> 0.31)
+    eac_ruby_base0 (0.19.0)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      eac_cli (~> 0.35)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.116.0)
+    eac_ruby_utils (0.117.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler
@@ -299,7 +299,7 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    asciidoctor (2.0.18)
+    asciidoctor (2.0.20)
     ast (2.4.2)
     clipboard (1.3.6)
     colorize (0.8.1)
@@ -340,7 +340,7 @@ GEM
     minitest (5.18.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.15.0-x86_64-linux)
+    nokogiri (1.15.1-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'eac_cli', '~> 0.33'
+  s.add_dependency 'aranha-parsers', '~> 0.18'
+  s.add_dependency 'eac_cli', '~> 0.35'
   s.add_dependency 'eac_config', '~> 0.12'
   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.115'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
   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/clearer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/data/performer'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Clearer < ::Avm::Data::Performer
+      def cannot_perform_reason
+        nil
+      end
+
+      protected
+
+      def internal_perform
+        data_owner.clear(*include_excludes_arguments)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      class BasePerformer
+        acts_as_abstract :result
+        enable_speaker
+        enable_listable
+        lists.add_symbol :option, :excludes, :includes
+        common_constructor :package, :options, default: [{}] do
+          self.options = ::Avm::Data::Package::BasePerformer.lists.option
+                           .hash_keys_validate!(options)
+        end
+
+        # @return [Set<Symbol>]
+        def excludes
+          ::Set.new((options[OPTION_EXCLUDES] || []).map(&:to_sym))
+        end
+
+        # @return [Set<Symbol>]
+        def includes
+          ::Set.new((options[OPTION_INCLUDES] || []).map(&:to_sym))
+        end
+
+        # @return [Hash<Symbol, Avm::Data::Unit]
+        def selected_units
+          r = package.units
+          r = r.slice(*includes.to_a) if includes.any?
+          r = r.except(*excludes.to_a) if excludes.any?
+          r
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/data/package/base_performer'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      class Clear < ::Avm::Data::Package::BasePerformer
+        enable_method_class
+
+        # @return [void]
+        def result
+          selected_units.each do |identifier, unit|
+            infov 'Clearing unit', identifier
+            unit.clear
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,6 @@ module Avm
         include ::Avm::Data::Package::BuildDirectory
 
         DEFAULT_EXPIRE_TIME = 1.day
-        DEFAULT_FILE_EXTENSION = '.tar'
 
         attr_reader :package, :data_file_path, :existing
 
@@ -73,15 +72,6 @@ module Avm
 
         private
 
-        def download
-          infom 'Downloading dump...'
-          download_path = find_download_path
-          dump_command.system!(output_file: download_path)
-          fatal_error "File \"#{download_path}\" not saved" unless ::File.exist?(download_path)
-          fatal_error "File \"#{download_path}\" is empty" if ::File.zero?(download_path)
-          download_path
-        end
-
         def move_download_to_final_dest(download_path)
           ::FileUtils.mkdir_p(::File.dirname(data_file_path))
           ::FileUtils.mv(download_path, data_file_path)

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

@@ -6,9 +6,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Data
     class Package
-      require_sub __FILE__
+      require_sub __FILE__, require_mode: :kernel
       include ::Avm::Data::Callbacks
 
+      DATA_FILE_EXTENSION = '.tar'
+
       def initialize(options)
         options = options.to_options_consumer
         units = options.consume(:units)
@@ -25,6 +27,11 @@ module Avm
         self
       end
 
+      # @return [String]
+      def data_file_extension
+        DATA_FILE_EXTENSION
+      end
+
       def dump(data_path, options = {})
         ::Avm::Data::Package::Dump.new(self, data_path, options)
       end

data/sub/avm/lib/avm/data/performer.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'avm/data/rotate'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module Data
+    class Performer
+      acts_as_abstract(:cannot_perform_reason, :internal_perform)
+      acts_as_immutable
+      common_constructor :data_owner
+      immutable_accessor :exclude, :include, type: :set
+
+      # @return [Enumerable]
+      def immutable_constructor_args
+        [data_owner]
+      end
+
+      # @return [self]
+      def perform
+        raise "Cannot run: #{cannot_run_reason}" unless performable?
+
+        internal_perform
+
+        self
+      end
+
+      # @return [Boolean]
+      def performable?
+        cannot_perform_reason.blank?
+      end
+
+      protected
+
+      def include_excludes_arguments
+        options = include_excludes_options
+        options.any? ? [options] : []
+      end
+
+      def include_excludes_options
+        r = {}
+        r[:includes] = includes if includes.any?
+        r[:excludes] = excludes if excludes.any?
+        r
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/docker/runner.rb

@@ -116,10 +116,6 @@ module Avm
       def version?
         !parsed.no_version?
       end
-
-      def instance
-        runner_context.call(:instance)
-      end
     end
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/data.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/data/package/dump'
 require 'avm/self/instance'
 
 module Avm
@@ -15,7 +14,7 @@ module Avm
               .if_present do |v|
               ::File.join(
                 v,
-                "#{id}#{::Avm::Instances::Data::Package::Dump::DEFAULT_FILE_EXTENSION}"
+                "#{id}#{data_package.data_file_extension}"
               )
             end
           end

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

@@ -34,6 +34,16 @@ module Avm
         self.suffix = suffix.to_s
       end
 
+      # @return [Avm::Instances::Data::Package]
+      def data_package
+        @data_package ||= data_package_create
+      end
+
+      # @return [Avm::Instances::Data::Package]
+      def data_package_create
+        ::Avm::Instances::Data::Package.new(self)
+      end
+
       # @return [String]
       def id
         ::Avm::Instances::Ids.build(application.id, suffix)

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

@@ -13,7 +13,7 @@ module Avm
       end
 
       delegate :class, to: :instance, prefix: true
-      delegate :stereotype_module, :stereotype_name, to: :class
+      for_context :instance
 
       def extra_available_subcommands
         instance.if_present({}, &:extra_available_subcommands)

data/sub/avm/lib/avm/sources/runner.rb

@@ -11,6 +11,8 @@ module Avm
         subcommands
       end
 
+      for_context :optional_source, :source
+
       def extra_available_subcommands
         optional_source.if_present({}, &:extra_available_subcommands)
       end

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

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

data/sub/avm-eac_ubuntu_base0/avm-eac_ubuntu_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'avm', '~> 0.73'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
+  s.add_dependency 'eac_templates', '~> 0.5'
 
   s.add_development_dependency 'avm-eac_ubuntu_base0'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/runners/base.rb

@@ -17,6 +17,8 @@ module Avm
           subcommands
         end
 
+        for_context :instance
+
         private
 
         def instance_uncached

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.70'
+  s.add_dependency 'avm', '~> 0.73'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.1'
+  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 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb

@@ -15,8 +15,8 @@ module Avm
 
         def all
           @all ||= ALL_NAMES.map do |name|
-            ::Avm::EacWebappBase0::FileFormats.const_get(name.camelize).freeze
-          end
+            ::Avm::EacWebappBase0::FileFormats.const_get(name.camelize)
+          end.freeze
         end
       end
     end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -22,16 +22,6 @@ module Avm
           ).run
         end
 
-        # @return [Avm::Instances::Data::Package]
-        def data_package
-          @data_package ||= data_package_create
-        end
-
-        # @return [Avm::Instances::Data::Package]
-        def data_package_create
-          ::Avm::Instances::Data::Package.new(self)
-        end
-
         def database_unit
           pg_data_unit
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.17.0'
+    VERSION = '0.17.2'
   end
 end

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

@@ -14,16 +14,16 @@ 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.17', '>= 0.17.1'
-  s.add_dependency 'avm', '~> 0.71'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
+  s.add_dependency 'aranha-parsers', '~> 0.18'
+  s.add_dependency 'avm', '~> 0.73'
+  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-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.2'
   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'
-  s.add_dependency 'eac_ruby_base0', '~> 0.18'
+  s.add_dependency 'eac_ruby_base0', '~> 0.19'
   s.add_dependency 'eac_templates', '~> 0.5'
   s.add_dependency 'git', '~> 1.18'
   s.add_dependency 'ruby-progressbar', '~> 1.13'

data/sub/avm-tools/lib/avm/tools/runner/instance/data/clear.rb

@@ -0,0 +1,18 @@
+# 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 Clear
+            runner_with :help, :include_exclude, :instance_data_clear
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Avm
             runner_with :help do
               desc 'Dump utility for EacRailsBase instance.'
               bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
-              pos_arg :dump_path
+              pos_arg :dump_path, optional: true
             end
 
             # @return [String]
@@ -38,10 +38,6 @@ module Avm
 
             private
 
-            def instance
-              runner_context.call(:instance)
-            end
-
             def package_dump_uncached
               instance
                 .data_package.dump(dump_path, existing: package_dump_existing)

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

@@ -10,11 +10,7 @@ module Avm
         class Data
           class Unit
             class Clear
-              runner_with :help
-
-              def run
-                runner_context.call(:data_unit).clear
-              end
+              runner_with :help, :instance_data_clear
             end
           end
         end

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

@@ -15,7 +15,7 @@ module Avm
               end
 
               def run
-                runner_context.call(:data_unit).dump(dump_path)
+                data_owner.dump(dump_path)
               end
 
               # @return [String]
@@ -30,7 +30,7 @@ module Avm
 
               # @return [String]
               def default_dump_path
-                runner_context.call(:data_unit).data_default_dump_path
+                data_owner.data_default_dump_path
               end
             end
           end

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

@@ -15,7 +15,7 @@ module Avm
               end
 
               def run
-                runner_context.call(:data_unit).load(dump_path)
+                data_owner.load(dump_path)
               end
 
               # @return [Pathname]

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

@@ -15,6 +15,8 @@ module Avm
               subcommands
             end
 
+            for_context :data_owner
+
             # @return [Enumerable<String>]
             def available_units_ids
               data_package.units_ids
@@ -26,7 +28,7 @@ module Avm
             end
 
             # @return [Avm::Instances::Data::Unit]
-            def data_unit
+            def data_owner
               data_package.unit(parsed.identifier)
             end