avm-tools 0.107.0 → 0.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 982669127ef20f0cf64fa12fbe0d087c0479b0e8575d7bb2c6047abac2ec81d3
-  data.tar.gz: d4d659206696045d925dbba86c5d4fa69e184dbbdc58001e3453344ef68ef9ef
+  metadata.gz: f2aa6c6cff787569f6631e98dc1bb02e19e37358bffabdd12c770af457e4bf50
+  data.tar.gz: e324057b567e115c8449e3db04e82cf51955020539779e2d4928ede0338592c2
 SHA512:
-  metadata.gz: 436eb2a8f5957c9ffcb130851bb2dee4ab070cfd610a25356e8030766b6190a2a096b7a25250ab33801036f01e79e5c50bfc8024c2b6172f721f1868811251ea
-  data.tar.gz: 57711beda558d8e28ba2f98fd9ccbe4be8372e32093e1e45591ad7b5bb89cc9014946720b5430eaf66ef5ce4e583d96e3b3e556be39ce2670df577ee11d681cb
+  metadata.gz: b8b1b1fd688eef382e3d483ffa6fa5af94bc6d334c944d2772774b55eacd87c63f56306121fe58e8e4254c4e09e3cf3d055b1c941991ce30cd418096418dba0e
+  data.tar.gz: 81e7f566f5cc5e0a202440343b3318b934d15258cb02662ab39fe708b458cac5365e07d01b05834da0263840e1e49b86283534139ebbb4f582f4ff11499b729f

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/app_src/configuration'
+require 'avm/sources/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,7 +13,7 @@ module Avm
         private
 
         def configuration_uncached
-          ::Avm::AppSrc::Configuration.find_in_path(root)
+          ::Avm::Sources::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/ruby/rubocop/_configured.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/app_src/configuration'
+require 'avm/sources/configuration'
 
 module Avm
   module Ruby
@@ -22,7 +22,7 @@ module Avm
       private
 
       def configuration_uncached
-        ::Avm::AppSrc::Configuration.find_by_path(base_path)
+        ::Avm::Sources::Configuration.find_by_path(base_path)
       end
     end
   end

data/lib/avm/tools/app_src.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/app_src/base'
-require 'avm/app_src/configuration'
+require 'avm/sources/base'
+require 'avm/sources/configuration'
 require 'avm/launcher/paths/real'
 require 'avm/projects/stereotype/job_comparator'
 require 'eac_ruby_utils/core_ext'
@@ -36,12 +36,12 @@ module Avm
       private
 
       def avm_instance_uncached
-        ::Avm::AppSrc::Base.new(path)
+        ::Avm::Sources::Base.new(path)
       end
 
-      # @return [Avm::Apps::Sources::Configuration]
+      # @return [Avm::Sources::Configuration]
       def configuration_uncached
-        ::Avm::AppSrc::Configuration.find_in_path(path)
+        ::Avm::Sources::Configuration.find_in_path(path)
       end
 
       def stereotypes_jobs(job, job_args)

data/lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb

@@ -35,8 +35,8 @@ module Avm
                 fs_cache.content_path
               end
 
-              def fs_cache
-                super.child(instance.path.to_s.variableize)
+              def fs_cache_object_id
+                instance.path.to_s.variableize
               end
 
               def gem_title(gem_in_conflict)

data/lib/avm/tools/runner/config/load_path.rb

@@ -3,6 +3,7 @@
 require 'avm/self'
 require 'avm/tools/core_ext'
 require 'eac_config/node'
+require 'eac_ruby_utils/recursive_builder'
 
 module Avm
   module Tools
@@ -15,17 +16,21 @@ module Avm
           end
 
           def run
-            run_show
+            config_nodes.each { |config_node| run_show(config_node) }
             run_add
           end
 
           private
 
           # @return [[EacCli::Config]]
-          def config_node
+          def root_config_node
             ::EacConfig::Node.context.current
           end
 
+          def config_nodes
+            ::EacRubyUtils::RecursiveBuilder.new(root_config_node, &:self_loaded_nodes).result
+          end
+
           def run_add
             parsed.push.if_present do |v|
               infov 'Path to add', v
@@ -34,7 +39,7 @@ module Avm
             end
           end
 
-          def run_show
+          def run_show(config_node)
             infov 'Configuration path', config_node.url
             infov 'Paths included', config_node.self_loaded_nodes.count
             config_node.self_loaded_nodes.each do |loaded_node|

data/lib/avm/tools/runner.rb

@@ -17,10 +17,6 @@ module Avm
       def application
         ::Avm::Self.application
       end
-
-      def run
-        ::EacConfig::Node.context.on(::Avm::Self.build_config) { super }
-      end
     end
   end
 end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.107.0'
+    VERSION = '0.108.0'
   end
 end

