avm 0.84.0 → 0.84.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8c9d50d9d63f0898aeed10ef04481224cfc100444184a58488a07ba9159a9d
-  data.tar.gz: eb308ede0d25e1a967bb71de08cbf0077a2deabdf267342fc19b1f8e5214e612
+  metadata.gz: e52eede48d41381c010f3e3f5141761dd463f623cfa6d8cbd25222cf6418acd8
+  data.tar.gz: 21c5f0f5fc0bb1943ccc05684ffdc8eaccd8e26d7eef4a47ee080e93d44fb1c4
 SHA512:
-  metadata.gz: d07d9f55e7a938cc3ae3f5061b6f7d95ff036ee126a4e775091ed31f06384f8f9a42331822046b10d91ddbdd032aa994d508781d35eb3825f48dc0910d0c5109
-  data.tar.gz: 7c07ba31a700586921f86991941f3e3b68662bc94635613d442b535e373b30d8d0aa0ce14384f8a27a7e06a555d390378810b79b31b991cd7c6931f5d4f3674c
+  metadata.gz: 3874081776e2229003887e9599091c09f45c77c1a89ff326a4aa491184cba868ff28501a85892c0e23ffbb1d0d27ab5e2ce65cdcb20670c12fd47c3b3970e5ee
+  data.tar.gz: cc4edaff95f8ae035189993bd739b7ff51d9de8fe362fa117c67605526c1813ed653c70b3aa52626ab07eff144a79a149ad27794e5d563215c99c7d2852147c2

data/lib/avm/applications/base/publishing.rb

@@ -26,7 +26,7 @@ module Avm
           parse_publishable_value(entry(PUBLISHABLE_KEY).optional_value, false)
         end
 
-        def parse_publishable_value(value, hash_to_true) # rubocop:disable Metrics/CyclomaticComplexity
+        def parse_publishable_value(value, hash_to_true)
           return value.with_indifferent_access if parse_publishable_value_hash?(value, hash_to_true)
           return true if value.nil? || value == true
           return false if value == false || value.is_a?(::EacRubyUtils::BlankNotBlank)

data/lib/avm/data/rotate.rb

@@ -93,7 +93,7 @@ module Avm
         return '_UNKNOWN_MTIME' unless ::File.exist?(source_path)
 
         t = ::File.mtime(source_path)
-        t.strftime('_%Y-%m-%d_%H-%M-%S_') + t.strftime('%z').gsub(/\A\+/, 'P').gsub(/\A\-/, 'N')
+        t.strftime('_%Y-%m-%d_%H-%M-%S_') + t.strftime('%z').gsub(/\A\+/, 'P').gsub(/\A-/, 'N')
       end
 
       def file_extension(basename)

data/lib/avm/docker/image.rb

@@ -21,10 +21,10 @@ module Avm
       end
 
       attr_reader :registry
-      attr_accessor :snapshot
-      attr_accessor :version
+      attr_accessor :snapshot, :version
 
       def initialize(registry = nil)
+        super()
         @registry = registry || self.class.default_registry
         self.snapshot = true
         self.version = true
@@ -61,7 +61,7 @@ module Avm
       end
 
       def tag_version
-        [tag_version_version, stereotype_tag].reject(&:blank?).join('_')
+        [tag_version_version, stereotype_tag].compact_blank.join('_')
       end
 
       def tag_version_version

data/lib/avm/docker/runner.rb

@@ -89,7 +89,7 @@ module Avm
       def output_image_name
         return unless parsed.image_name
 
-        out(docker_image.tag.to_s.strip + "\n")
+        out("#{docker_image.tag.to_s.strip}\n")
       end
 
       def registry_uncached

data/lib/avm/entries/base/uri_components_entries_values/path_component.rb

@@ -10,7 +10,7 @@ module Avm
         class PathComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
           def setup
             super
-            define_inherited_value_proc_method { |value| value + '/' + id }
+            define_inherited_value_proc_method { |value| "#{value}/#{id}" }
           end
         end
       end

data/lib/avm/entries/keys_constants_set.rb

@@ -22,7 +22,7 @@ module Avm
 
       # @return [String]
       def key_const_set(prefix, suffix)
-        key = [prefix, suffix].reject(&:blank?).join('.')
+        key = [prefix, suffix].compact_blank.join('.')
         entries_provider_class.const_set(key.gsub('.', '_').upcase, key)
         key
       end

data/lib/avm/entries/uri_builder.rb

@@ -49,7 +49,7 @@ module Avm
       # @return [String, nil]
       def field_get(name)
         v = data[name.to_sym]
