avm-tools 0.113.5 → 0.114.1

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.1'
 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/eac_git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,vendor}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.74'
+  s.add_dependency 'eac_ruby_utils', '~> 0.83'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Branch
+      REFS_PREFIX = 'refs/heads/'
+
+      common_constructor :local, :name
+
+      # @return [String]
+      def current_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @return [Boolean]
+      def exist?
+        local.command('show-ref', '--quiet', full_ref_name).execute.fetch(:exit_code).zero?
+      end
+
+      def full_ref_name
+        "#{REFS_PREFIX}#{name}"
+      end
+    end
+  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/local.rb

@@ -30,6 +30,14 @@ module EacGit
       root_path <=> other.root_path
     end
 
+    # Retrieves a local branch.
+    #
+    # @param name [String] Ex.: for "refs/heads/master", name should be "master".
+    # @return [EacGit::Local::Branch]
+    def branch(name)
+      ::EacGit::Local::Branch.new(self, name)
+    end
+
     def commit(ref, required = false)
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
@@ -44,6 +52,16 @@ module EacGit
       source.to_s.strip.if_present(nil) { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
+    # Retrieves the current local branch.
+    #
+    # @return [EacGit::Local::Branch, nil]
+    def current_branch
+      command('symbolic-ref', '--quiet', HEAD_REFERENCE)
+        .execute!(exit_outputs: { 256 => '' })
+        .gsub(%r{\Arefs/heads/}, '').strip
+        .if_present { |v| branch(v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?

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

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

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.25'
-  s.add_dependency 'eac_fs', '~> 0.3'
+  s.add_dependency 'eac_cli', '~> 0.26'
+  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,12 +3,11 @@
 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
   module Runner
-    require_sub __FILE__
     enable_speaker
     common_concern do
       include ::EacCli::RunnerWith::Help
@@ -37,14 +36,15 @@ module EacRubyBase0
       runner_context.call(:application).version.to_s
     end
 
-    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.self_fs_cache) do
-            yield
-          end
-        end
+    def on_context(&block)
+      top_block = block
+      available_contexts.each do |context|
+        next if context.object.any?
+
+        last_block = top_block
+        top_block = ::Proc.new { context.object.on(context.builder.call, &last_block) }
       end
+      top_block.call
     end
 
     def show_version
@@ -63,11 +63,30 @@ module EacRubyBase0
 
     private
 
+    # @return [Array<EacRubyUtils::Struct>]
+    def available_contexts
+      (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) }
+    end
+
+    def available_context_row_to_struct(row)
+      %i[type object builder].zip(row).to_h.to_struct
+    end
+
     def build_speaker
       options = {}
       options[:err_out] = ::StringIO.new if parsed.quiet?
       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.14.0'
+  VERSION = '0.16.1'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/context.rb

@@ -2,6 +2,8 @@
 
 module EacRubyUtils
   class Context
+    delegate :any?, to: :stack
+
     def current
       optional_current || raise('No elements in context')
     end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb

@@ -1,18 +1,34 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/simple_cache'
 
 module EacRubyUtils
   module Envs
     class Executable
+      include ::EacRubyUtils::Listable
       include ::EacRubyUtils::SimpleCache
 
-      attr_reader :env, :name, :check_args
+      lists.add_symbol :option, :check_args, :auto_validate
+
+      DEFAULT_AUTO_VALIDATE = true
+
+      attr_reader :env, :name, :options
 
       def initialize(env, name, *check_args)
         @env = env
         @name = name
-        @check_args = check_args
+        self.options = self.class.lists.option.hash_keys_validate!(check_args.extract_options!)
+        options[OPTION_CHECK_ARGS] = check_args unless options.key?(OPTION_CHECK_ARGS)
+        options.freeze
+      end
+
+      def auto_validate?
+        options.key?(OPTION_AUTO_VALIDATE) ? options[OPTION_AUTO_VALIDATE] : DEFAULT_AUTO_VALIDATE
+      end
+
+      def check_args
+        options[OPTION_CHECK_ARGS]
       end
 
       def exist?
@@ -32,7 +48,7 @@ module EacRubyUtils
       end
 
       def command(*command_args)
-        validate!
+        validate! if auto_validate?
         env.command(*executable_args, *command_args)
       end
 
@@ -50,6 +66,8 @@ module EacRubyUtils
 
       private
 
+      attr_writer :options
+
       def exist_uncached
         env.command(*executable_args, *check_args).execute!
         true

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/to_struct.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+class Hash
+  # Returns an <tt>EacRubyUtils::Struct</tt> out of its receiver.
+  def to_struct
+    ::EacRubyUtils::Struct.new(self)
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_uri.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'addressable/uri'
+
+class Object
+  # Convert +self+ to String and then to Addressable::URI. Return nil if +self+ is +blank?+.
+  #
+  # @return [Addressable::URI]
+  def to_uri
+    return self if is_a?(::Addressable::URI)
+
+    to_s.blank? ? nil : ::Addressable::URI.parse(to_s)
+  end
+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.82.1'
+  VERSION = '0.87.0'
 end