eac_tools 0.70.1 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4db50c78d5717141a92f0bf2836e5e019afe0da8fa52f40999ac5a214e21d8
-  data.tar.gz: 8398de9a43cdbd4c3757836fa352de365f80b7f1aa2d9bb264cabe15095e7bbe
+  metadata.gz: 3741d3890696e7b076cffae0313ed3ad82d5fc68fe41ba2ae64d75cd3a1a474e
+  data.tar.gz: 6685e1624bb09bbebfdc04b5d05046cd24106c25c336af3117936ec57aa48947
 SHA512:
-  metadata.gz: 81ac5304d8e40cdf57563d35aaad5205b66782e756c269f9260791c1001e1ab210b19bc4eac67769da6546ae9935030a29fd1714ff23d1854123082974adb239
-  data.tar.gz: 6fbe5c417b970d88be91efce68db390c861a6d34f9178500352576873c614dc8e93cc193307350fb89473f68d3ff1ac3d7b01c026d63833e2e234b78f1ee5558
+  metadata.gz: 69304f63883050fd2811ef4762a96e8a8fee1091ba1cd7cc768f93c70075a27e89fc49c800b89dfa40683e26e02a006a123b8ad72e42ea7813ab816e1d0702ec
+  data.tar.gz: a03de22b8a063b57beaab4d7862e2cdbf84842b429afa6f7fdbfb6d60414f006b0cc8b55c260c41d4309f0c428c4a6ecc868526560ddc299ba53ea885c2ef8c6

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.70.1)
-      avm (~> 0.78)
+    eac_tools (0.73.0)
+      avm (~> 0.79)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
@@ -17,8 +17,8 @@ PATH
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.3)
-      avm-tools (~> 0.151, >= 0.151.1)
-      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      avm-tools (~> 0.153)
+      eac_ruby_utils (~> 0.119)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -163,11 +163,11 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.151.1)
-      aranha-parsers (~> 0.19)
-      avm (~> 0.76)
+    avm-tools (0.153.0)
+      aranha-parsers (~> 0.21)
+      avm (~> 0.79)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.3)
+      avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
       avm-git (~> 0.13, >= 0.13.3)
       clipboard (~> 1.3, >= 1.3.6)
@@ -181,14 +181,14 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.78.0)
-      aranha-parsers (~> 0.20)
+    avm (0.79.0)
+      aranha-parsers (~> 0.21)
       eac_cli (~> 0.35, >= 0.35.1)
-      eac_config (~> 0.12)
+      eac_config (~> 0.14)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
       eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      eac_ruby_utils (~> 0.119)
       eac_templates (~> 0.5)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
@@ -205,9 +205,9 @@ PATH
 PATH
   remote: sub/eac_config
   specs:
-    eac_config (0.12.0)
-      addressable (~> 2.8, >= 2.8.1)
-      eac_ruby_utils (~> 0.107)
+    eac_config (0.14.0)
+      addressable (~> 2.8, >= 2.8.4)
+      eac_ruby_utils (~> 0.119)
 
 PATH
   remote: sub/eac_docker
@@ -219,14 +219,14 @@ PATH
 PATH
   remote: sub/eac_envs-http
   specs:
-    eac_envs-http (0.3.2)
+    eac_envs-http (0.4.0)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.116)
-      faraday (~> 2.7, >= 2.7.4)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
+      faraday (~> 2.7, >= 2.7.6)
       faraday-follow_redirects (~> 0.3)
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
-      faraday-retry (~> 2.1)
+      faraday-retry (~> 2.2)
 
 PATH
   remote: sub/eac_fs
@@ -246,10 +246,10 @@ PATH
 PATH
   remote: sub/eac_rest
   specs:
-    eac_rest (0.9.0)
-      eac_envs-http (~> 0.3, >= 0.3.1)
+    eac_rest (0.9.1)
+      eac_envs-http (~> 0.4)
       eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
