avm-tools 0.147.0 → 0.149.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6ef92fea6a4b6cee1158f6217041c3ed360c0fd94af617c5c500318256f57c
-  data.tar.gz: 0a9c48c0cfabd0d65c6ccc61ef879623b933c7a780a8f28a8fa385a011152c36
+  metadata.gz: 4b9d3ec974736d535de064589ef2af6f4fae2b149e043675200df92b851eea30
+  data.tar.gz: 8da5ec56f8c81c6cdaa403534c33d88586c64eda07e7a706674ffc650f27908f
 SHA512:
-  metadata.gz: 0ac9c3330ba5faa62e91819c48b4c06acffedcd67cd1e3f00571da4c6209564ea4b4888d15ac96cd227e778aaedf858a3a03051fce4d2ef24bfccd4475404532
-  data.tar.gz: 416876878d0041724131b598c527ccd48bda7d7676d09e157d6505f3ef5df3f94da1f1a3cc0e79e73bf1781546983d8c7a8e9a268fc6366122853eaafb64af91
+  metadata.gz: 45591b92498af434eaae3eb096134b6d8952593fdaeffea04d143e76a534593ad689ce15f2c2f39164f2b625696749aabfb6992c648444631a345fdb3fd00f9f
+  data.tar.gz: 91962893c6add83e548ad9a02bd9c2ef69a759eb6e8d1f002483f44afeff041f35968957c9a2c44b33a7274e416f7c7c53c45e78bef215bc2234783ae6a9fff3

data/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/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/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/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/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/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
 

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

@@ -13,6 +13,13 @@ module Avm
             desc 'Data utilities for EacRailsBase0 instances.'
             subcommands
           end
+
+          for_context :data_owner
+
+          # @return [Avm::Instances::Data::Package]
+          def data_owner
+            instance.data_package
+          end
         end
       end
     end

data/lib/avm/tools/runner/launcher.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/projects/stereotypes'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/launcher_stereotypes/list.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/stereotype'
-require 'avm/projects/stereotypes'
 require 'avm/tools/core_ext'
 
 module Avm

data/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/lib/avm/tools/runner_with/instance_data_clear.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/data/clearer'
+require 'eac_cli/core_ext'
+require 'eac_cli/runner'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module InstanceDataClear
+        common_concern do
+          enable_simple_cache
+          include ::EacCli::Runner
+        end
+
+        def run
+          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
+  end
+end

data/lib/avm/tools/runner_with.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    module RunnerWith
+      require_sub __FILE__, require_mode: :kernel
+    end
+  end
+end

data/lib/avm/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.147.0
+  version: 0.149.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.73'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.73'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +47,7 @@ dependencies:
         version: '0.30'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.30.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +57,7 @@ dependencies:
         version: '0.30'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.30.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -264,8 +258,6 @@ files:
 - Gemfile
 - exe/avm
 - lib/avm.rb
-- lib/avm/projects.rb
-- lib/avm/projects/stereotypes.rb
 - lib/avm/tools.rb
 - lib/avm/tools/core_ext.rb
 - lib/avm/tools/runner.rb
@@ -288,6 +280,7 @@ files:
 - lib/avm/tools/runner/git/subrepo/fix.rb
 - lib/avm/tools/runner/instance.rb
 - lib/avm/tools/runner/instance/data.rb
+- lib/avm/tools/runner/instance/data/clear.rb
 - lib/avm/tools/runner/instance/data/dump.rb
 - lib/avm/tools/runner/instance/data/load.rb
 - lib/avm/tools/runner/instance/data/unit.rb
@@ -315,6 +308,9 @@ files:
 - lib/avm/tools/runner/source/update.rb
 - lib/avm/tools/runner/source/version_bump.rb
 - lib/avm/tools/runner/source_generate.rb
+- lib/avm/tools/runner_with.rb
+- lib/avm/tools/runner_with/include_exclude.rb
+- lib/avm/tools/runner_with/instance_data_clear.rb
 - lib/avm/tools/self.rb
 - lib/avm/tools/version.rb
 - template/avm/self/docker_image/Dockerfile

data/lib/avm/projects/stereotypes.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/launcher_stereotypes/git'
-require 'avm/git/launcher_stereotypes/git_subrepo'
-require 'avm/git/launcher_stereotypes/git_subtree'
-require 'avm/eac_ruby_base1/launcher_stereotypes/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Projects
-    module Stereotypes
-      require_sub __FILE__, base: nil
-    end
-  end
-end

data/lib/avm/projects.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Projects
-    require_sub __FILE__
-  end
-end