eac_tools 0.65.0 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a797b3de79a663eae4d7dc4c3cdc600756b13f53386dbcd88fb4732b195eeb
-  data.tar.gz: 263a4b784e9cb99e1a9c023efdd2f048d4b83dfb73247300f6fe92db97c76dd7
+  metadata.gz: 8c536775fa8861ae479a017b51548aac1edb4ca67540603a84a5ba6a622650e8
+  data.tar.gz: 7466f8bcd0714b00a722cca444360ea32e7431d6797d4d2f3047ad91e97d135f
 SHA512:
-  metadata.gz: ad1076587dc04620251e5a391e0c169467aaaae2db7c725589322abad1f84c2c14e53056f07db414549e80864b3775e18105d1c3a25a7e2db2fb6c3adcaa97c8
-  data.tar.gz: f38150d6c56ceb13ff86d8c921fa6867a3cb65e4f36050f2fcf790558832f0b4d1641f7fefdc125a276b1cab512538668b8d30396ff5c0bf50cfc5cb0c43c3bc
+  metadata.gz: 74e066ea30d9e2b053b997284cfc00a8b94d61f5d6b0341a0038174e002e9a1645a426921f8905a3d316de9c2c1bc8706aa9013edfad48a956b6cf9b99a919e2
+  data.tar.gz: 50ba5e89a300b4e96c9de017a81537ad4d5f31cb84104f869b0d276120cff2e182c1b0c0a52ea81816a7e7e99b9f6dcd4b89a25040881326aeb463676a1c593d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.65.0)
-      avm (~> 0.71)
+    eac_tools (0.66.0)
+      avm (~> 0.72)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -13,22 +13,22 @@ PATH
       avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
-      avm-eac_webapp_base0 (~> 0.17)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      avm-eac_webapp_base0 (~> 0.17, >= 0.17.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
-      avm-tools (~> 0.147)
-      eac_ruby_utils (~> 0.115)
+      avm-tools (~> 0.148)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/aranha-parsers
   specs:
-    aranha-parsers (0.17.1)
+    aranha-parsers (0.18.0)
       activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.3)
-      eac_envs-http (~> 0.3)
-      eac_ruby_utils (~> 0.112)
-      nokogiri (~> 1.14, >= 1.14.2)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_envs-http (~> 0.3, >= 0.3.1)
+      eac_ruby_utils (~> 0.116)
+      nokogiri (~> 1.14, >= 1.14.4)
       ofx-parser (~> 1.1)
 
 PATH
@@ -117,11 +117,12 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.30.2)
-      aranha-parsers (~> 0.17, >= 0.17.1)
-      avm (~> 0.67, >= 0.67.1)
+    avm-eac_ruby_base1 (0.30.3)
+      aranha-parsers (~> 0.18)
+      avm (~> 0.71)
       avm-eac_generic_base0 (~> 0.12)
-      eac_ruby_utils (~> 0.112)
+      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -134,13 +135,13 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.17.0)
-      avm (~> 0.70)
+    avm-eac_webapp_base0 (0.17.1)
+      avm (~> 0.72)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_postgresql_base0 (~> 0.5)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.1)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       avm-files (~> 0.6, >= 0.6.2)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -173,10 +174,10 @@ 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.148.0)
+      aranha-parsers (~> 0.18)
+      avm (~> 0.72)
+      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)
@@ -191,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.72.0)
+      aranha-parsers (~> 0.18)
+      eac_cli (~> 0.33, >= 0.33.1)
       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.116)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -207,10 +208,10 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.33.0)
+    eac_cli (0.34.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.114)
+      eac_ruby_utils (~> 0.116)
 
 PATH
   remote: sub/eac_config
@@ -226,6 +227,18 @@ PATH
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
 
+PATH
+  remote: sub/eac_envs-http
+  specs:
+    eac_envs-http (0.3.2)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.116)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (~> 0.1)
+      faraday-multipart (~> 1.0, >= 1.0.4)
+      faraday-retry (~> 2.1)
+
 PATH
   remote: sub/eac_fs
   specs:
