avm-tools 0.113.6 → 0.114.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0c1b42a6d34ae3d070dbbae54375ddd08eab2a177c5c46cc9d42de8165d10a
-  data.tar.gz: ff02a56141cb130c4b0e9c7fc651ebe3de42ba13ec6c56557fbae70f96ff693c
+  metadata.gz: ab94e9f5fae951a039dc33fadb807fa8331899a843526fa957beeb05193a8419
+  data.tar.gz: ebb72038ffaa5b8c9c37d20e8b7a6de6b6303886665940474c36318804cdc600
 SHA512:
-  metadata.gz: c12fcce202f2eb1b40b58485dbf790e29b7f6bb183d450ce3c9f8a479abf9ae35a77865990c481ad1f2a28b18110bcc4e3db82ecc880c355f040eb8646433143
-  data.tar.gz: d85bb09c92c7d6b1f0414f66509da068ff018d8ec1da32b730f00fe99cc723895d4e09d205f5964cd562a61647c849017f2fe3def50f3fdfec45c770a9d2d8a6
+  metadata.gz: b25329ca5da5c3aeda2bd26b9f2cf91edadfe965e3eba3e891eb590a3b7a9483870b80e45b2e804eb44d56877445c1da00a98b75b9c8feac81fb44165020e21a
+  data.tar.gz: bf211cebb15418b176c681020f825e64ba8d12cecd3d2022b3026326fcc3d062e846c763143b75cf17a2d38f7c71b244b4748166deb3cc873fe61eac319afc3b

data/lib/avm/launcher/context.rb

@@ -8,6 +8,7 @@ require 'avm/launcher/context/instance_discovery'
 require 'avm/launcher/context/settings'
 require 'avm/launcher/paths/logical'
 require 'avm/launcher/project'
+require 'avm/tools/self'
 
 module Avm
   module Launcher
@@ -15,10 +16,6 @@ module Avm
       include ::EacRubyUtils::SimpleCache
       enable_speaker
 
-      DEFAULT_PROJECTS_ROOT = '.'
-      DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
-      DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
-
       class << self
         attr_writer :current
 
@@ -34,6 +31,8 @@ module Avm
       attr_reader :root, :settings, :cache_root
       attr_accessor :publish_options, :recache, :instance_manager
 
+      CONFIG_PATH_PREFIX = 'launcher'
+
       def initialize(options = {})
         @options = options.with_indifferent_access
         @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
@@ -59,15 +58,27 @@ module Avm
       private
 
       def build_option(key)
-        @options[key] || env_option(key) || default_option(key)
+        @options[key] || config_option(key) || default_option(key)
+      end
+
+      def config_option(key)
+        ::Avm::Self::Instance.default.entry([CONFIG_PATH_PREFIX, key].join('.')).optional_value
       end
 
-      def env_option(key)
-        ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
+      def default_cache_root
+        ::Avm::Tools::Self.application.cache_dir.join('launcher')
       end
 
       def default_option(key)
-        self.class.const_get("DEFAULT_#{key}".underscore.upcase)
+        send("default_#{key}".underscore)
+      end
+
+      def default_projects_root
+        '.'
+      end
+
+      def default_settings_file
+        ::Avm::Tools::Self.application.config_dir.join('launcher.yaml')
       end
 
       def projects_uncached

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

@@ -17,7 +17,7 @@ module Avm
 
               def run
                 infov 'Cache path', fs_cache.content_path
-                infov 'Cached?', fs_cache.cached?
+                infov 'Cached?', fs_cache.stored?
                 parser.gems_in_conflict.each do |gem_in_conflict|
                   print_gem_in_conflict(gem_in_conflict)
                 end
@@ -31,7 +31,7 @@ module Avm
               end
 
               def content_path
-                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.write(bundle_update) unless fs_cache.stored? && parsed.last?
                 fs_cache.content_path
               end
 

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.113.6'
+    VERSION = '0.114.0'
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/sub/avm-git/lib/avm/git/revision_test.rb

@@ -77,7 +77,7 @@ module Avm
       end
 
       def successful_uncached
-        if options.fetch(:no_cache) || !successful_cache.cached?
+        if options.fetch(:no_cache) || !successful_cache.stored?
           checkout_revision
           run_test
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/sub/eac_cli/lib/eac_cli/config/entry.rb

