avm-tools 0.106.0 → 0.107.0

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Apps
-    VERSION = '0.4.1'
+    VERSION = '0.5.0'
   end
 end

data/vendor/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'avm-eac_rails_base1', '~> 0.1'
+  s.add_dependency 'curb', '~> 0.9.10'
+  s.add_dependency 'eac_fs', '~> 0.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/vendor/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/core_update.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/core_update'
-require 'avm/cached_download'
 require 'avm/sync'
+require 'eac_fs/cached_download'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -79,8 +79,9 @@ module Avm
                    .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
       end
 
+      # @return [EacFs::CachedDownload]
       def source_package_uncached
-        ::Avm::CachedDownload.new(url, ::Avm.fs_cache.child('eac_redmine_base0', 'core_update'))
+        ::EacFs::CachedDownload.new(url, fs_cache)
       end
 
       def validate_empty_dir

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.2'
   end
 end

data/vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_host.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/apps/jobs/base'
+require 'avm/jobs/base'
 require 'avm/patches/object/template'
 require 'avm/eac_ubuntu_base0/apache'
 require 'avm/patches/object/template'
@@ -11,7 +11,7 @@ module Avm
     class ApacheHost
       JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
                 run_certbot enable_ssl_site reload_apache].freeze
-      include ::Avm::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       def no_ssl_site_content
         ::Avm::EacWebappBase0::ApacheHost

data/vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_path.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/jobs/base'
+require 'avm/jobs/base'
 require 'avm/eac_ubuntu_base0/apache'
 require 'eac_ruby_utils/core_ext'
 
@@ -8,7 +8,7 @@ module Avm
   module EacWebappBase0
     class ApachePath
       JOBS = %w[write_available_conf enable_conf reload_apache].freeze
-      include ::Avm::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       def content
         ::Avm::EacWebappBase0::ApachePath.template.child('default.conf').apply(variables_source)

data/vendor/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/callbacks'
-require 'avm/apps/jobs/base'
+require 'avm/jobs/base'
 require 'avm/git'
 require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
@@ -19,7 +19,7 @@ module Avm
       JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
                  setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
 
-      include ::Avm::Apps::Jobs::Base
+      include ::Avm::Jobs::Base
 
       lists.add_symbol :option, :appended_directories, :no_request_test, :reference
 

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,10 @@
+# frozen_string_literal: true
+
+require 'eac_fs/patches/module/fs_cache'
+
+class Object
+  # @return [EacFs::Cache]
+  def fs_cache
+    self.class.fs_cache
+  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/eac_fs/lib/eac_fs/patches.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/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module EacFs
+  VERSION = '0.4.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

@@ -16,10 +16,10 @@ module EacGit
         commiter_all: '%cn <%ce>, %ci'
       }.freeze
 
-      common_constructor :repo, :hash
+      common_constructor :repo, :id
 
       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|
@@ -45,7 +45,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.rb

@@ -8,6 +8,8 @@ module EacGit
   class Local
     require_sub __FILE__, include_modules: true
 
+    HEAD_REFERENCE = 'HEAD'
+
     common_constructor :root_path do
       self.root_path = root_path.to_pathname
     end
@@ -24,6 +26,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 +63,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.7.3'
+  VERSION = '0.8.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
@@ -44,8 +44,8 @@ module EacRubyBase0
     end
 
     def fs_cache
-      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(
-        cache_dir.join(::EacRubyUtils::FilesystemCache.name.parameterize)
+      @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.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.11.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/version.rb

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

data/vendor/eac_templates/lib/eac_templates/patches/module/erb_template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'erb'
+
+class Module
+  def erb_template(subpath, binding_obj)
+    ::ERB.new(template.child(subpath).path.read).result(binding_obj)
+  end
+end

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

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

data/vendor/eac_templates/lib/eac_templates/patches/object/erb_template.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_templates/patches/module/erb_template'
+
+class Object
+  def erb_template(subpath, binding_obj = nil)
+    self.class.erb_template(subpath, binding_obj || binding)
+  end
+end

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

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

data/vendor/eac_templates/lib/eac_templates/patches.rb

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

data/vendor/eac_templates/lib/eac_templates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTemplates
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end