-        v.nil? ? nil : v.to_s
+        v&.to_s
       end
 
       def field_set(field, value)
@@ -78,7 +78,7 @@ module Avm
 
       # @return [Addressable::URI]
       def to_required_uri
-        ::Addressable::URI.new(FIELDS.map { |f| [f.to_sym, field_get(f)] }.to_h)
+        ::Addressable::URI.new(FIELDS.to_h { |f| [f.to_sym, field_get(f)] })
       end
 
       private

data/lib/avm/executables.rb

@@ -15,7 +15,7 @@ module Avm
       private
 
       %w[xdg-open].each do |program|
-        define_method(program.underscore + '_uncached') do
+        define_method("#{program.underscore}_uncached") do
           env.executable(program, '--version')
         end
       end

data/lib/avm/instances/base/entry_keys.rb

@@ -11,7 +11,7 @@ module Avm
           ::Avm::Instances::EntryKeys.all
         end
 
-        ::Avm::Instances::EntryKeys.all.each do |key|
+        ::Avm::Instances::EntryKeys.find_each do |key|
           method_name = key.to_s.variableize
           define_method method_name do
             read_entry(key)

data/lib/avm/instances/base/install.rb

@@ -12,7 +12,7 @@ module Avm
         end
 
         def install_data_path_inherited_value_proc(value)
-          value + '/' + id
+          "#{value}/#{id}"
         end
 
         def install_groupname_default_value

data/lib/avm/instances/base.rb

@@ -20,7 +20,7 @@ module Avm
 
       lists.add_string :access, :local, :ssh
 
-      ID_PATTERN = /\A([a-z0-9]+(?:\-[a-z0-9]+)*)_(.+)\z/.freeze
+      ID_PATTERN = /\A([a-z0-9]+(?:-[a-z0-9]+)*)_(.+)\z/.freeze
 
       class << self
         def by_id(id)

data/lib/avm/instances/ids.rb

@@ -6,7 +6,7 @@ module Avm
   module Instances
     module Ids
       ID_PARTS_SEPARATOR = '_'
-      ID_PATTERN = /\A([a-z0-9]+(?:\-[a-z0-9]+)*)_(.+)\z/.freeze
+      ID_PATTERN = /\A([a-z0-9]+(?:-[a-z0-9]+)*)_(.+)\z/.freeze
       ID_PARSER = ID_PATTERN.to_parser do |m|
         ::Struct.new(:application_id, :instance_suffix).new(m[1], m[2])
       end

data/lib/avm/launcher/context/instance_manager/cached_instances.rb

@@ -12,7 +12,7 @@ module Avm
           common_constructor :context, :content
 
           def instances
-            content.keys.map { |k| by_logical_path(k).instance }.reject(&:blank?)
+            content.keys.map { |k| by_logical_path(k).instance }.compact_blank
           end
 
           def by_logical_path(key)

data/lib/avm/launcher/context/instance_manager.rb

@@ -49,7 +49,7 @@ module Avm
         end
 
         def cache_instances(instances)
-          write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
+          write_cache_file(instances.to_h { |i| [i.logical, i.to_h] })
           instances
         end
 

data/lib/avm/launcher/instances/base.rb

@@ -60,11 +60,11 @@ module Avm
         end
 
         def included?
-          !::Avm::Launcher::Context.current.settings.excluded_projects.include?(project_name)
+          ::Avm::Launcher::Context.current.settings.excluded_projects.exclude?(project_name)
         end
 
         def to_h
-          super.to_h.merge(parent: parent ? parent.logical : nil)
+          super.to_h.merge(parent: parent&.logical)
         end
 
         private

data/lib/avm/launcher/paths/logical.rb

@@ -28,7 +28,7 @@ module Avm
         end
 
         def to_h
-          { logical: logical, real: real.to_s, parent_path: parent_path ? parent_path.to_h : nil }
+          { logical: logical, real: real.to_s, parent_path: parent_path&.to_h }
         end
 
         def project?
@@ -48,13 +48,13 @@ module Avm
         end
 
         def included?
-          !context.settings.excluded_paths.include?(logical)
+          context.settings.excluded_paths.exclude?(logical)
         end
 
         private
 
         def stereotypes_uncached
-          ::Avm::Launcher::Stereotype.stereotypes.select { |s| s.match?(self) }
+          ::Avm::Launcher::Stereotype.stereotypes.select { |s| s.match?(self) } # rubocop:disable Style/SelectByRegexp
         end
 
         def build_child(name)

data/lib/avm/launcher/publish/check_result.rb