@@ -25,7 +25,7 @@ module EacCli
       end
 
       def secret_value
-        self.class.new(config, path, options.merge(noecho: true)).value
+        self.class.new(config, path, options.to_h.merge(noecho: true).to_h).value
       end
 
       delegate :found?, :value=, to: :sub_entry

data/sub/eac_cli/lib/eac_cli/version.rb

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

data/sub/eac_fs/lib/eac_fs/cached_download.rb

@@ -13,7 +13,7 @@ module Avm
     end
 
     def assert
-      download unless fs_cache.cached?
+      download unless fs_cache.stored?
     end
 
     def download

data/sub/eac_fs/lib/eac_fs/contexts.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/context'
+
+module EacFs
+  class Contexts
+    TYPES = %i[cache config data].freeze
+
+    class << self
+      TYPES.each do |type|
+        class_eval <<~CODE, __FILE__, __LINE__ + 1
+          # @return [EacRubyUtils::Context<EacFs::StorageTree>]
+          def #{type}
+            @#{type} ||= ::EacRubyUtils::Context.new
+          end
+        CODE
+      end
+    end
+  end
+end

data/sub/eac_fs/lib/eac_fs/patches/module/fs_cache.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_fs/cache'
+require 'eac_fs/contexts'
 
 class Module
-  # @return [EacFs::Cache]
-  def fs_cache
-    ::EacFs::Cache.context.current.child('fs_cache', *name.split('::'))
+  ::EacFs::Contexts::TYPES.each do |type|
+    method_name = "fs_#{type}"
+    class_eval <<~CODE, __FILE__, __LINE__ + 1
+      # @return [EacFs::StorageTree]
+      def #{method_name}
+        ::EacFs::Contexts.#{type}.current.child('#{method_name}', *name.split('::'))
+      end
+    CODE
   end
 end

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

@@ -1,17 +1,27 @@
 # frozen_string_literal: true
 
+require 'eac_fs/contexts'
 require 'eac_fs/patches/module/fs_cache'
 
 class Object
