avm-tools 0.106.0 → 0.109.1

data/vendor/{avm-apps/lib/avm/apps → avm-git/lib/avm/git}/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module Apps
-    VERSION = '0.4.1'
+  module Git
+    VERSION = '0.1.0'
   end
 end

data/vendor/{avm → avm-git}/lib/avm/git.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
+    require_sub __FILE__
+
     DEFAULT_REMOTE_NAME = 'origin'
   end
 end

data/vendor/avm-git/spec/lib/avm/git/scms/git_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git'
+
+::RSpec.describe ::Avm::Git::Scms::Git do
+  include_examples 'in_avm_registry', 'scms'
+end

data/vendor/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git_subrepo'
+
+::RSpec.describe ::Avm::Git::Scms::GitSubrepo do
+  include_examples 'in_avm_registry', 'scms'
+end

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

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

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

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

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/Gemfile

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

data/vendor/eac_fs/eac_fs.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_fs/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_fs'
+  s.version     = EacFs::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'content-type'
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+  s.add_dependency 'ruby-filemagic'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/vendor/{eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb → eac_fs/lib/eac_fs/cache.rb}

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-module EacRubyUtils
-  class FilesystemCache
+require 'eac_ruby_utils/core_ext'
+require 'fileutils'
+
+module EacFs
+  class Cache
+    enable_context
+
     CONTENT_FILE_NAME = '__content__'
 
     attr_reader :path

data/{lib/avm → vendor/eac_fs/lib/eac_fs}/cached_download.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/fs_cache'
-require 'eac_ruby_utils/core_ext'
+require 'eac_fs/patches'
+require 'eac_ruby_utils/fs/temp'
 
 module Avm
   class CachedDownload
@@ -9,7 +9,7 @@ module Avm
 
     def initialize(url, parent_fs_cache = nil)
       @url = url
-      @fs_cache = (parent_fs_cache || ::Avm.fs_cache).child(url.parameterize)
+      @fs_cache = (parent_fs_cache || fs_cache).child(url.parameterize)
     end
 
     def assert
@@ -25,7 +25,7 @@ module Avm
     end
 
     def path
-      @path ||= fs_cache.content_path.to_pathname
+      fs_cache.content_path.to_pathname
     end
 
     private

data/vendor/eac_fs/lib/eac_fs/file_info.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'content-type'
+require 'filemagic'
+
+module EacFs
+  class FileInfo
+    UNKNOWN_CONTENT_TYPE_STRING = 'application/octet-stream'
+    UNKNOWN_CONTENT_TYPE = ::ContentType.parse(UNKNOWN_CONTENT_TYPE_STRING)
+
+    enable_simple_cache
+    attr_reader :magic_string
+
+    def initialize(path)
+      @magic_string = ::FileMagic.new(FileMagic::MAGIC_MIME).file(path.to_pathname.to_path)
+    end
+
+    delegate :charset, :mime_type, :subtype, :type, to: :content_type
+
+    private
+
+    def content_type_uncached
+      ::ContentType.parse(magic_string)
+    rescue ::Parslet::ParseFailed
+      UNKNOWN_CONTENT_TYPE
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_fs/cache'
+
+class Module
+  # @return [EacFs::Cache]
+  def fs_cache
+    ::EacFs::Cache.context.current.child('fs_cache', *name.split('::'))
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/module.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+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) }
+  end
+
+  # @return [String, Array<String>]
+  def fs_cache_object_id
+    raise 'Abstract method hit'
+  end
+end

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_fs/lib/eac_fs/patches/pathname/info.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'pathname'
+
+class Pathname
+  # Shortcut for `EacFs::FileInfo.new(self)`.
+  # @return [EacFs::FileInfo]
+  def info
+    ::EacFs::FileInfo.new(self)
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/pathname.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/{avm/lib/avm/files.rb → eac_fs/lib/eac_fs/patches.rb}

@@ -2,8 +2,3 @@
 
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Files
-  end
-end

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

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

data/vendor/eac_fs/lib/eac_fs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  require_sub __FILE__
+end

data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb → eac_fs/spec/lib/eac_fs/cache_spec.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object/blank'
-require 'eac_ruby_utils/filesystem_cache'
+require 'eac_fs/cache'
 
-RSpec.describe ::EacRubyUtils::FilesystemCache do
+RSpec.describe ::EacFs::Cache do
   let(:tmpdir) { ::Dir.mktmpdir }
   let(:instance) { described_class.new(tmpdir, 'instance') }
 

data/vendor/eac_fs/spec/rubocop_spec.rb

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

data/vendor/eac_fs/spec/spec_helper.rb

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

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

@@ -9,7 +9,7 @@ module EacGit
         # @return [EacRubyUtils::Envs::Command]
         def archive_to_dir(path)
           path = path.to_pathname
-          repo.command('archive', '--format=tar', hash).pipe(
+          repo.command('archive', '--format=tar', id).pipe(
             ::EacGit::Executables.tar.command('-xC', path)
           )
         end

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