+      eac_ruby_utils (~> 0.117, >= 0.117.1)
 
 PATH
   remote: sub/eac_ruby_base0
@@ -263,7 +263,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.117.1)
+    eac_ruby_utils (0.119.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.4)
       bundler
@@ -280,7 +280,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -288,10 +288,10 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha-parsers (0.20.0)
+    aranha-parsers (0.21.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.8, >= 2.8.4)
-      eac_envs-http (~> 0.3, >= 0.3.2)
+      eac_envs-http (~> 0.4)
       eac_ruby_utils (~> 0.117, >= 0.117.1)
       nokogiri (~> 1.15, >= 1.15.2)
       ofx-parser (~> 1.1)
@@ -310,7 +310,7 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    faraday (2.7.6)
+    faraday (2.7.7)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -333,7 +333,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     minitar (0.9)
-    minitest (5.18.0)
+    minitest (5.18.1)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
     nokogiri (1.15.2-x86_64-linux)
@@ -348,8 +348,8 @@ GEM
       racc
     parslet (2.0.0)
     public_suffix (5.0.1)
-    racc (1.7.0)
-    rack (3.0.7)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -366,7 +366,7 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.70.1'
+  VERSION = '0.73.0'
 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.20'
+  s.add_dependency 'aranha-parsers', '~> 0.21'
   s.add_dependency 'eac_cli', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'eac_config', '~> 0.12'
+  s.add_dependency 'eac_config', '~> 0.14'
   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.117', '>= 0.117.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119'
   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/applications/base.rb

@@ -12,6 +12,7 @@ module Avm
       require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
 
+      AVM_TYPE = 'Application'
       LOCAL_INSTANCE_SUFFIX = 'dev'
 
       common_constructor :id do

data/sub/avm/lib/avm/registry/applications.rb

@@ -10,6 +10,7 @@ module Avm
 
       # @return [Array<Avm::Applications::Base>]
       def available
+        load_config
         detected.values
       end
 
@@ -26,6 +27,12 @@ module Avm
       def detected
         @detected ||= {}
       end
+
+      def load_config
+        ::Avm::Registry.config_objects.available.each do |id, type|
+          detect(id) if type == ::Avm::Applications::Base::AVM_TYPE
+        end
+      end
     end
   end
 end

data/sub/avm/lib/avm/registry/config_objects.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Registry
+    class ConfigObjects
+      def initialize(*args); end
+
+      # @return [Array<Avm::Applications::Base>]
+      def available
+        ::EacConfig::Node.context.current.entries('*.avm_type').node_entries
+          .map { |ne| [ne.path.first, ne.value] }
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/registry.rb

@@ -7,8 +7,9 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :applications, :application_stereotypes, :file_formats, :instances,
-                     :launcher_stereotypes, :runners, :scms, :source_generators, :sources
+    lists.add_symbol :category, :applications, :application_stereotypes, :config_objects,
+                     :file_formats, :instances, :launcher_stereotypes, :runners, :scms,
+                     :source_generators, :sources
 
     class << self
       enable_simple_cache

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

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

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

@@ -14,10 +14,10 @@ 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.19'
-  s.add_dependency 'avm', '~> 0.76'
+  s.add_dependency 'aranha-parsers', '~> 0.21'
+  s.add_dependency 'avm', '~> 0.79'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.3'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'

data/sub/avm-tools/lib/avm/tools/runner/applications/list.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Applications
+        class List
+          runner_with :help, :output
+
+          def run
+            infov 'Found', applications.count
+            run_output
+          end
+
+          def output_content
+            applications.map { |s| "#{s}\n" }.join
+          end
+
+          private
+
+          def applications_uncached
+            ::Avm::Registry.applications.available
+              .sort_by { |s| [s.id] }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner/applications.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Applications
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.151.1'
+    VERSION = '0.153.0'
   end
 end

