avm 0.72.0 → 0.73.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ffe2b9afc29fb661c8ba611355b5404deaea76ff43aa31c59180035e8942acf
-  data.tar.gz: f66cf38833ff6ab3a0b1be19f739ce0620b79d8614828396440d11aade4d4525
+  metadata.gz: 7982b293a654555c267bc2f3b8856a40e4e60a5ee2a9bcc08796d4814a811c15
+  data.tar.gz: 6a8ade3bc981708360d1cecdb7e9ee1461d0fad4ff3daa0ae7de1f6636e99e9d
 SHA512:
-  metadata.gz: 52928731a9e75e5b7664b01b2ebe21121fa848b79220e80e6c216beecd03eb8593a3abf876086d69123fe1a15d11310395cd5edbfa2875cf3814978d4b8e36de
-  data.tar.gz: 560b52184f5ec719930168746726ab02c8768bc514a1f10cec54d5e5b08a0649c1b61711a59796fff5cdebc689faf80c2a4cd6400db54965ba953c6bbcaf49d2
+  metadata.gz: 32e5a58c320316929d9d954b98a284f40e4231af15b848513cdfcfc91364ad20362b95c05af1fe6c3f4822fc786a981129c8d3878d55104189f2d7af91c442f9
+  data.tar.gz: de0f2e9f63d6bd9e3aac64f36ef505f028494462e6e734b42efc1c88be62bb77041e3c2a8ff31a92293884e4d3e73872a9c95e219fc7e3909d6308de124563cc

data/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/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/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/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/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/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/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/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/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.73.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.116'
+        version: '0.117'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.116'
+        version: '0.117'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -240,10 +234,12 @@ files:
 - lib/avm/data/callbacks.rb
 - lib/avm/data/clearer.rb
 - lib/avm/data/package.rb
+- lib/avm/data/package/base_performer.rb
 - lib/avm/data/package/build_directory.rb
 - lib/avm/data/package/clear.rb
 - lib/avm/data/package/dump.rb
 - lib/avm/data/package/load.rb
+- lib/avm/data/performer.rb
 - lib/avm/data/rotate.rb
 - lib/avm/data/unit.rb
 - lib/avm/data/unit_with_commands.rb