avm-tools 0.113.6 → 0.114.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0c1b42a6d34ae3d070dbbae54375ddd08eab2a177c5c46cc9d42de8165d10a
-  data.tar.gz: ff02a56141cb130c4b0e9c7fc651ebe3de42ba13ec6c56557fbae70f96ff693c
+  metadata.gz: 7e2a7df849fd040b8e6fddad4e1c8507139926f0b587ceab796c1416fb9af873
+  data.tar.gz: 70eb055f94b37d37e05510563a654350137d0358283ad7d33a4d895110f1f2cc
 SHA512:
-  metadata.gz: c12fcce202f2eb1b40b58485dbf790e29b7f6bb183d450ce3c9f8a479abf9ae35a77865990c481ad1f2a28b18110bcc4e3db82ecc880c355f040eb8646433143
-  data.tar.gz: d85bb09c92c7d6b1f0414f66509da068ff018d8ec1da32b730f00fe99cc723895d4e09d205f5964cd562a61647c849017f2fe3def50f3fdfec45c770a9d2d8a6
+  metadata.gz: 90be4e12df6cda16ffc88680a42a6d3dd118e96f97840cfb4a49b4418b76df1826485065ca069e3105d942136ed9273f03e9e15b340c4913abfeacae01ce1eba
+  data.tar.gz: 262a63d17a298911bef85e025b678779e8d7795e2376349128999fc50442275a0303bde419921e2799a3f8a9923366d3996c655ea032d909ca555f6b7d6892a5

data/lib/avm/launcher/context.rb

@@ -8,6 +8,7 @@ require 'avm/launcher/context/instance_discovery'
 require 'avm/launcher/context/settings'
 require 'avm/launcher/paths/logical'
 require 'avm/launcher/project'
+require 'avm/tools/self'
 
 module Avm
   module Launcher
@@ -15,10 +16,6 @@ module Avm
       include ::EacRubyUtils::SimpleCache
       enable_speaker
 
-      DEFAULT_PROJECTS_ROOT = '.'
-      DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
-      DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
-
       class << self
         attr_writer :current
 
@@ -34,6 +31,8 @@ module Avm
       attr_reader :root, :settings, :cache_root
       attr_accessor :publish_options, :recache, :instance_manager
 
+      CONFIG_PATH_PREFIX = 'launcher'
+
       def initialize(options = {})
         @options = options.with_indifferent_access
         @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
@@ -59,15 +58,27 @@ module Avm
       private
 
       def build_option(key)
-        @options[key] || env_option(key) || default_option(key)
+        @options[key] || config_option(key) || default_option(key)
+      end
+
+      def config_option(key)
+        ::Avm::Self::Instance.default.entry([CONFIG_PATH_PREFIX, key].join('.')).optional_value
       end
 
-      def env_option(key)
-        ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
+      def default_cache_root
+        ::Avm::Tools::Self.application.cache_dir.join('launcher')
       end
 
       def default_option(key)
-        self.class.const_get("DEFAULT_#{key}".underscore.upcase)
+        send("default_#{key}".underscore)
+      end
+
+      def default_projects_root
+        '.'
+      end
+
+      def default_settings_file
+        ::Avm::Tools::Self.application.config_dir.join('launcher.yaml')
       end
 
       def projects_uncached

data/lib/avm/launcher/git/publish_base.rb

@@ -86,6 +86,8 @@ module Avm
         end
 
         def local_following_check_result
+          return nil unless local_following?
+
           ::Avm::Launcher::Publish::CheckResult.pending('Local following')
         end
 

data/lib/avm/tools/runner/app_src/ruby/bundler/incompatible.rb

@@ -17,7 +17,7 @@ module Avm
 
               def run
                 infov 'Cache path', fs_cache.content_path
-                infov 'Cached?', fs_cache.cached?
+                infov 'Cached?', fs_cache.stored?
                 parser.gems_in_conflict.each do |gem_in_conflict|
                   print_gem_in_conflict(gem_in_conflict)
                 end
@@ -31,7 +31,7 @@ module Avm
               end
 
               def content_path