data/sub/eac_config/eac_config.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entries.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module EacConfig
+  class Entries
+    require_sub __FILE__
+    enable_simple_cache
+    common_constructor :root_node, :path do
+      self.path = ::EacConfig::EntryPath.assert(path)
+    end
+
+    def to_s
+      "#{self.class}[RootNode: #{root_node}, Path: #{path}]"
+    end
+
+    private
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_uncached
+      node_entries_from_root + node_entries_from_load_path
+    end
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_from_load_path_uncached
+      root_node.recursive_loaded_nodes.flat_map { |loaded_node| loaded_node.self_entries(path) }
+    end
+
+    # @return [Array<EacConfig::Entries>]
+    def node_entries_from_root_uncached
+      root_node.self_entries(path)
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -58,5 +58,32 @@ module EacConfig
     def to_string
       parts.join(PART_SEPARATOR)
     end
+
+    # @param part [String]
+    # @return [EacConfig::EntryPath]
+    def with_first(part)
+      new_parts = parts.dup
+      new_parts.unshift(part)
+      self.class.new(new_parts)
+    end
+
+    # @return [EacConfig::EntryPath]
+    def without_first
+      new_parts = parts.dup
+      new_parts.shift
+      self.class.new(new_parts)
+    end
+
+    # @return [EacConfig::EntryPath]
+    def with_last(part)
+      self.class.new(parts + [part])
+    end
+
+    # @return [EacConfig::EntryPath]
+    def without_last
+      new_parts = parts.dup
+      new_parts.pop
+      self.class.new(new_parts)
+    end
   end
 end

data/sub/eac_config/lib/eac_config/envvars_node.rb

@@ -18,6 +18,12 @@ module EacConfig
       end
     end
 
+    # @param path [EacConfig::EntryPath]
+    # @return [Array<EacConfig::Entries>]
+    def self_entries(_path)
+      []
+    end
+
     def url
       URI
     end

data/sub/eac_config/lib/eac_config/node.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_config/entries'
 require 'eac_config/entry'
 require 'eac_config/entry_path'
 require 'eac_config/load_path'
@@ -20,10 +21,15 @@ module EacConfig
     attr_accessor :write_node
 
     common_concern do
-      enable_abstract_methods
+      acts_as_abstract :self_entries
       include ::Comparable
     end
 
+    # @return [Array<EacConfig::Entries>]
+    def entries(path)
+      ::EacConfig::Entries.new(self, path)
+    end
+
     def entry(path)
       ::EacConfig::Entry.new(self, path)
     end
@@ -50,7 +56,7 @@ module EacConfig
 
     # @return [Array<EacConfig::Node>]
     def self_loaded_nodes
-      load_path.paths.map { |node_path| load_node(node_path) }
+      load_path.paths.flat_map { |node_path| load_nodes(node_path) }
     end
 
     # @return [Array<EacConfig::Node>]
@@ -66,7 +72,9 @@ module EacConfig
 
     private
 
-    def load_node(node_path)
+    # @param node_path [String]
+    # @return [Array<EacConfig::Node>]
+    def load_nodes(node_path)
       ::EacConfig::NodeUri.new(node_path, url).instanciate
     end
   end

data/sub/eac_config/lib/eac_config/node_entry.rb

@@ -12,6 +12,7 @@ module EacConfig
     common_constructor :node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
     end
+    compare_by :node, :path
 
     abstract_methods :found?, :value, :value=
 