data/vendor/avm/lib/avm/git/issue/complete/test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/app_src/configuration'
+require 'avm/sources/configuration'
 require 'avm/result'
 require 'eac_ruby_utils/fs/temp'
 
@@ -36,7 +36,7 @@ module Avm
           end
 
           def configuration_uncached
-            ::Avm::AppSrc::Configuration.find_by_path(@git)
+            ::Avm::Sources::Configuration.find_by_path(@git)
           end
         end
       end

data/vendor/avm/lib/avm/{app_src → sources}/base.rb

@@ -4,7 +4,7 @@ require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module AppSrc
+  module Sources
     class Base
       enable_simple_cache
       enable_listable
@@ -16,7 +16,7 @@ module Avm
 
       delegate :to_s, to: :path
 
-      # @return [Avm::AppSrc::Base]
+      # @return [Avm::Sources::Base]
       def parent
         options[OPTION_PARENT]
       end
@@ -28,7 +28,7 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
-      # @return [Enumerable<Avm::AppSrc::Base>]
+      # @return [Enumerable<Avm::Sources::Base>]
       def subs
         git_repo.subrepos
                 .map { |subrepo| self.class.new(subrepo.subpath.expand_path(path), parent: self) }

data/vendor/avm/lib/avm/{app_src → sources}/configuration/_locale.rb

@@ -4,7 +4,7 @@ require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'i18n'
 
 module Avm
-  module AppSrc
+  module Sources
     class Configuration < ::EacConfig::OldConfigs
       LOCALE_KEY = :locale
 

data/vendor/avm/lib/avm/{app_src → sources}/configuration/_rubocop.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module AppSrc
+  module Sources
     class Configuration < ::EacConfig::OldConfigs
       RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
       RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'

data/vendor/avm/lib/avm/{app_src → sources}/configuration/_tests.rb

@@ -3,7 +3,7 @@
 require 'avm/patches/eac_ruby_gems_utils/gem'
 
 module Avm
-  module AppSrc
+  module Sources
     class Configuration < ::EacConfig::OldConfigs
       BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
       TEST_COMMAND_KEY = 'test.command'

data/vendor/avm/lib/avm/{app_src → sources}/configuration.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 require 'yaml'
 
 module Avm
-  module AppSrc
+  module Sources
     class Configuration < ::EacConfig::OldConfigs
       require_sub __FILE__
 

data/vendor/avm/lib/avm/{app_src.rb → sources.rb}

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module AppSrc
+  module Sources
     require_sub __FILE__
   end
 end

data/vendor/avm/lib/avm/version.rb

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

data/vendor/eac_cli/lib/eac_cli/config.rb

@@ -3,16 +3,19 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     require_sub __FILE__
-    attr_reader :sub
 
     def initialize(sub_node)
-      @sub = sub_node
+      super(sub_node)
     end
 
     def entry(path, options = {})
       ::EacCli::Config::Entry.new(self, path, options)
     end
+
+    def sub
+      __getobj__
+    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.23.0'
+  VERSION = '0.23.1'
 end

data/vendor/eac_fs/lib/eac_fs/patches/object/fs_cache.rb

@@ -5,6 +5,11 @@ require 'eac_fs/patches/module/fs_cache'
 class Object
   # @return [EacFs::Cache]
   def fs_cache
-    self.class.fs_cache
+    self.class.fs_cache.child(fs_cache_object_id)
+  end
+
+  # @return [String]
+  def fs_cache_object_id
+    raise 'Abstract method hit'
   end
 end

data/vendor/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -43,8 +43,8 @@ module EacRubyBase0
       delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