-  # @return [EacFs::Cache]
-  def fs_cache
-    oid = fs_cache_object_id
-    oid = [oid.to_s] unless oid.is_a?(::Enumerable)
-    oid.inject(self.class.fs_cache) { |a, e| a.child(e.to_s) }
+  ::EacFs::Contexts::TYPES.each do |type|
+    class_eval <<~CODE, __FILE__, __LINE__ + 1
+      # @return [EacFs::StorageTree]
+      def fs_#{type}
+        oid = fs_object_id_by_type(:'#{type}')
+        oid = [oid.to_s] unless oid.is_a?(::Enumerable)
+        oid.inject(self.class.fs_#{type}) { |a, e| a.child(e.to_s) }
+      end
+    CODE
   end
 
   # @return [String, Array<String>]
-  def fs_cache_object_id
+  def fs_object_id
     raise 'Abstract method hit'
   end
+
+  def fs_object_id_by_type(type)
+    method = "fs_#{type}_object_id"
+    respond_to?(method) ? send(method) : fs_object_id
+  end
 end

data/sub/eac_fs/lib/eac_fs/{cache.rb → storage_tree.rb}

@@ -4,9 +4,7 @@ require 'eac_ruby_utils/core_ext'
 require 'fileutils'
 
 module EacFs
-  class Cache
-    enable_context
-
+  class StorageTree
     CONTENT_FILE_NAME = '__content__'
 
     attr_reader :path
@@ -18,19 +16,19 @@ module EacFs
     end
 
     def clear
-      return unless cached?
+      return unless stored?
 
       ::File.unlink(content_path)
     end
 
     def read
-      return nil unless cached?
+      return nil unless stored?
 
       ::File.read(content_path)
     end
 
-    def read_or_cache
-      write(yield) unless cached?
+    def read_or_store
+      write(yield) unless stored?
 
       read
     end
@@ -45,7 +43,7 @@ module EacFs
       self.class.new(path, *child_path_parts)
     end
 
-    def cached?
+    def stored?
       ::File.exist?(content_path)
     end
 

data/sub/eac_fs/lib/eac_fs/version.rb

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

data/sub/eac_fs/spec/lib/eac_fs/{cache_spec.rb → storage_tree_spec.rb}

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object/blank'
-require 'eac_fs/cache'
+require 'eac_fs/storage_tree'
 
-RSpec.describe ::EacFs::Cache do
+RSpec.describe ::EacFs::StorageTree do
   let(:tmpdir) { ::Dir.mktmpdir }
   let(:instance) { described_class.new(tmpdir, 'instance') }
 
   it { expect(instance.read).to be_blank }
-  it { expect(instance.cached?).to eq(false) }
+  it { expect(instance.stored?).to eq(false) }
 
   context 'when instance is writed' do
     before { instance.write('STUB') }
 
     it { expect(instance.read).to eq('STUB') }
-    it { expect(instance.cached?).to eq(true) }
+    it { expect(instance.stored?).to eq(true) }
 
     context 'when instance is cleared' do
       before { instance.clear }
 
       it { expect(instance.read).to be_blank }
-      it { expect(instance.cached?).to eq(false) }
+      it { expect(instance.stored?).to eq(false) }
     end
   end
 

data/sub/eac_git/lib/eac_git/local/commit.rb

@@ -13,6 +13,7 @@ module EacGit
         author_name: '%an', author_email: '%ae', author_date: '%ai',
         subject: '%s',
         author_all: '%an <%ae>, %ai',
+        commit_hash: '%H', abbreviated_commit_hash: '%h',
         commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
         commiter_all: '%cn <%ce>, %ci',
         raw_body: '%B'

data/sub/eac_git/lib/eac_git/local/remotes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_git/local/remote'
+
+module EacGit
+  class Local
+    module Remotes
+      def remote(name)
+        ::EacGit::Local::Remote.new(self, name)
+      end
+
+      def remotes
+        command('remote').execute!.each_line.map(&:strip).reject(&:blank?).map do |name|
+          remote(name)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/version.rb

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

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.26'
-  s.add_dependency 'eac_fs', '~> 0.3'
+  s.add_dependency 'eac_fs', '~> 0.10'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.70'
 

data/sub/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -3,7 +3,8 @@
 require 'eac_cli/config'
 require 'eac_config/envvars_node'
 require 'eac_config/yaml_file_node'
-require 'eac_fs/cache'
+require 'eac_fs/contexts'
+require 'eac_fs/storage_tree'
 require 'eac_ruby_base0/application_xdg'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
@@ -43,10 +44,13 @@ module EacRubyBase0
       delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
-    def self_fs_cache
-      @self_fs_cache ||= ::EacFs::Cache.new(
-        cache_dir.join(::EacFs::Cache.name.parameterize)
-      )
+    ::EacFs::Contexts::TYPES.each do |type|
+      class_eval <<CODE, __FILE__, __LINE__ + 1
+  # @return [EacFs::StorageTree]
+  def self_fs_#{type}
+    @self_fs_#{type} ||= ::EacFs::StorageTree.new(#{type}_dir.join('eac_fs'))
+  end
+CODE
     end
 
     def home_dir

data/sub/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -3,7 +3,7 @@
 require 'eac_cli/core_ext'
 require 'eac_cli/speaker'
 require 'eac_config/node'
-require 'eac_fs/cache'
+require 'eac_fs/contexts'
 require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
@@ -65,11 +65,10 @@ module EacRubyBase0
 
     # @return [Array<EacRubyUtils::Struct>]
     def available_contexts
-      [
-        [:cache, ::EacFs::Cache.context, -> { application.self_fs_cache }],
+      (filesystem_available_contexts + [
         [:config, ::EacConfig::Node.context, -> { runner_context.call(:application).build_config }],
         [:speaker, ::EacRubyUtils::Speaker.context, -> { build_speaker }]
-      ].map { |row| available_context_row_to_struct(row) }
+      ]).map { |row| available_context_row_to_struct(row) }
     end
 
     def available_context_row_to_struct(row)
@@ -82,5 +81,12 @@ module EacRubyBase0
       options[:in_in] = FailIfRequestInput.new if parsed.no_input?
       ::EacCli::Speaker.new(options)
     end
+
+    def filesystem_available_contexts
+      ::EacFs::Contexts::TYPES.map do |type|
+        key = "fs_#{type}".to_sym
+        [key, ::EacFs::Contexts.send(type), -> { application.send("self_#{key}") }]
+      end
+    end
   end
 end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/if_exist.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Pathname
+  # @return +block.call(self)+ if +self+ exists, +default_value+ otherwise.
+  def if_exist(default_value = nil)
+    return default_value unless exist?
+
+    block_given? ? yield(self) : self
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/readlink_r.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+class Pathname
+  def readlink_r
+    r = self
+    r = r.readlink while r.symlink?
+    r
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/stub_speaker.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/speaker/receiver'
+
+module EacRubyUtils
+  module Rspec
+    class StubSpeaker
+      include ::EacRubyUtils::Speaker::Receiver
+
+      def error(_string); end
+
+      def fatal_error(string)
+        error(string)
+        raise('Fatal error')
+      end
+
+      # @see EacRubyUtils::Speaker::Sender.input
+      def input(_question, _options = {})
+        raise 'Input requested'
+      end
+
+      def info(_string); end
+
+      def infom(_string); end
+
+      def infov(*_args); end
+
+      def out(_string = ''); end
+
+      def puts(_string = ''); end
+
+      def success(_string); end
+
+      def title(_string); end
+
+      def warn(_string); end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb

@@ -5,8 +5,15 @@ require 'eac_ruby_utils/abstract_methods'
 module EacRubyUtils
   module Speaker
     module Receiver
+      extend ::ActiveSupport::Concern
       extend ::EacRubyUtils::AbstractMethods
 
+      module ClassMethods
+        def on(*args, &block)
+          ::EacRubyUtils::Speaker.context.on(new(*args), &block)
+        end
+      end
+
       def error(_string)
         raise_abstract_method(__method__)
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.83.0'
+  VERSION = '0.85.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.113.6
+  version: 0.114.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -883,8 +883,8 @@ files:
 - sub/eac_fs/Gemfile
 - sub/eac_fs/eac_fs.gemspec
 - sub/eac_fs/lib/eac_fs.rb
-- sub/eac_fs/lib/eac_fs/cache.rb
 - sub/eac_fs/lib/eac_fs/cached_download.rb
+- sub/eac_fs/lib/eac_fs/contexts.rb
 - sub/eac_fs/lib/eac_fs/file_info.rb
 - sub/eac_fs/lib/eac_fs/logs.rb
 - sub/eac_fs/lib/eac_fs/logs/file.rb
@@ -895,10 +895,11 @@ files:
 - sub/eac_fs/lib/eac_fs/patches/object/fs_cache.rb
 - sub/eac_fs/lib/eac_fs/patches/pathname.rb
 - sub/eac_fs/lib/eac_fs/patches/pathname/info.rb
+- sub/eac_fs/lib/eac_fs/storage_tree.rb
 - sub/eac_fs/lib/eac_fs/traversable.rb
 - sub/eac_fs/lib/eac_fs/traverser.rb
 - sub/eac_fs/lib/eac_fs/version.rb
-- sub/eac_fs/spec/lib/eac_fs/cache_spec.rb
+- sub/eac_fs/spec/lib/eac_fs/storage_tree_spec.rb
 - sub/eac_fs/spec/rubocop_spec.rb
 - sub/eac_fs/spec/spec_helper.rb
 - sub/eac_git/Gemfile
@@ -914,6 +915,7 @@ files:
 - sub/eac_git/lib/eac_git/local/dirty_files.rb
 - sub/eac_git/lib/eac_git/local/log.rb
 - sub/eac_git/lib/eac_git/local/remote.rb
+- sub/eac_git/lib/eac_git/local/remotes.rb
 - sub/eac_git/lib/eac_git/local/subrepo.rb
 - sub/eac_git/lib/eac_git/local/subrepo/config.rb
 - sub/eac_git/lib/eac_git/remote.rb
@@ -1285,8 +1287,10 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/if_exist.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/mkpath_s.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/parent_n.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/readlink_r.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb
@@ -1303,6 +1307,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup/conditionals.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup_manager.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/stub_speaker.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb