eac_tools 0.117.5 → 0.118.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837551603e125eb2823cec73df1c23b53f13d1297aa7a9f1a10b0ce4e7fe3104
-  data.tar.gz: f783b199f0d9ce4b71930fd13a32f784fc18a36398cf6c6dc6a071878da238f3
+  metadata.gz: a931dfd727d737fe97da1282facdf832d45c36974c0f47a0e4629d826ca2fd73
+  data.tar.gz: '0845d1d9488323baf666c922746f4fec9f9a7d9d283b72f5f5c3c9bc3add3d25'
 SHA512:
-  metadata.gz: a01241e67541d2a06ec40d998577c3f0d7722ef1a9d0f1af73d60b1190f48c69bed35291d281b9fae001eda1d57201c9b94aad3acfd327628c5bf85ff0f6b279
-  data.tar.gz: e8e2508b484a6df3d8d2dbba0c16db736bb4d6a0962818ff51500c2f87e42376a95bafa38e720657886e7ec983124e02b1e2c50c530a2f8947632a7bff99267d
+  metadata.gz: f75b6e2eaac406670c2d0e9afccc8e6c6cdb9201ce26cb951eee4d7a4c7aa7ec7884dea9bc237afb22aff2439058699e088f8ed8c01a9ae342c5a27f1dc6b1f1
+  data.tar.gz: 82e6852d12694fea18a9cd31bbcb0a7c0522ef00cfa5dca97bb04b3eed4026ac8b58e6ea05527c5e6838530d6755341dc37e5f431dbf66f4b001c4dc77fbff58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.117.5)
+    eac_tools (0.118.0)
       avm (~> 0.102, >= 0.102.3)
       avm-eac_asciidoctor_base0 (~> 0.27, >= 0.27.1)
       avm-eac_generic_base0 (~> 0.15, >= 0.15.3)
@@ -24,30 +24,18 @@ PATH
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
 
 PATH
-  remote: sub/eac_cli
+  remote: sub/eac_ruby_base0
   specs:
-    eac_cli (0.47.1)
-      clipboard (~> 2.0)
-      colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.15)
-      eac_ruby_utils (~> 0.131, >= 0.131.4)
-      tty-table (~> 0.12)
-
-PATH
-  remote: sub/eac_ruby_utils
-  specs:
-    eac_ruby_utils (0.131.4)
-      activesupport (>= 6.1.7.10)
-      addressable (~> 2.9)
-      bundler
-      memoized (~> 1.1, >= 1.1.3)
-      net-ssh (~> 4.2)
-      zeitwerk (~> 2.8, >= 2.8.2)
+    eac_ruby_base0 (0.20.0)
+      avm-eac_ruby_base1 (~> 0.43, >= 0.43.2)
+      eac_cli (~> 0.47, >= 0.47.1)
+      eac_fs (~> 0.20, >= 0.20.2)
+      eac_ruby_base1 (~> 0.1, >= 0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.3)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -176,22 +164,28 @@ GEM
       parslet (~> 2.0)
     diff-lcs (1.6.2)
     drb (2.2.3)
+    eac_cli (0.47.1)
+      clipboard (~> 2.0)
+      colorize (~> 0.8, >= 0.8.1)
+      eac_config (~> 0.15)
+      eac_ruby_utils (~> 0.131, >= 0.131.4)
+      tty-table (~> 0.12)
     eac_config (0.15.0)
       addressable (~> 2.8, >= 2.8.7)
       eac_ruby_utils (~> 0.127)
     eac_docker (0.8.1)
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
       eac_templates (~> 0.9)
-    eac_envs-http (0.7.1)
-      eac_fs (~> 0.20)
-      eac_ruby_utils (~> 0.129)
-      faraday (~> 2.14, >= 2.14.1)
+    eac_envs-http (0.7.2)
+      eac_fs (~> 0.20, >= 0.20.2)
+      eac_ruby_base1 (~> 0.1, >= 0.1.1)
+      faraday (~> 2.14, >= 2.14.3)
       faraday-follow_redirects (~> 0.5)
-      faraday-gzip (~> 0.1)
+      faraday-gzip (~> 3.1)
       faraday-multipart (~> 1.2)
       faraday-retry (~> 2.4)
-      random-port (~> 0.7, >= 0.7.6)
-      webrick
+      random-port (~> 0.8)
+      webrick (~> 1.9, >= 1.9.2)
     eac_fs (0.20.2)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.131)
@@ -204,11 +198,6 @@ GEM
       eac_envs-http (~> 0.7, >= 0.7.1)
       eac_fs (~> 0.20, >= 0.20.1)
       eac_ruby_utils (~> 0.130)
-    eac_ruby_base0 (0.19.3)
-      avm-eac_ruby_base1 (~> 0.39)
-      eac_cli (~> 0.45)
-      eac_fs (~> 0.20)
-      eac_ruby_utils (~> 0.129)
     eac_ruby_base1 (0.1.1)
       eac_ruby_utils (~> 0.131, >= 0.131.2)
     eac_ruby_gem_support (0.14.0)
@@ -218,6 +207,13 @@ GEM
       rubocop-rails (~> 2.36)
       rubocop-rspec (~> 3.10, >= 3.10.2)
       super_diff (~> 0.19)
+    eac_ruby_utils (0.131.4)
+      activesupport (>= 6.1.7.10)
+      addressable (~> 2.9)
+      bundler
+      memoized (~> 1.1, >= 1.1.3)
+      net-ssh (~> 4.2)
+      zeitwerk (~> 2.8, >= 2.8.2)
     eac_templates (0.9.0)
       eac_config (~> 0.15)
       eac_ruby_base1 (~> 0.1, >= 0.1.1)
@@ -227,9 +223,9 @@ GEM
       logger
     faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-gzip (0.1.0)
-      faraday (>= 1.0)
-      zlib (~> 2.1)
+    faraday-gzip (3.1.0)
+      faraday (>= 2.0, < 3)
+      zlib (~> 3.0)
     faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
     faraday-net_http (3.4.4)
@@ -243,7 +239,7 @@ GEM
     htmlbeautifier (1.4.3)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    json (2.21.1)
+    json (2.21.2)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -343,15 +339,14 @@ GEM
     uri (1.1.1)
     webrick (1.9.2)
     zeitwerk (2.8.2)
-    zlib (2.1.1)
+    zlib (3.2.3)
 
 PLATFORMS
   x86_64-linux-gnu
 
 DEPENDENCIES
-  eac_cli!
+  eac_ruby_base0!
   eac_ruby_gem_support (~> 0.14)
-  eac_ruby_utils!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.117.5'
+  VERSION = '0.118.0'
 end

data/sub/eac_ruby_base0/.gitrepo