@@ -13,11 +13,9 @@ module Avm
         lists.add_string :status, :updated, :pending, :blocked, :outdated
 
         lists.status.values.each do |status| # rubocop:disable Style/HashEachMethods
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-          def self.#{status}(message)
-            new('#{status}', message)
+          singleton_class.define_method status do |message|
+            new(status, message)
           end
-          RUBY_EVAL
         end
 
         class << self

data/lib/avm/path_string.rb

@@ -21,7 +21,7 @@ module Avm
 
     # @return [Array] List of paths. Blank paths are rejected.
     def paths
-      split(SEPARATOR).reject(&:blank?)
+      split(SEPARATOR).compact_blank
     end
   end
 end

data/lib/avm/result.rb

@@ -11,11 +11,9 @@ module Avm
     lists.add_string :type, :success, :error, :neutral, :pending, :outdated
 
     lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
-      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-        def self.#{type}(value)
-          new(value, TYPE_#{type.upcase})
-        end
-      RUBY_EVAL
+      singleton_class.define_method type do |value|
+        new(value, type)
+      end
     end
 
     TYPE_SUCCESS_COLOR = 'green'
@@ -62,11 +60,9 @@ module Avm
     end
 
     lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
-      class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-        def #{type}?
-          @type == '#{type}'
-        end
-      RUBY_EVAL
+      define_method "#{type}?" do
+        @type == type
+      end
     end
 
     private

data/lib/avm/rspec/shared_examples/avm_file_format_file_resource_name.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 
-::RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
+RSpec.shared_examples 'avm_file_format_file_resource_name' do |input_expected|
   describe '#file_resource_name' do
     input_expected.each do |path, expected_resource_name|
       context "when path is \"#{path}\"" do

data/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb

@@ -3,11 +3,11 @@
 require 'avm/file_formats/search_formatter'
 require 'eac_ruby_utils/core_ext'
 
-::RSpec.shared_examples 'avm_file_formats_with_fixtures' do |the_spec_file|
+RSpec.shared_examples 'avm_file_formats_with_fixtures' do |the_spec_file|
   include_examples 'source_target_fixtures', the_spec_file
 
   def format_files_in_directory(target_dir)
-    ::Avm::FileFormats::SearchFormatter
+    Avm::FileFormats::SearchFormatter
       .new([target_dir], recursive: true, apply: true, verbose: false)
       .run
   end
@@ -16,16 +16,16 @@ require 'eac_ruby_utils/core_ext'
     dir = temp_dir
     source_basename = source_file_basename_without_source_extname(source_file)
     source_path = dir.join(source_basename)
-    ::FileUtils.cp(source_file, source_path)
+    FileUtils.cp(source_file, source_path)
     format_files_in_directory(dir)
     source_path.read
   end
 
   def source_file_basename_without_source_extname(source_file)
-    source_file.to_pathname.basename_sub { |b| b.to_path.gsub(/\.source/, '') }.basename
+    source_file.to_pathname.basename_sub { |b| b.to_path.gsub('.source', '') }.basename
   end
 
   def target_data(target_file)
-    ::File.read(target_file)
+    File.read(target_file)
   end
 end

data/lib/avm/rspec/shared_examples/avm_source_generated.rb

@@ -3,8 +3,8 @@
 require 'eac_fs/comparator'
 require 'eac_ruby_utils/core_ext'
 
-::RSpec.shared_examples 'avm_source_generated' do |spec_file, stereotype, options = {}|
-  fixtures_dir = ::Pathname.new('base_spec_files').expand_path(::File.dirname(spec_file))
+RSpec.shared_examples 'avm_source_generated' do |spec_file, stereotype, options = {}|
+  fixtures_dir = Pathname.new('base_spec_files').expand_path(File.dirname(spec_file))
 
   fixtures_dir.children.select(&:directory?).each do |target_dir|
     context "when target is \"#{target_dir.basename}\"" do
@@ -18,6 +18,6 @@ require 'eac_ruby_utils/core_ext'
 
   # @return [EacFs::Comparato]
   def fs_comparator
-    ::EacFs::Comparator.new.rename_file('.gitignore', '_gitignore')
+    EacFs::Comparator.new.rename_file('.gitignore', '_gitignore')
   end
 end

data/lib/avm/rspec/shared_examples/entries_values.rb

@@ -2,11 +2,11 @@
 
 require 'eac_ruby_utils/core_ext'
 
-::RSpec.shared_examples 'entries_values' do |spec_file, expected_values|
+RSpec.shared_examples 'entries_values' do |spec_file, expected_values|
   describe '#read_entry' do
     config_path = spec_file.to_pathname
     config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
-    ::EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, config_path)
+    EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, config_path)
 
     expected_values.each do |instance_id, values|
       values.each do |input, expected|

data/lib/avm/rspec/shared_examples/in_avm_registry.rb

@@ -2,8 +2,8 @@
 
 require 'avm/registry'
 
-::RSpec.shared_examples 'in_avm_registry' do |registry_method|
-  let(:avm_registry) { ::Avm::Registry.send(registry_method) }
+RSpec.shared_examples 'in_avm_registry' do |registry_method|
+  let(:avm_registry) { Avm::Registry.send(registry_method) }
 
   it 'is in the avm registry' do
     expect(avm_registry.registered_modules).to include(described_class)

data/lib/avm/rspec/shared_examples/not_in_avm_registry.rb

@@ -2,8 +2,8 @@
 
 require 'avm/registry'
 
-::RSpec.shared_examples 'not_in_avm_registry' do |registry_method = nil|
-  registry_method.if_present(::Avm::Registry.registries) { |v| [::Avm::Registry.send(v)] }
+RSpec.shared_examples 'not_in_avm_registry' do |registry_method = nil|
+  registry_method.if_present(Avm::Registry.registries) { |v| [Avm::Registry.send(v)] }
     .each do |registry|
     context "when registry is #{registry}" do
       it 'is not in the avm registry' do

data/lib/avm/scms/auto_commit/file_resource_name.rb

@@ -20,7 +20,7 @@ module Avm
         def commit_message
           r = class_name
           r += ': remove' unless path.file?
-          r + '.'
+          "#{r}."
         end
 
         def relative_path

data/lib/avm/scms/auto_commit/rules.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 
-::EacRubyUtils.require_sub __FILE__
+EacRubyUtils.require_sub __FILE__
 
 module Avm
   module Scms
@@ -26,8 +26,8 @@ module Avm
 
           def rule_class_by_key(key)
             RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
-              raise("Rule not find with key \"#{key}\" (Available: " +
-                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
+              raise("Rule not find with key \"#{key}\" (Available: " \
+                    "#{RULES_CLASSES.flat_map(&:keys).join(', ')})")
           end
         end
       end

data/lib/avm/scms/commit_info.rb

@@ -24,9 +24,15 @@ module Avm
       immutable_accessor :path, type: :array
 
       def to_s
-        self.class.name.demodulize + '[' +
-          %w[fixup message].map { |m| [m, send(m)] }.reject { |m| m[1].blank? }
-            .map { |m| m.join(': ') }.join(',') + ']'
+        "#{self.class.name.demodulize}[#{attributes_to_s}]"
+      end
+
+      private
+
+      # @return [String]
+      def attributes_to_s
+        %w[fixup message].map { |m| [m, send(m)] }.reject { |m| m[1].blank? }
+          .map { |m| m.join(': ') }.join(',')
       end
     end
   end

data/lib/avm/source_generators/runner.rb

@@ -47,7 +47,7 @@ module Avm
 
       # @return [Hash<String, String>]
       def options
-        parsed.option.map { |v| v.split(OPTION_NAME_VALUE_SEPARATOR) }.to_h
+        parsed.option.to_h { |v| v.split(OPTION_NAME_VALUE_SEPARATOR) }
       end
 
       def target_path

data/lib/avm/sources/base/subs.rb

@@ -28,7 +28,7 @@ module Avm
         def subs
           subs_paths_to_search
             .map { |sub_path| ::Avm::Registry.sources.detect_optional(sub_path, parent: self) }
-            .reject(&:blank?)
+            .compact_blank
             .sort_by { |sub| [sub.path] }
         end
 

data/lib/avm/sources/base/testing.rb

@@ -57,12 +57,12 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
+            value.each_with_index.to_h { |v, i| ["test_#{i}", v] }
           )
         end
 
         def configured_hash_value_as_test_commands(value)
-          value.map { |k, v| [k.to_s.strip, configuration_value_to_env_command(v)] }.to_h
+          value.to_h { |k, v| [k.to_s.strip, configuration_value_to_env_command(v)] }
         end
       end
     end

data/lib/avm/sources/tests/single.rb

@@ -24,7 +24,7 @@ module Avm
 
         # @return [String]
         def id
-          "#{main? ? MAIN_SOURCE_ID : relative_path_from_main_source}\##{test_name}"
+          "#{main? ? MAIN_SOURCE_ID : relative_path_from_main_source}##{test_name}"
         end
 
         def main?

data/lib/avm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm
 version: !ruby/object:Gem::Version
-  version: 0.84.0
+  version: 0.84.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-11-22 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.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.38.1
+        version: '0.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.38.1
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: eac_config
   requirement: !ruby/object:Gem::Requirement
@@ -118,20 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.120'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement