avm-tools 0.105.0 → 0.109.0

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

@@ -7,19 +7,25 @@ module EacGit
     class Commit
       require_sub __FILE__, include_modules: true
       enable_simple_cache
+      include ::Comparable
 
       FIELDS = {
         author_name: '%an', author_email: '%ae', author_date: '%ai',
         subject: '%s',
         author_all: '%an <%ae>, %ai',
         commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
-        commiter_all: '%cn <%ce>, %ci'
+        commiter_all: '%cn <%ce>, %ci',
+        raw_body: '%B'
       }.freeze
 
-      common_constructor :repo, :hash
+      common_constructor :repo, :id
+
+      def <=>(other)
+        [repo, id] <=> [other.repo, other.id]
+      end
 
       def format(format)
-        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", hash).execute!.strip
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", id).execute!.strip
       end
 
       FIELDS.each do |field, format|
@@ -36,8 +42,21 @@ module EacGit
         changed_files.inject(0) { |a, e| a + e.dst_size }
       end
 
+      # @return [EacGit::Local::Commit, nil]
+      def parent
+        ps = parents
+        raise "#{self} has more than one parent" if ps.count > 2
+
+        ps.empty? ? nil : ps.first
+      end
+
+      # @return [Array<EacGit::Local::Commit>]
+      def parents
+        format('%P').each_line.map { |line| repo.commitize(line) }
+      end
+
       def root_child?
-        format('%P').blank?
+        parents.empty?
       end
 
       private
@@ -45,7 +64,7 @@ module EacGit
       def diff_tree_execute
         args = []
         args << '--root' if root_child?
-        args << hash
+        args << id
         repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
       end
     end

data/vendor/eac_git/lib/eac_git/local/log.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    module Log
+      def log(until_commit = nil, from_commit = nil)
+        until_commit, from_commit = [until_commit, from_commit].map { |c| commitize(c) }
+        from_commit ||= head
+        command('log', '--format=%H', "#{until_commit.id}..#{from_commit.id}")
+          .execute!.each_line.map { |line| commitize(line.strip) }
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/local.rb

@@ -7,15 +7,43 @@ module EacGit
   # A Git repository in local filesystem.
   class Local
     require_sub __FILE__, include_modules: true
+    include ::Comparable
+
+    HEAD_REFERENCE = 'HEAD'
+
+    class << self
+      def find(path)
+        path = path.to_pathname.expand_path
+        if path.join('.git').exist?
+          new(path)
+        elsif path.to_path != '/'
+          find(path.parent)
+        end
+      end
+    end
 
     common_constructor :root_path do
       self.root_path = root_path.to_pathname
     end
 
+    def <=>(other)
+      root_path <=> other.root_path
+    end
+
     def commit(ref, required = false)
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
+    def commitize(source)
+      if source.is_a?(::EacGit::Local::Commit)
+        return source if source.repo == self
+
+        source = source.id
+      end
+
+      source.to_s.strip.if_present(nil) { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?
@@ -24,6 +52,11 @@ module EacGit
       base == revparse
     end
 
+    # @return [EacGit::Local::Commit
+    def head(required = true)
+      commit(HEAD_REFERENCE, required)
+    end
+
     def merge_base(*commits)
       refs = commits.dup
       while refs.count > 1
@@ -56,6 +89,12 @@ module EacGit
       ::EacGit::Local::Subrepo.new(self, subpath)
     end
 
+    # @return [Array<EacGit::Local::Subrepo>]
+    def subrepos
+      command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip).select(&:present?)
+                                        .map { |subpath| subrepo(subpath) }
+    end
+
     def to_s
       "#{self.class}[#{root_path}]"
     end

data/vendor/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -3,6 +3,7 @@
 require 'eac_git/local'
 require 'eac_ruby_utils/envs'
 require 'fileutils'
+require 'securerandom'
 require 'tmpdir'
 
 module EacGit
@@ -29,6 +30,16 @@ module EacGit
         def file(*subpath)
           StubbedGitRepositoryFile.new(self, subpath)
         end
+
+        # @return [EacGit::Local::Commit
+        def random_commit
+          content = ::SecureRandom.hex
+          file = "#{content}.txt"
+          file(file).write(content)
+          command('add', file).execute!
+          command('commit', '-m', "Random commit: #{file}.").execute!
+          head
+        end
       end
 
       class StubbedGitRepositoryFile

data/vendor/eac_git/lib/eac_git/version.rb

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

data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec

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

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

@@ -3,10 +3,10 @@
 require 'eac_cli/config'
 require 'eac_config/envvars_node'
 require 'eac_config/yaml_file_node'
+require 'eac_fs/cache'
 require 'eac_ruby_base0/application_xdg'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/filesystem_cache'
 
 module EacRubyBase0
   class Application
@@ -43,9 +43,9 @@ module EacRubyBase0
       delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
-    def fs_cache
-      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(
-        cache_dir.join(::EacRubyUtils::FilesystemCache.name.parameterize)
+    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/core_ext.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
+require 'eac_fs/patches'
 require 'eac_ruby_base0/patches'

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

@@ -3,6 +3,7 @@
 require 'eac_cli/core_ext'
 require 'eac_cli/speaker'
 require 'eac_config/node'
+require 'eac_fs/cache'
 require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
@@ -23,13 +24,11 @@ module EacRubyBase0
     end
 
     def run
-      ::EacRubyUtils::Speaker.context.on(build_speaker) do
-        ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
-          if parsed.version?
-            show_version
-          else
-            run_with_subcommand
-          end
+      on_context do
+        if parsed.version?
+          show_version
+        else
+          run_with_subcommand
         end
       end
     end
@@ -38,6 +37,16 @@ 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
+      end
+    end
+
     def show_version
       out("#{application_version}\n")
     end

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

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

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/base.rb

@@ -2,7 +2,6 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/fs/logs'
-require 'eac_ruby_utils/fs_cache'
 require 'eac_ruby_utils/listable'
 require 'eac_ruby_utils/on_clean_ruby_environment'
 
@@ -54,10 +53,6 @@ module EacRubyGemsUtils
         logs[:stderr].write(r[:stderr])
         r[:exit_code].zero?
       end
-
-      def root_cache
-        ::EacRubyUtils.fs_cache.child(gem.root.to_s.parameterize, self.class.name.parameterize)
-      end
     end
   end
 end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/abstract_methods.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/patches/class/self_included_modules'
 require 'eac_ruby_utils/patches/module/common_concern'
 
 module EacRubyUtils
@@ -27,6 +28,12 @@ module EacRubyUtils
   module AbstractMethods
     common_concern
 
+    class << self
+      def abstract?(a_class)
+        a_class.self_included_modules.include?(::EacRubyUtils::AbstractMethods)
+      end
+    end
+
     module ClassMethods
       def abstract_methods(*methods_names)
         methods_names.each do |method_name|

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/compact.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class Compact
+    attr_reader :object, :attributes
+
+    def initialize(object, attributes)
+      @object = object
+      @attributes = attributes
+    end
+
+    # @return [Array]
+    def to_a
+      attributes.map { |attr| object.send(attr) }
+    end
+
+    # @return [Hash]
+    def to_h
+      attributes.map { |attr| [attr.to_sym, object.send(attr)] }.to_h
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/abstract.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/abstract_methods'
+
+class Class
+  def abstract?
+    ::EacRubyUtils::AbstractMethods.abstract?(self)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/self_included_modules.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Class
+  def self_included_modules
+    ancestors.take_while { |a| a != superclass }.select { |ancestor| ancestor.instance_of?(Module) }
+  end
+end

data/{lib/avm/patches/class/i18n.rb → vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/i18n_translate.rb}

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
 
-require 'avm/patches/i18n'
+require 'active_support/core_ext/string/inflections'
+require 'i18n'
 
-class Class
+class Module
   TRANSLATE_LOCALE_KEY = :__locale
 
-  def translate(entry_suffix, values = {})
+  def i18n_translate(entry_suffix, values = {})
     on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
-      ::I18n.translate(translate_entry_full(entry_suffix), values)
+      ::I18n.translate(i18n_translate_entry_full(entry_suffix), values)
     end
   end
 
-  def translate_entry_full(entry_suffix)
-    "#{translate_entry_self_prefix}.#{entry_suffix}"
+  def i18n_translate_entry_full(entry_suffix)
+    "#{i18n_translate_entry_self_prefix}.#{entry_suffix}"
   end
 
-  def translate_entry_self_prefix
+  def i18n_translate_entry_self_prefix
     name.underscore.gsub('/', '.')
   end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/call_if_proc.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/compact'
+
+class Object
+  # If +self+ is a Proc, return the value of +.call+. If not, return +self+.
+  # @return [Object]
+  def call_if_proc
+    is_a?(::Proc) ? call : self
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/compact.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/compact'
+
+class Object
+  # @return [EacRubyUtils::Compact]
+  def compact(*attributes)
+    ::EacRubyUtils::Compact.new(self, attributes)
+  end
+
+  # @return [Array]
+  def compact_to_a(*attributes)
+    compact(*attributes).to_a
+  end
+
+  # @return [Hash]
+  def compact_to_h(*attributes)
+    compact(*attributes).to_h
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/i18n_translate.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/module/i18n_translate'
+
+class Object
+  def i18n_translate(entry_suffix, values = {})
+    self.class.i18n_translate(entry_suffix, values)
+  end
+
+  def on_i18n_locale(locale)
+    self.class.on_i18n_locale(locale)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/delimited.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/string_delimited'
+
+class String
+  # @return [EacRubyUtils::StringDelimited]
+  def delimited(begin_delimiter, end_delimiter)
+    ::EacRubyUtils::StringDelimited.new(self, begin_delimiter, end_delimiter)
+  end
+
+  %w[inner outer without_inner without_outer].each do |method_suffix|
+    define_method "delimited_#{method_suffix}" do |begin_delimiter, end_delimiter|
+      delimited(begin_delimiter, end_delimiter).send(method_suffix)
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module EacRubyUtils
       extend ::EacRubyUtils::AbstractMethods
 
       def error(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def fatal_error(string)
@@ -18,39 +18,39 @@ module EacRubyUtils
 
       # @see EacRubyUtils::Speaker::Sender.input
       def input(_question, _options = {})
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def info(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def infom(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def infov(*_args)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def out(_string = '')
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def puts(_string = '')
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def success(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def title(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
 
       def warn(_string)
-        raise_abstract_method(__FILE__)
+        raise_abstract_method(__method__)
       end
     end
   end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/string_delimited.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class StringDelimited
+    attr_reader :string, :begin_delimiter, :end_delimiter
+
+    def initialize(string, begin_delimiter, end_delimiter)
+      @string = string
+      @begin_delimiter = begin_delimiter
+      @end_delimiter = end_delimiter
+    end
+
+    def inner
+      between_indexes(content_index, end_index).to_s
+    end
+
+    def outer
+      between_indexes(begin_index, after_end_index).to_s
+    end
+
+    def without_inner
+      without_join(
+        between_indexes(sos_index, content_index), between_indexes(end_index, eos_index)
+      )
+    end
+
+    def without_outer
+      without_join(
+        between_indexes(sos_index, begin_index),
+        between_indexes(after_end_index, eos_index)
+      )
+    end
+
+    private
+
+    def after_end_index
+      end_index.if_present { |v| v + end_delimiter.length }
+    end
+
+    def begin_index
+      string.index(begin_delimiter)
+    end
+
+    def between_indexes(a_begin_index, a_end_index)
+      a_begin_index && a_end_index ? string[a_begin_index, a_end_index - a_begin_index] : nil
+    end
+
+    def content_index
+      begin_index.if_present { |v| v + begin_delimiter.length }
+    end
+
+    def without_join(*strings)
+      return string if strings.any?(&:nil?)
+
+      strings.join('')
+    end
+
+    def end_index
+      content_index.if_present { |_v| string.index(end_delimiter, content_index) }
+    end
+
+    def sos_index
+      0
+    end
+
+    def eos_index
+      string.length
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/compact_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/compact'
+
+::RSpec.describe ::EacRubyUtils::Compact do
+  let(:object) { ::OpenStruct.new(a_attr: 'a_value', b_attr: 'b_value') }
+  let(:instance) { described_class.new(object, %w[a_attr b_attr]) }
+
+  describe '#to_a' do
+    it do
+      expect(instance.to_a).to eq(%w[a_value b_value])
+    end
+  end
+
+  describe '#to_h' do
+    it do
+      expect(instance.to_h).to eq(a_attr: 'a_value', b_attr: 'b_value')
+    end
+  end
+end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/abstract_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/class/abstract'
+
+RSpec.describe ::Class do
+  let(:abstract_class) do
+    described_class.new do
+      enable_abstract_methods
+    end
+  end
+
+  let(:concrect_class) do
+    described_class.new(abstract_class)
+  end
+
+  describe '#abstract' do
+    it do
+      expect(abstract_class).to be_abstract
+    end
+
+    it do
+      expect(concrect_class).not_to be_abstract
+    end
+  end
+end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/self_included_modules_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/class/self_included_modules'
+
+RSpec.describe ::Class do
+  let(:includeable_module) do
+    ::Module.new
+  end
+
+  let(:parent_class) do
+    module_to_include = includeable_module
+    described_class.new do
+      include module_to_include
+    end
+  end
+
+  let(:child_class) do
+    described_class.new(parent_class)
+  end
+
+  describe '#self_included_modules' do
+    it do
+      expect(parent_class.self_included_modules).to include(includeable_module)
+    end
+
+    it do
+      expect(child_class.self_included_modules).not_to include(includeable_module)
+    end
+  end
+end