-                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.write(bundle_update) unless fs_cache.stored? && parsed.last?
                 fs_cache.content_path
               end
 

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.113.6'
+    VERSION = '0.114.2'
   end
 end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'
+  s.add_dependency 'eac_rest', '~> 0.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/data_unit.rb

@@ -10,11 +10,13 @@ module Avm
     class DataUnit < ::Avm::Data::Instance::Unit
       common_constructor :instance
 
+      EXPORT_PATH = '/backup/export'
       EXTENSION = '.tar'
+      IMPORT_PATH = '/backup/import.json'
 
       def do_dump(data_path)
         ::File.open(data_path, 'wb') do |file|
-          file << URI.parse(export_url).read
+          file << export_request.response.body_data_or_raise
         end
       end
 
@@ -37,18 +39,12 @@ module Avm
         true
       end
 
-      def export_url
-        url('/backup/export')
+      def export_request
+        instance.rest_api.request(EXPORT_PATH)
       end
 
       def import_url
-        url('/backup/import.json')
-      end
-
-      def url(path)
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
-        uri.query_values = { key: instance.read_entry('admin.api_key') }
-        uri.to_s
+        instance.rest_api.build_service_url(IMPORT_PATH).to_s
       end
     end
   end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
+require 'addressable/uri'
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_redmine_base0/instances/docker_image'
+require 'avm/eac_redmine_base0/rest_api'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacRailsBase1::Instance
+      enable_simple_cache
+
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
@@ -32,6 +36,22 @@ module Avm
           }
         )
       end
+
+      # @return [Addressable::URI]
+      def root_url
+        r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
+        r.query_values = nil
+        r
+      end
+
+      private
+
+      # @return [Avm::EacRedmineBase0::RestApi]
+      def rest_api_uncached
+        url = root_url
+        url.query_values = { key: read_entry('api.key') }
+        ::Avm::EacRedmineBase0::RestApi.new(url)
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_rest/api'
+
+module Avm
+  module EacRedmineBase0
+    class RestApi < ::EacRest::Api
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-files/lib/avm/files/formatter/formats/generic_plain.rb

@@ -7,8 +7,8 @@ module Avm
     class Formatter
       module Formats
         class GenericPlain < ::Avm::Files::Formatter::Formats::Base
-          VALID_BASENAMES = %w[*.bat *.css.coffee *.java *.js *.rb *.scss *.sql *.tex *.url *.yml
-                               *.yaml].freeze
+          VALID_BASENAMES = %w[*.asm *.bat *.css.coffee *.java *.js *.rb *.s *.scss *.sql *.tex
+                               *.url *.yml *.yaml].freeze
 
           VALID_TYPES = %w[plain x-shellscript].freeze
 

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/sub/avm-git/lib/avm/git/revision_test.rb

@@ -77,7 +77,7 @@ module Avm
       end
 
       def successful_uncached
-        if options.fetch(:no_cache) || !successful_cache.cached?
+        if options.fetch(:no_cache) || !successful_cache.stored?
           checkout_revision
           run_test
         end

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

data/sub/eac_cli/lib/eac_cli/config/entry.rb

@@ -25,7 +25,7 @@ module EacCli
       end
 
       def secret_value
-        self.class.new(config, path, options.merge(noecho: true)).value
+        self.class.new(config, path, options.to_h.merge(noecho: true).to_h).value
       end
 
       delegate :found?, :value=, to: :sub_entry

data/sub/eac_cli/lib/eac_cli/speaker.rb

@@ -23,9 +23,8 @@ module EacCli
       out_out.write(string.to_s)
     end
 
-    def fatal_error(string)
+    def error(string)
       puts "ERROR: #{string}".white.on_red
-      Kernel.exit 1
     end
 
     def title(string)

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.26.0'
+  VERSION = '0.26.2'
 end

data/sub/eac_fs/lib/eac_fs/cached_download.rb

@@ -3,17 +3,17 @@
 require 'eac_fs/patches'
 require 'eac_ruby_utils/fs/temp'
 
-module Avm
+module EacFs
   class CachedDownload
     attr_reader :url, :fs_cache
 
     def initialize(url, parent_fs_cache = nil)
       @url = url