@@ -0,0 +1,7 @@
+[subrepo]
+  cmdver = 0.4.9
+  commit = c9370fc5826cc0e3225fbcc368d2fba477ba5160
+  method = merge
+  parent = bf9ec1365039cca6c94a5be9c8f4d1e197304f9e
+  branch = master
+  remote = https://github.com/esquilo-azul/eac_ruby_base0.git

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_ruby_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_ruby_base0'
+  s.version     = EacRubyBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+  s.required_ruby_version = '>= 3.2'
+
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.43', '>= 0.43.2'
+  s.add_dependency 'eac_cli', '~> 0.47', '>= 0.47.1'
+  s.add_dependency 'eac_fs', '~> 0.20', '>= 0.20.2'
+  s.add_dependency 'eac_ruby_base1', '~> 0.1', '>= 0.1.1'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.14'
+end

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  class Application
+    enable_simple_cache
+    enable_listable
+    lists.add_symbol :option, :name, :home_dir
+
+    common_constructor :gemspec_dir, :options, default: [{}] do
+      self.gemspec_dir = gemspec_dir.to_pathname
+      self.options = options.symbolize_keys.assert_valid_keys(self.class.lists.option.values).freeze
+    end
+
+    delegate :version, to: :self_gem
+
+    def all_gems
+      sub_gems + [self_gem]
+    end
+
+    # @return [EacCli::Config]
+    def build_config(path = nil)
+      envvar_node = ::EacConfig::EnvvarsNode.new
+      file_node = ::EacConfig::YamlFileNode.new(path || config_default_path)
+      envvar_node.load_path.push(file_node.url)
+      envvar_node.write_node = file_node
+      ::EacCli::Config.new(envvar_node)
+    end
+
+    # @return [EacCli::Config]
+    def config_default_path
+      config_dir.join('eac_config.yaml')
+    end
+
+    ::EacRubyBase0::ApplicationXdg::DIRECTORIES.each_key do |item|
+      delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
+    end
+
+    ::EacFs::Contexts::TYPES.each do |type|
+      class_eval <<CODE, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
+  # @return [EacFs::StorageTree]
+  def self_fs_#{type}
+    @self_fs_#{type} ||= ::EacFs::StorageTree.new(#{type}_dir.join('eac_fs'))
+  end
+CODE
+    end
+
+    def home_dir
+      app_xdg.user_home_dir
+    end
+
+    def name
+      options[OPTION_NAME] || self_gem.gem_name
+    end
+
+    def vendor_dir
+      gemspec_dir.join('sub')
+    end
+
+    private
+
+    def app_xdg_uncached
+      ::EacRubyBase0::ApplicationXdg.new(name, options[OPTION_HOME_DIR])
+    end
+
+    # @return [Avm::EacRubyBase1::Sources::Base]
+    def self_gem_uncached
+      ::Avm::EacRubyBase1::Sources::Base.new(gemspec_dir)
+    end
+
+    def sub_gems_uncached
+      r = []
+      vendor_dir.children.each do |c|
+        vgem = ::Avm::EacRubyBase1::Sources::Base.new(c)
+        r << vgem if vgem.gemfile_path.exist?
+      end
+      r
+    end
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  class ApplicationXdg
+    class << self
+      # @return [Pathname]
+      def user_home_dir_from_env
+        Dir.home.to_pathname
+      end
+    end
+
+    DIRECTORIES = { cache: '.cache', config: '.config', data: '.local/share',
+                    state: '.local/state' }.freeze
+
+    common_constructor :app_name, :user_home_dir, default: [nil] do
+      self.user_home_dir ||= self.class.user_home_dir_from_env
+    end
+
+    DIRECTORIES.each do |item, subpath|
+      xdg_env_method_name = "#{item}_xdg_env"
+
+      define_method xdg_env_method_name do
+        ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
+      end
+
+      define_method "#{item}_dir" do
+        (send(xdg_env_method_name) || user_home_dir.join(subpath)).join(app_name)
+      end
+    end
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/error_presenter.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  class ErrorPresenter
+    enable_speaker
+    common_constructor :the_error
+
+    # @return [String]
+    def full_backtrace_message
+      the_error.backtrace.map { |v| "#{v}\n" }.join
+    end
+
+    # @return [String]
+    def full_message
+      self_full_message + the_error.cause.if_present('') do |e|
+        "#{'-' * 16}\n#{self.class.new(e).full_message}"
+      end
+    end
+
+    # @return [String]
+    def message
+      "#{the_error.message} (#{the_error.class})"
+    end
+
+    # @return [Pathname]
+    def log_path
+      @log_path ||= ::EacRubyUtils::Fs::Temp.file.to_pathname.tap { |e| e.write(full_message) }
+    end
+
+    # @return [String]
+    def self_full_message
+      "Error class: #{the_error.class}\n" \
+      "Message: #{the_error.message}\n" \
+      "Backtrace:\n" + the_error.backtrace.map { |v| "#{v}\n" }.join
+    end
+
+    # @return [void]
+    def show
+      show_message
+      show_log_file
+    end
+
+    # @return [void]
+    def show_message
+      error message
+    end
+
+    # @return [void]
+    def show_log_file
+      infov 'Full log', log_path
+    end
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  module JobsRunner
+    common_concern do
+      enable_speaker
+      include ::EacRubyUtils::SettingsProvider
+    end
+
+    def run_job(job)
+      return unless run_job?(job)
+
+      infom "Running job \"#{job}\"..."
+      send(job)
+    end
+
+    def run_job?(job)
+      the_method = "run_#{job}?"
+      respond_to?(the_method, true) ? send(the_method) : true
+    end
+
+    def run_jobs(*jobs)
+      jobs = setting_value(:jobs) if jobs.empty?
+      jobs.each { |job| run_job(job) }
+      success 'Done'
+    end
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/patches/class/jobs_runner.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Class
+  def enable_jobs_runner
+    ::EacRubyUtils.patch_module(self, ::EacRubyBase0::JobsRunner)
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/rspec/setup.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  module Rspec
+    module Setup
+      def self.extended(obj)
+        obj.disable_input_request
+        obj.stub_eac_config_node
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  module Runner
+    module Contexts
+      def on_context(&block)
+        top_block = block
+        available_contexts.each do |context|
+          next if context.object.any?
+
+          last_block = top_block
+          top_block = proc { context.object.on(context.builder.call, &last_block) }
+        end
+        top_block.call
+      end
+
+      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] = ::EacCli::Speaker::InputBlocked.new if parsed.no_input?
+        ::EacCli::Speaker.new(options)
+      end
+
+      def filesystem_available_contexts
+        ::EacFs::Contexts::TYPES.map do |type|
+          key = :"fs_#{type}"
+          [key, ::EacFs::Contexts.send(type), -> { application.send("self_#{key}") }]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  module Runner
+    module Prepend
+      ERROR_EXIT_CODE = 113
+
+      def run
+        on_rescue_errors do
+          if parsed.version?
+            show_version
+          else
+            run_with_subcommand
+          end
+        end
+      end
+
+      def run_run
+        on_context { super }
+      end
+
+      protected
+
+      # @return [void]
+      def on_rescue_errors
+        yield
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        ::EacRubyBase0::ErrorPresenter.new(e).show
+        exit ERROR_EXIT_CODE
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  module Runner
+    enable_speaker
+    common_concern do
+      include ::EacCli::RunnerWith::Help
+      include ::EacCli::RunnerWith::Subcommands
+      include ::EacRubyBase0::Runner::Contexts
+      prepend ::EacRubyBase0::Runner::Prepend
+
+      runner_definition do
+        bool_opt '-q', '--quiet', 'Quiet mode.'
+        bool_opt '-I', '--no-input', 'Fail if a input is requested.'
+        subcommands
+        alt do
+          bool_opt '-V', '--version', 'Show version.', usage: true, required: true
+        end
+      end
+    end
+
+    def application_version
+      runner_context.call(:application).version.to_s
+    end
+
+    def show_version
+      out("#{application_version}\n")
+    end
+  end
+end

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

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

data/sub/{eac_cli/lib/eac_cli.rb → eac_ruby_base0/lib/eac_ruby_base0.rb}

@@ -2,6 +2,8 @@
 
 require 'eac_ruby_base1'
 EacRubyBase1::RootModuleSetup.perform __FILE__ do
+  require 'avm/eac_ruby_base1'
+  require 'eac_cli'
   require 'eac_config'
-  require 'colorize'
+  require 'eac_fs'
 end

data/sub/{eac_cli → eac_ruby_base0}/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli'
+require 'eac_ruby_base0'
 require 'eac_ruby_gem_support'
 EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))