eac_tools 0.66.0 → 0.67.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c536775fa8861ae479a017b51548aac1edb4ca67540603a84a5ba6a622650e8
-  data.tar.gz: 7466f8bcd0714b00a722cca444360ea32e7431d6797d4d2f3047ad91e97d135f
+  metadata.gz: 4eaf414401edd6cd32a363aa20ae12bfd3641bfc0c11d8007911f0dfce9738e0
+  data.tar.gz: 56e6df8b4ac42ed7f10cf7b3121d17cc825ce3c4a8e46018101f2ce71316f654
 SHA512:
-  metadata.gz: 74e066ea30d9e2b053b997284cfc00a8b94d61f5d6b0341a0038174e002e9a1645a426921f8905a3d316de9c2c1bc8706aa9013edfad48a956b6cf9b99a919e2
-  data.tar.gz: 50ba5e89a300b4e96c9de017a81537ad4d5f31cb84104f869b0d276120cff2e182c1b0c0a52ea81816a7e7e99b9f6dcd4b89a25040881326aeb463676a1c593d
+  metadata.gz: c24f42e05720c894b99c1757654fe045ce0f306f2e2f4c5ef4fdc9477f048aa227e5d4e58c6a1d97ff90ebeede013c331152fbfa354def48591cb6b213a47ab0
+  data.tar.gz: fd0260cb92aee69652efbab55ef85f73ab6b442966d8aeaf0a09b522db6a6dd59dd5a39c6490255878f24c801c1f9557888017c75b6ec66bc2f4ee9f045f41c2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.66.0)
-      avm (~> 0.72)
+    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, >= 0.17.1)
+      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.148)
-      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.1)
-      avm (~> 0.72)
+    avm-eac_webapp_base0 (0.17.2)
+      avm (~> 0.73)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
-      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)
-      eac_ruby_utils (~> 0.116)
+      eac_ruby_utils (~> 0.117)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -174,9 +174,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.148.0)
+    avm-tools (0.149.0)
       aranha-parsers (~> 0.18)
-      avm (~> 0.72)
+      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)
@@ -184,7 +184,7 @@ PATH
       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.72.0)
+    avm (0.73.0)
       aranha-parsers (~> 0.18)
-      eac_cli (~> 0.33, >= 0.33.1)
+      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.116)
+      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.34.0)
+    eac_cli (0.35.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.116)
+      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.66.0'
+  VERSION = '0.67.0'
 end

data/sub/avm/avm.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.18'
-  s.add_dependency 'eac_cli', '~> 0.33', '>= 0.33.1'
+  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.116'
+  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

@@ -1,17 +1,19 @@
 # frozen_string_literal: true
 
+require 'avm/data/performer'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Data
-    class Clearer
-      enable_speaker
+    class Clearer < ::Avm::Data::Performer
+      def cannot_perform_reason
+        nil
+      end
 
-      common_constructor :storage
+      protected
 
-      # @return [self]
-      def perform
-        storage.clear
+      def internal_perform
+        data_owner.clear(*include_excludes_arguments)
       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

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
+require 'avm/data/package/base_performer'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Data
     class Package
-      class Clear
+      class Clear < ::Avm::Data::Package::BasePerformer
         enable_method_class
-        enable_speaker
-        common_constructor :package
 
         # @return [void]
         def result
-          package.units.each do |identifier, unit|
+          selected_units.each do |identifier, unit|
             infov 'Clearing unit', identifier
             unit.clear
           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/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.72.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.72'
+  s.add_dependency 'avm', '~> 0.73'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.1'
-  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 'eac_ruby_utils', '~> 0.116'
+  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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.17.1'
+    VERSION = '0.17.2'
   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.18'
-  s.add_dependency 'avm', '~> 0.72'
+  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'
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   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

@@ -9,7 +9,7 @@ module Avm
       class Instance < ::Avm::Instances::Runner
         class Data
           class Clear
-            runner_with :help, :instance_data_clear
+            runner_with :help, :include_exclude, :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
@@ -27,11 +29,6 @@ module Avm
 
             # @return [Avm::Instances::Data::Unit]
             def data_owner
-              data_unit
-            end
-
-            # @return [Avm::Instances::Data::Unit]
-            def data_unit
               data_package.unit(parsed.identifier)
             end
 

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

@@ -14,6 +14,8 @@ module Avm
             subcommands
           end
 
+          for_context :data_owner
+
           # @return [Avm::Instances::Data::Package]
           def data_owner
             instance.data_package

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_cli/runner'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module IncludeExclude
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-I', '--include', repeat: true
+            arg_opt '-E', '--exclude', repeat: true
+          end
+        end
+
+        delegate :include, :exclude, to: :parsed
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/data/clearer'
 require 'eac_cli/core_ext'
 require 'eac_cli/runner'
 
@@ -8,11 +9,20 @@ module Avm
     module RunnerWith
       module InstanceDataClear
         common_concern do
+          enable_simple_cache
           include ::EacCli::Runner
         end
 
         def run
-          data_owner.clear
+          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
         end
       end
     end

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

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

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.116'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -42,14 +42,15 @@ module EacCli
         pos_set.to_a
       end
 
-      def positional_arguments_blocked?(new_pos_arg)
+      def positional_arguments_blocked_reason(new_pos_arg)
         last = pos_set.last
-        return false unless last
-        return true if subcommands?
-        return true if last.repeat?
-        return true if last.optional? && new_pos_arg.if_present(&:required?)
+        return nil unless last
+        return 'there are subcommands' if subcommands?
+        return 'last argument repeats' if last.repeat?
+        return 'new argument is required and last is optional' if
+          last.optional? && new_pos_arg.if_present(&:required?)
 
-        false
+        nil
       end
 
       def subcommands
@@ -65,7 +66,10 @@ module EacCli
       private
 
       def check_positional_blocked(new_pos_arg)
-        raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+        positional_arguments_blocked_reason(new_pos_arg).if_present do |v|
+          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v}" \
+            " (New argument: #{new_pos_arg})"
+        end
       end
 
       def pos_set

data/sub/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb

@@ -26,7 +26,8 @@ module EacCli
           common_constructor :value
 
           def type
-            TYPES.find { |type| send("#{type}?") } || raise("Unknown type for \"#{value}\"")
+            TYPES.find { |type| send("#{type}?") } ||
+              raise(::EacCli::Definition::Error, "Unknown type for \"#{value}\"")
           end
 
           def short?

data/sub/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -42,7 +42,7 @@ module EacCli
           v.to_s.if_present { |vv| return vv.variableize.to_sym }
         end
 
-        raise 'No short or long option to build identifier'
+        raise(::EacCli::Definition::Error, 'No short or long option to build identifier')
       end
 
       def repeat?

data/sub/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -16,7 +16,8 @@ module EacCli
       def default_value
         return super unless default_value?
 
-        raise "Unallowed default value for boolean options (Option: #{self})"
+        raise(::EacCli::Definition::Error,
+              "Unallowed default value for boolean options (Option: #{self})")
       end
 
       def default_default_value

data/sub/eac_cli/lib/eac_cli/definition/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Definition
+    class Error < ::StandardError
+    end
+  end
+end