-      @fs_cache = (parent_fs_cache || fs_cache).child(url.parameterize)
+      @fs_cache = (parent_fs_cache || fs_cache).child(url.to_s.parameterize)
     end
 
     def assert
-      download unless fs_cache.cached?
+      download unless fs_cache.stored?
     end
 
     def download

data/sub/eac_fs/lib/eac_fs/contexts.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/context'
+
+module EacFs
+  class Contexts
+    TYPES = %i[cache config data].freeze
+
+    class << self
+      TYPES.each do |type|
+        class_eval <<~CODE, __FILE__, __LINE__ + 1
+          # @return [EacRubyUtils::Context<EacFs::StorageTree>]
+          def #{type}
+            @#{type} ||= ::EacRubyUtils::Context.new
+          end
+        CODE
+      end
+    end
+  end
+end

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/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/version.rb

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

data/sub/eac_rest/Gemfile

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

data/sub/eac_rest/eac_rest.gemspec

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_rest/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_rest'
+  s.version     = EacRest::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'A REST helper for Ruby.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/sub/eac_rest/lib/eac_rest/api.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_rest/request'
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  # Abstract methods
+  #   * self.issue_get_url_suffix(provider_issue_id)
+  class Api
+    require_sub __FILE__, include_modules: true
+    common_constructor :root_url, :username, :password, default: [nil, nil]
+
+    def request(service_url_suffix, headers = {}, &body_data_proc)
+      r = ::EacRest::Request.new(build_service_url(service_url_suffix),
+                                 body_data_proc)
+      headers.each { |name, value| r = r.header(name, value) }
+      r = r.autenticate(username, password) if username.present?
+      r
+    end
+
+    def request_json(service_url_suffix, headers = {}, &body_data_proc)
+      request(service_url_suffix, headers.merge('Accept' => 'application/json')) do |body_data|
+        r = ::JSON.parse(body_data)
+        r = body_data_proc.call(r) if body_data_proc
+        r
+      end
+    end
+
+    # @return [Addressable::URI]
+    def build_service_url(suffix)
+      s = ::Addressable::URI.parse(suffix)
+      r = ::Addressable::URI.parse(root_url)
+      r.path += s.path
+      r.query_values = r.query_values(::Array).if_present([]) +
+                       s.query_values(::Array).if_present([])
+      r
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/entity.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRest
+  class Entity
+    enable_simple_cache
+    common_constructor :api, :data
+
+    class << self
+      def from_array_data(api, array_data, *args)
+        array_data.map { |item_data| new(api, item_data, *args) }
+      end
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/request.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'curb'
+require 'eac_rest/response'
+require 'eac_ruby_utils/core_ext'
+require 'ostruct'
+
+module EacRest
+  class Request
+    COMMON_MODIFIERS = %w[auth body_data verb].freeze
+    HASH_MODIFIERS = %w[header].freeze
+    MODIFIERS = COMMON_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
+
+    enable_immutable
+    immutable_accessor(*COMMON_MODIFIERS, type: :common)
+    immutable_accessor(*HASH_MODIFIERS, type: :hash)
+
+    enable_listable
+    lists.add_symbol :verb, :get, :delete, :options, :post, :put
+
+    common_constructor :url, :body_data_proc, default: [nil]
+
+    def autenticate(username, password)
+      auth(::OpenStruct.new(username: username, password: password))
+    end
+
+    def immutable_constructor_args
+      [url, body_data_proc]
+    end
+
+    def response
+      ::EacRest::Response.new(build_curl, body_data_proc)
+    end
+
+    private
+
+    def build_curl
+      r = ::Curl::Easy.new(url)
+      MODIFIERS.each { |suffix| send("build_curl_#{suffix}", r) }
+      r
+    end
+
+    def build_curl_auth(curl)
+      auth.if_present do |a|
+        curl.http_auth_types = :basic
+        curl.username = a.username
+        curl.password = a.password
+      end
+    end
+
+    def build_curl_body_data(curl)
+      www_form_body_data_encoded.if_present { |v| curl.post_body = v }
+    end
+
+    def build_curl_headers(curl)
+      curl.headers.merge!(headers)
+    end
+
+    def build_curl_verb(curl)
+      curl.set(
+        :customrequest,
+        verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }.to_s.upcase
+      )
+    end
+
+    def www_form_body_data_encoded
+      body_data.if_present do |v|
+        v = v.map { |k, vv| [k, vv] } if v.is_a?(::Hash)
+        v = URI.encode_www_form(v) if v.is_a?(::Array)
+        v.to_s
+      end
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/response.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/conversions'
+require 'eac_ruby_utils/core_ext'
+require 'json'
+
+module EacRest
+  class Response < ::StandardError
+    common_constructor :curl, :body_data_proc
+
+    def body_data
+      r = performed_curl.headers['Accept'].if_present(body_str) do |v|
+        method_name = "body_data_from_#{v.parameterize.underscore}"
+        respond_to?(method_name) ? send(method_name) : body_str
+      end
+      r = body_data_proc.call(r) if body_data_proc.present?
+      r
+    end
+
+    def body_data_or_raise
+      raise_unless_200
+
+      body_data
+    end
+
+    delegate :body_str, :headers, to: :performed_curl
+
+    def body_str_or_raise
+      raise_unless_200
+
+      body_str
+    end
+
+    def raise_unless_200
+      return nil if status == 200
+
+      raise self
+    end
+
+    def status
+      performed_curl.status.to_i
+    end
+
+    delegate :url, to: :curl
+
+    def to_s
+      "URL: #{url}\nStatus: #{status}\nBody:\n\n#{body_str}"
+    end
+
+    private
+
+    def body_data_from_application_json
+      ::JSON.parse(body_str)
+    end
+
+    def body_data_from_application_xml
+      Hash.from_xml(body_str)
+    end
+
+    def perform
+      @perform ||= begin
+        curl.perform || raise("CURL perform failed for #{url}")
+        true
+      end
+    end
+
+    def performed_curl
+      perform
+      curl
+    end
+  end
+end