-    def fs_cache
-      @fs_cache ||= ::EacFs::Cache.new(
+    def self_fs_cache
+      @self_fs_cache ||= ::EacFs::Cache.new(
         cache_dir.join(::EacFs::Cache.name.parameterize)
       )
     end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -40,7 +40,7 @@ module EacRubyBase0
     def on_context
       ::EacRubyUtils::Speaker.context.on(build_speaker) do
         ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
-          ::EacFs::Cache.context.on(application.fs_cache) do
+          ::EacFs::Cache.context.on(application.self_fs_cache) do
             yield
           end
         end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.107.0
+  version: 0.108.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -185,14 +185,6 @@ files:
 - exe/avm
 - lib/avm.rb
 - lib/avm/data.rb
-- lib/avm/data/instance.rb
-- lib/avm/data/instance/files_unit.rb
-- lib/avm/data/instance/package.rb
-- lib/avm/data/instance/unit.rb
-- lib/avm/data/package.rb
-- lib/avm/data/package/dump.rb
-- lib/avm/data/package/load.rb
-- lib/avm/data/unit.rb
 - lib/avm/eac_rails_base0.rb
 - lib/avm/eac_rails_base0/apache_host.rb
 - lib/avm/eac_rails_base0/apache_path.rb
@@ -287,10 +279,8 @@ files:
 - lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/i18n.rb
 - lib/avm/patches/object.rb
-- lib/avm/patches/object/fs_cache.rb
 - lib/avm/patches/object/i18n.rb
 - lib/avm/patches/object/template.rb
-- lib/avm/path_string.rb
 - lib/avm/postgresql.rb
 - lib/avm/postgresql/instance.rb
 - lib/avm/postgresql/instance/data_unit.rb
@@ -343,7 +333,6 @@ files:
 - lib/avm/self/instance/entry_keys.rb
 - lib/avm/self/root.rb
 - lib/avm/stereotypes.rb
-- lib/avm/sync.rb
 - lib/avm/tools.rb
 - lib/avm/tools/app_src.rb
 - lib/avm/tools/core_ext.rb
@@ -430,12 +419,6 @@ files:
 - template/avm/ruby/gems/generator/version.template
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
-- vendor/avm-apps/Gemfile
-- vendor/avm-apps/avm-apps.gemspec
-- vendor/avm-apps/lib/avm/apps.rb
-- vendor/avm-apps/lib/avm/apps/version.rb
-- vendor/avm-apps/spec/rubocop_spec.rb
-- vendor/avm-apps/spec/spec_helper.rb
 - vendor/avm-eac_asciidoctor_base0/Gemfile
 - vendor/avm-eac_asciidoctor_base0/avm-eac_asciidoctor_base0.gemspec
 - vendor/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0.rb
@@ -516,12 +499,14 @@ files:
 - vendor/avm/Gemfile
 - vendor/avm/avm.gemspec
 - vendor/avm/lib/avm.rb
-- vendor/avm/lib/avm/app_src.rb
-- vendor/avm/lib/avm/app_src/base.rb
-- vendor/avm/lib/avm/app_src/configuration.rb
-- vendor/avm/lib/avm/app_src/configuration/_locale.rb
-- vendor/avm/lib/avm/app_src/configuration/_rubocop.rb
-- vendor/avm/lib/avm/app_src/configuration/_tests.rb
+- vendor/avm/lib/avm/data/instance.rb
+- vendor/avm/lib/avm/data/instance/files_unit.rb
+- vendor/avm/lib/avm/data/instance/package.rb
+- vendor/avm/lib/avm/data/instance/unit.rb
+- vendor/avm/lib/avm/data/package.rb
+- vendor/avm/lib/avm/data/package/dump.rb
+- vendor/avm/lib/avm/data/package/load.rb
+- vendor/avm/lib/avm/data/unit.rb
 - vendor/avm/lib/avm/docker.rb
 - vendor/avm/lib/avm/docker/container.rb
 - vendor/avm/lib/avm/docker/image.rb
@@ -594,7 +579,15 @@ files:
 - vendor/avm/lib/avm/jobs.rb
 - vendor/avm/lib/avm/jobs/base.rb
 - vendor/avm/lib/avm/jobs/variables_source.rb
+- vendor/avm/lib/avm/path_string.rb
 - vendor/avm/lib/avm/result.rb
+- vendor/avm/lib/avm/sources.rb
+- vendor/avm/lib/avm/sources/base.rb
+- vendor/avm/lib/avm/sources/configuration.rb
+- vendor/avm/lib/avm/sources/configuration/_locale.rb
+- vendor/avm/lib/avm/sources/configuration/_rubocop.rb
+- vendor/avm/lib/avm/sources/configuration/_tests.rb
+- vendor/avm/lib/avm/sync.rb
 - vendor/avm/lib/avm/version.rb
 - vendor/avm/lib/avm/version_number.rb
 - vendor/avm/spec/lib/avm/git/auto_commit_path_spec.rb

data/lib/avm/patches/object/fs_cache.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/self'
-require 'eac_ruby_utils/core_ext'
-
-class Object
-  class << self
-    def avm_fs_cache
-      ::Avm::Self.application.fs_cache.child(name.variableize)
-    end
-  end
-
-  def avm_fs_cache
-    self.class.avm_fs_cache.child(avm_fs_cache_object_id)
-  end
-end

data/vendor/avm-apps/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec

data/vendor/avm-apps/avm-apps.gemspec

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'avm/apps/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'avm-apps'
-  s.version     = Avm::Apps::VERSION
-  s.authors     = ['Eduardo H. Bogoni']
-  s.summary     = 'DEPRECATED: use gem "avm" instead.'
-
-  s.files = Dir['{lib}/**/*']
-
-  s.add_dependency 'eac_ruby_utils', '~> 0.67'
-
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
-end

data/vendor/avm-apps/lib/avm/apps/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Apps
-    VERSION = '0.5.0'
-  end
-end

data/vendor/avm-apps/lib/avm/apps.rb

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

data/vendor/avm-apps/spec/rubocop_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/vendor/avm-apps/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))