data/sub/eac_config/lib/eac_config/node_uri/instanciate_single.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacConfig
+  class NodeUri
+    class InstanciateSingle
+      acts_as_instance_method
+      enable_simple_cache
+      common_constructor :node_uri, :instance_uri
+
+      # @return [Array<Class>]
+      def available_node_classes
+        require 'eac_config/envvars_node'
+        require 'eac_config/yaml_file_node'
+        [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
+      end
+
+      # @return [EacConfig::Node]
+      def result
+        available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
+          raise("No class mapped for \"#{to_addressable}\"")
+      end
+
+      # @return [Addressable::URI]
+      def to_addressable
+        instance_uri.to_uri
+      end
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/node_uri.rb

@@ -5,21 +5,26 @@ module EacConfig
     enable_simple_cache
     common_constructor :source, :loader_uri, default: [nil]
 
-    def available_node_classes
-      require 'eac_config/envvars_node'
-      require 'eac_config/yaml_file_node'
-      [::EacConfig::EnvvarsNode, ::EacConfig::YamlFileNode]
-    end
-
+    # @return [Array<EacConfig::Node>]
     def instanciate
-      available_node_classes.lazy.map { |k| k.from_uri(self) }.find(&:present?) ||
-        raise("No class mapped for \"#{to_addressable}\"")
+      instance_uris.map { |uri| instanciate_single(uri) }
     end
 
     delegate :to_s, to: :to_addressable
 
     private
 
+    # @return [Array<Addressable::URI>]
+    def instance_uris
+      if to_addressable.scheme == 'file'
+        ::Pathname.glob(to_addressable.path).map do |found_path|
+          ::Addressable::URI.new(scheme: 'file', path: found_path.to_path)
+        end
+      else
+        [to_addressable]
+      end
+    end
+
     def to_addressable_uncached
       r = ::Addressable::URI.parse(source)
       path = r.path.to_pathname
@@ -34,5 +39,7 @@ module EacConfig
 
       r.to_pathname.parent
     end
+
+    require_sub __FILE__, require_mode: :kernel
   end
 end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.12.0'
+  VERSION = '0.14.0'
 end

data/sub/eac_config/lib/eac_config/yaml_file_node/self_entries.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_config/entry_path'
+require 'eac_config/yaml_file_node/entry'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/wildcards'
+
+module EacConfig
+  class YamlFileNode
+    class SelfEntries
+      acts_as_instance_method
+      common_constructor :node, :path do
+        self.path = ::EacConfig::EntryPath.assert(path)
+      end
+
+      # @return [Array<EacConfig::YamlFileNode>]
+      def result
+        head_node.result.map { |found_path| ::EacConfig::YamlFileNode::Entry.new(node, found_path) }
+      end
+
+      private
+
+      # @return [DataNode]
+      def head_node
+        DataNode.new(node.data, ::EacConfig::EntryPath.new, path)
+      end
+
+      class DataNode
+        common_constructor :data_node, :path_from, :path_to do
+          self.data_node = data_node.stringify_keys if data_node.is_a?(::Hash)
+        end
+
+        # @return [DataNode]
+        def child(child_key)
+          self.class.new(data_node.fetch(child_key), path_from.with_last(child_key),
+                         path_to.without_first)
+        end
+
+        def children
+          return [] unless data_node.is_a?(::Hash)
+
+          data_node.keys.select { |k| key_matcher.match?(k) }.map { |k| child(k) }
+        end
+
+        # @return [Symbol]
+        def key
+          path_to.first
+        end
+
+        # @return [EacRubyUtils::Wildcards]
+        def key_matcher
+          @key_matcher ||= ::EacRubyUtils::Wildcards.new(key)
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result
+          (path_to.empty? ? result_from_self : result_from_children)
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result_from_self
+          [path_from]
+        end
+
+        # @return [Array<EacConfig::EntryPath>]
+        def result_from_children
+          children.flat_map(&:result)
+        end
+      end
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/yaml_file_node.rb

@@ -20,6 +20,7 @@ module EacConfig
     common_constructor :path do
       self.path = path.to_pathname
     end
+    compare_by :path
 
     def persist_data(new_data)
       path.parent.mkpath
@@ -47,5 +48,7 @@ module EacConfig
 
       r.is_a?(::Hash) ? r : {}
     end
+
+    require_sub __FILE__, require_mode: :kernel
   end
 end