data/sub/eac_rest/lib/eac_rest/version.rb

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

data/sub/eac_rest/lib/eac_rest.rb

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

data/sub/eac_rest/spec/rubocop_spec.rb

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

data/sub/eac_rest/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/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.26'
-  s.add_dependency 'eac_fs', '~> 0.3'
+  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,7 +3,7 @@
 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
@@ -65,11 +65,10 @@ module EacRubyBase0
 
     # @return [Array<EacRubyUtils::Struct>]
     def available_contexts
-      [
-        [:cache, ::EacFs::Cache.context, -> { application.self_fs_cache }],
+      (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) }
+      ]).map { |row| available_context_row_to_struct(row) }
     end
 
     def available_context_row_to_struct(row)
@@ -82,5 +81,12 @@ module EacRubyBase0
       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.15.0'
+  VERSION = '0.16.1'
 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/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.83.0'
+  VERSION = '0.87.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.113.6
+  version: 0.114.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -292,8 +292,6 @@ files:
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
 - lib/avm/launcher/context/instance_manager/cached_instances.rb
 - lib/avm/launcher/context/settings.rb
-- lib/avm/launcher/errors/base.rb
-- lib/avm/launcher/errors/non_project.rb
 - lib/avm/launcher/git.rb
 - lib/avm/launcher/git/base.rb
 - lib/avm/launcher/git/base/class_methods.rb
@@ -315,11 +313,9 @@ files:
 - lib/avm/launcher/instances/settings.rb
 - lib/avm/launcher/paths.rb
 - lib/avm/launcher/paths/logical.rb
-- lib/avm/launcher/paths/real.rb
 - lib/avm/launcher/project.rb
 - lib/avm/launcher/publish.rb
 - lib/avm/launcher/publish/base.rb
-- lib/avm/launcher/publish/check_result.rb
 - lib/avm/launcher/ruby.rb
 - lib/avm/launcher/ruby/gem.rb
 - lib/avm/launcher/ruby/gem/build.rb
@@ -514,6 +510,7 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/deploy.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instance.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/rest_api.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb
 - sub/avm-eac_redmine_base0/spec/rubocop_spec.rb
 - sub/avm-eac_redmine_base0/spec/spec_helper.rb