@@ -261,7 +274,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.115.0)
+    eac_ruby_utils (0.116.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler
@@ -295,14 +308,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.3.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-follow_redirects (~> 0.3)
-      faraday-gzip (~> 0.1)
-      faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.1)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
@@ -335,7 +340,7 @@ GEM
     minitest (5.18.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
-    nokogiri (1.14.4-x86_64-linux)
+    nokogiri (1.15.0-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -413,6 +418,7 @@ DEPENDENCIES
   eac_cli!
   eac_config!
   eac_docker!
+  eac_envs-http!
   eac_fs!
   eac_git!
   eac_rest!

data/lib/eac_tools/version.rb

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

data/sub/aranha-parsers/aranha-parsers.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'activesupport', '>= 4.0.0'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.3'
-  s.add_dependency 'eac_envs-http', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.2'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
+  s.add_dependency 'nokogiri', '~> 1.14', '>= 1.14.4'
   s.add_dependency 'ofx-parser', '~> 1.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/aranha-parsers/lib/aranha/parsers/base.rb

@@ -9,20 +9,25 @@ module Aranha
   module Parsers
     class Base
       class << self
+        # @deprecated Use {#from_string} instead.
+        # @param content [String]
+        # @return [Aranha::Parsers::Base]
         def from_content(content)
+          from_string(content)
+        end
+
+        # @param string [String]
+        # @return [Aranha::Parsers::Base]
+        def from_string(string)
           ::EacRubyUtils::Fs::Temp.on_file do |path|
             ::File.open(path.to_s, 'w:UTF-8') do |f|
-              f.write content.dup.force_encoding('UTF-8')
+              f.write string.dup.force_encoding('UTF-8')
             end
             r = new(path.to_path)
             r.content
             r
           end
         end
-
-        def parse_content(content)
-          from_content(content).data
-        end
       end
 
       LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'

data/sub/aranha-parsers/lib/aranha/parsers/html/base.rb

@@ -19,6 +19,20 @@ module Aranha
             @fields << Field.new(name, type, xpath)
           end
 
+          # @param node [Nokogiri::XML::Node]
+          # @return [Aranha::Parsers::Html::Base]
+          def from_node(node)
+            from_string(node.to_html)
+          end
+
+          # @param haystack [String]
+          # @param needle [String]
+          # @return [String]
+          def xpath_ends_with(haystack, needle)
+            "substring(#{haystack}, string-length(#{haystack}) - string-length(#{needle}) + 1) " \
+              "= #{needle}"
+          end
+
           Field = Struct.new(:name, :type, :xpath)
         end
 

data/sub/aranha-parsers/lib/aranha/parsers/html/node/default/string_support.rb

@@ -27,16 +27,16 @@ module Aranha
               raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
             end
 
+            # @param node [Nokogiri::XML::Node]
+            # @param xpath [String]
+            # @return [String]
             def string_value(node, xpath)
-              if node.at_xpath(xpath)
-                sanitize_string(node.at_xpath(xpath).text)
-              else
-                ''
-              end
+              found = node_value(node, xpath)
+              found ? sanitize_string(found.text) : ''
             end
 
             def string_recursive_value(node, xpath, required = true)
-              root = node.at_xpath(xpath)
+              root = node_value(node, xpath)
               if root.blank?
                 return nil unless required
 

data/sub/aranha-parsers/lib/aranha/parsers/html/node/default.rb

@@ -11,13 +11,13 @@ module Aranha
           require_sub __FILE__, include_modules: true
 
           def array_value(node, xpath)
-            r = node.xpath(xpath).map { |n| n.text.strip }
+            r = node_set_value(node, xpath).map { |n| n.text.strip }
             r.join('|')
           end
 
           def join_value(node, xpath)
             m = ''
-            node.xpath(xpath).each do |n|
+            node_set_value(node, xpath).each do |n|
               m << n.text.strip
             end
             m
@@ -27,6 +27,20 @@ module Aranha
             m = /(\d+) m/.match(join_value(node, xpath))
             m ? m[1].to_i : nil
           end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::NodeSet]
+          def node_set_value(node, xpath)
+            node.xpath(xpath)
+          end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::Node]
+          def node_value(node, xpath)
+            node.at_xpath(xpath)
+          end
         end
       end
     end

data/sub/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.17.1'
+    VERSION = '0.18.0'
   end
 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.33', '>= 0.33.1'
   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.116'
   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,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Clearer
+      enable_speaker
+
+      common_constructor :storage
+
+      # @return [self]
+      def perform
+        storage.clear
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    class Package
+      class Clear
+        enable_method_class
+        enable_speaker
+        common_constructor :package
+
+        # @return [void]
+        def result
+          package.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/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/version.rb

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

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.17', '>= 0.17.1'
-  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'aranha-parsers', '~> 0.18'
+  s.add_dependency 'avm', '~> 0.71'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
 require 'eac_cli/speaker'
-require 'aranha/parsers/source_address'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
 require 'avm/eac_ruby_base1/launcher/gem'
+require 'eac_envs/http/request'
+require 'eac_envs/http/response'
 
 module Avm
   module EacRubyBase1
@@ -97,14 +97,13 @@ module Avm
             gem_version_max.present? && ::Gem::Version.new(gem_spec.version) < gem_version_max
           end
 
+          # @return [Array]
           def gem_versions_uncached
-            ::JSON.parse!(
-              ::Aranha::Parsers::SourceAddress.detect_sub(
-                "https://rubygems.org/api/v1/versions/#{gem_spec.name}.json"
-              ).content
-            )
-          rescue ::Aranha::Parsers::SourceAddress::FetchContentError => e
-            e.request.status == 404 ? [] : raise(e)
+            ::EacEnvs::Http::Request.new
+              .url("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
+              .response.body_data_or_raise
+          rescue EacEnvs::Http::Response => e
+            e.status == 404 ? [] : raise(e)
           end
 
           def gem_version_max_uncached

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.30.2'
+    VERSION = '0.30.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.72'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5'
+  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-files', '~> 0.6', '>= 0.6.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'eac_ruby_utils', '~> 0.116'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 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.1'
   end
 end

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

@@ -14,9 +14,9 @@ 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.72'
+  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'

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, :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)