eac_tools 0.66.0 → 0.67.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c536775fa8861ae479a017b51548aac1edb4ca67540603a84a5ba6a622650e8
-  data.tar.gz: 7466f8bcd0714b00a722cca444360ea32e7431d6797d4d2f3047ad91e97d135f
+  metadata.gz: '0650351188a8e6d37ba2f6de9f72aaafea66701164cd576ada4fb32ffaba32cc'
+  data.tar.gz: 748edc307ad72537a3bbfa167e537fcf9747f44b1ed49b71e58e24fa470de65b
 SHA512:
-  metadata.gz: 74e066ea30d9e2b053b997284cfc00a8b94d61f5d6b0341a0038174e002e9a1645a426921f8905a3d316de9c2c1bc8706aa9013edfad48a956b6cf9b99a919e2
-  data.tar.gz: 50ba5e89a300b4e96c9de017a81537ad4d5f31cb84104f869b0d276120cff2e182c1b0c0a52ea81816a7e7e99b9f6dcd4b89a25040881326aeb463676a1c593d
+  metadata.gz: e08048e32da53d1cb6a81053e9412661102a9d1fdb2e2f9370a6a783b4a0e09b3edfa0cb96a79b452578bfed7ab443ee61f89208b786a600ec3679be0247e224
+  data.tar.gz: f5e0fa874e7a5c6992a0f7a0fac38ed3c85a0b2005857eaabf22ec3faab481d3852e8f971d5b0415c474a1ca704878f62341366f4bcf15bcc0820f0891bed9b4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.66.0)
-      avm (~> 0.72)
+    eac_tools (0.67.1)
+      avm (~> 0.73, >= 0.73.1)
       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-git (~> 0.13, >= 0.13.3)
+      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
@@ -164,19 +164,19 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.2)
-      avm (~> 0.67, >= 0.67.1)
+    avm-git (0.13.3)
+      avm (~> 0.73, >= 0.73.1)
       avm-files (~> 0.6, >= 0.6.2)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.117)
       git (~> 1.18)
 
 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.1)
       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.1'
 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/base/subcommand_parent.rb

@@ -7,15 +7,15 @@ module Avm
   module Instances
     class Base
       class SubcommandParent
+        include ::EacCli::Runner
         enable_simple_cache
-        common_constructor :instance
+        common_constructor :instance do
+          self.runner_context = ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+        for_context :instance
 
         private
 
-        def runner_context_uncached
-          ::EacCli::Runner::Context.new(self, argv: runner_argv)
-        end
-
         def runner_argv
           [instance.class.name.split('::')[-2].dasherize, instance.id]
         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/scms/auto_commit/for_file.rb

@@ -28,6 +28,11 @@ module Avm
 
         private
 
+        # @return [Boolean]
+        def changed?
+          scm.changed_files.any? { |cf| cf.path == scm_relative_path }
+        end
+
         def commit_info_uncached
           rules.lazy.map { |rule| rule.with_file(self).commit_info }.find(&:present?)
             .if_present { |v| v.path(path) }
@@ -42,8 +47,13 @@ module Avm
           return false if commit_info.blank?
 
           infov '  Commit info', commit_info
-          scm.run_commit(commit_info)
-          success '  Commited'
+          if changed?
+            scm.run_commit(commit_info)
+            success '  Commited'
+          else
+            warn "  File \"#{path}\" unchanged"
+          end
+
           true
         end
 

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.1'
 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-git/avm-git.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'avm', '~> 0.73', '>= 0.73.1'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
   s.add_dependency 'git', '~> 1.18'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/scms/git/commit_dirty.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/git/scms/git/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class CommitDirty
+          enable_method_class
+          # @param commit_info [Avm::Scms::CommitInfo, nil]
+          common_constructor :scm, :commit_info, default: [nil]
+          delegate :git_repo, :head_commit, :run_commit, to: :scm
+
+          # @return [Avm::Git::Scms::Git::Commit,nil]
+          def result
+            return nil unless git_repo.dirty?
+
+            run_commit(asserted_commit_info)
+            head_commit
+          end
+
+          private
+
+          def asserted_commit_info
+            r = ::Avm::Scms::CommitInfo.assert(commit_info)
+            r = r.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if r.message.blank?
+            git_repo.dirty_files.inject(r) { |a, e| a.path(e.absolute_path) }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/commits.rb

@@ -20,20 +20,6 @@ module Avm
             end
           end
 
-          # @param commit_info [Avm::Scms::CommitInfo]
-          # @return [Avm::Git::Scms::Git::Commit,nil]
-          def commit_dirty(commit_info = nil)
-            return nil unless git_repo.dirty?
-
-            commit_info = ::Avm::Scms::CommitInfo.assert(commit_info)
-            commit_info = commit_info.message(COMMIT_DIRTY_DEFAULT_MESSAGE) if
-              commit_info.message.blank?
-
-            git_repo.command('add', '.').execute!
-            run_commit(commit_info)
-            head_commit
-          end
-
           # @param commit_info [Avm::Scms::CommitInfo]
           # @return [Avm::Git::Scms::Git::Commit,nil]
           def commit_if_change(commit_info = nil)

data/sub/avm-git/lib/avm/git/scms/git/run_commit.rb

@@ -48,7 +48,7 @@ module Avm
           end
 
           def reset
-            scm.git_repo.command('reset', '--soft', 'HEAD').execute!
+            scm.git_repo.command('reset', 'HEAD').execute!
           end
         end
       end

data/sub/avm-git/lib/avm/git/scms/git_sub_base/changed_file.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/scms/changed_file'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class GitSubBase < ::Avm::Scms::Base
+        class ChangedFile < ::Avm::Scms::ChangedFile
+          common_constructor :scm, :parent_changed_file
+
+          # @return [Pathname]
+          def path
+            parent_changed_file.path.relative_path_from(scm.relative_path_from_parent_scm)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git_sub_base/commit.rb

@@ -9,9 +9,7 @@ module Avm
     module Scms
       class GitSubBase < ::Avm::Scms::Base
         class Commit < ::Avm::Scms::Commit
-          common_constructor :scm, :parent_commit do
-            # parent_commit.assert_argument(::Avm::Git::Scms::Git::Commit, 'parent_commit')
-          end
+          common_constructor :scm, :parent_commit
 
           delegate :deploy_to_env_path, :fixup?, :id, :merge_with, :reword, :scm_file?, :subject,
                    :to_s, to: :parent_commit

data/sub/avm-git/lib/avm/git/scms/git_sub_base.rb

@@ -9,9 +9,16 @@ module Avm
       class GitSubBase < ::Avm::Scms::Base
         enable_abstract_methods
 
-        delegate :changed_files, :commit_if_change, :current_milestone_base_commit,
+        delegate :commit_if_change, :current_milestone_base_commit,
                  :head_commit, :reset_and_commit, :run_commit, to: :parent_scm
 
+        # @return [Enumerable<Avm::Git::Scms::GitSubBase::ChangedFile>]
+        def changed_files
+          parent_scm.changed_files.map do |parent_changed_file|
+            ::Avm::Git::Scms::GitSubBase::ChangedFile.new(self, parent_changed_file)
+          end
+        end
+
         # @param from [Avm::Git::Scms::Git::Commit]
         # @param to [Avm::Git::Scms::Git::Commit]
         # @return [Avm::Git::Scms::GitSubBase::Interval]

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.2'
+    VERSION = '0.13.3'
   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