@@ -721,6 +718,10 @@ files:
 - sub/avm/lib/avm/jobs.rb
 - sub/avm/lib/avm/jobs/base.rb
 - sub/avm/lib/avm/jobs/variables_source.rb
+- sub/avm/lib/avm/launcher/errors/base.rb
+- sub/avm/lib/avm/launcher/errors/non_project.rb
+- sub/avm/lib/avm/launcher/paths/real.rb
+- sub/avm/lib/avm/launcher/publish/check_result.rb
 - sub/avm/lib/avm/path_string.rb
 - sub/avm/lib/avm/registry.rb
 - sub/avm/lib/avm/registry/base.rb
@@ -883,8 +884,8 @@ files:
 - sub/eac_fs/Gemfile
 - sub/eac_fs/eac_fs.gemspec
 - sub/eac_fs/lib/eac_fs.rb
-- sub/eac_fs/lib/eac_fs/cache.rb
 - sub/eac_fs/lib/eac_fs/cached_download.rb
+- sub/eac_fs/lib/eac_fs/contexts.rb
 - sub/eac_fs/lib/eac_fs/file_info.rb
 - sub/eac_fs/lib/eac_fs/logs.rb
 - sub/eac_fs/lib/eac_fs/logs/file.rb
@@ -895,10 +896,11 @@ files:
 - sub/eac_fs/lib/eac_fs/patches/object/fs_cache.rb
 - sub/eac_fs/lib/eac_fs/patches/pathname.rb
 - sub/eac_fs/lib/eac_fs/patches/pathname/info.rb
+- sub/eac_fs/lib/eac_fs/storage_tree.rb
 - sub/eac_fs/lib/eac_fs/traversable.rb
 - sub/eac_fs/lib/eac_fs/traverser.rb
 - sub/eac_fs/lib/eac_fs/version.rb
-- sub/eac_fs/spec/lib/eac_fs/cache_spec.rb
+- sub/eac_fs/spec/lib/eac_fs/storage_tree_spec.rb
 - sub/eac_fs/spec/rubocop_spec.rb
 - sub/eac_fs/spec/spec_helper.rb
 - sub/eac_git/Gemfile
@@ -914,6 +916,7 @@ files:
 - sub/eac_git/lib/eac_git/local/dirty_files.rb
 - sub/eac_git/lib/eac_git/local/log.rb
 - sub/eac_git/lib/eac_git/local/remote.rb
+- sub/eac_git/lib/eac_git/local/remotes.rb
 - sub/eac_git/lib/eac_git/local/subrepo.rb
 - sub/eac_git/lib/eac_git/local/subrepo/config.rb
 - sub/eac_git/lib/eac_git/remote.rb
@@ -1122,6 +1125,16 @@ files:
 - sub/eac_git/vendor/git-subrepo/test/setup
 - sub/eac_git/vendor/git-subrepo/test/status.t
 - sub/eac_git/vendor/git-subrepo/test/submodule.t
+- sub/eac_rest/Gemfile
+- sub/eac_rest/eac_rest.gemspec
+- sub/eac_rest/lib/eac_rest.rb
+- sub/eac_rest/lib/eac_rest/api.rb
+- sub/eac_rest/lib/eac_rest/entity.rb
+- sub/eac_rest/lib/eac_rest/request.rb
+- sub/eac_rest/lib/eac_rest/response.rb
+- sub/eac_rest/lib/eac_rest/version.rb
+- sub/eac_rest/spec/rubocop_spec.rb
+- sub/eac_rest/spec/spec_helper.rb
 - sub/eac_ruby_base0/Gemfile
 - sub/eac_ruby_base0/eac_ruby_base0.gemspec
 - sub/eac_ruby_base0/lib/eac_ruby_base0.rb
@@ -1283,10 +1296,13 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_respond.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_uri.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/if_exist.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/mkpath_s.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/parent_n.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/readlink_r.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb
@@ -1303,6 +1319,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup/conditionals.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/setup_manager.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/rspec/stub_speaker.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb