avm-tools 0.116.0 → 0.117.0

data/sub/eac_rest/eac_rest.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.70'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -8,11 +8,14 @@ module EacRest
   #   * 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]
+    attr_accessor :ssl_verify
+    common_constructor :root_url, :username, :password, default: [nil, nil] do
+      self.ssl_verify = true
+    end
 
     def request(service_url_suffix, headers = {}, &body_data_proc)
       r = ::EacRest::Request.new(build_service_url(service_url_suffix),
-                                 body_data_proc)
+                                 body_data_proc).ssl_verify(ssl_verify)
       headers.each { |name, value| r = r.header(name, value) }
       r = r.autenticate(username, password) if username.present?
       r
@@ -28,12 +31,20 @@ module EacRest
 
     # @return [Addressable::URI]
     def build_service_url(suffix)
-      s = ::Addressable::URI.parse(suffix)
+      r = ::Addressable::URI.parse(suffix)
+      return r if r.scheme.present?
+
+      s = build_service_url_suffix(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
+
+    # @return [Addressable::URI]
+    def build_service_url_suffix(suffix)
+      ::Addressable::URI.parse(suffix)
+    end
   end
 end

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

@@ -7,11 +7,13 @@ require 'ostruct'
 
 module EacRest
   class Request
+    BOOLEAN_MODIFIERS = %w[ssl_verify ssl_verify_peer ssl_verify_host].freeze
     COMMON_MODIFIERS = %w[auth body_data verb].freeze
     HASH_MODIFIERS = %w[header].freeze
-    MODIFIERS = COMMON_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
+    MODIFIERS = COMMON_MODIFIERS + BOOLEAN_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
 
     enable_immutable
+    immutable_accessor(*BOOLEAN_MODIFIERS, type: :boolean)
     immutable_accessor(*COMMON_MODIFIERS, type: :common)
     immutable_accessor(*HASH_MODIFIERS, type: :hash)
 
@@ -56,6 +58,25 @@ module EacRest
       curl.headers.merge!(headers)
     end
 
+    def build_curl_ssl_verify(curl)
+      return if ssl_verify?.nil?
+
+      curl.ssl_verify_host = ssl_verify?
+      curl.ssl_verify_peer = ssl_verify?
+    end
+
+    def build_curl_ssl_verify_peer(curl)
+      return if ssl_verify_peer?.nil?
+
+      curl.ssl_verify_peer = ssl_verify_peer?
+    end
+
+    def build_curl_ssl_verify_host(curl)
+      return if ssl_verify_host?.nil?
+
+      curl.ssl_verify_peer = ssl_verify_host?
+    end
+
     def build_curl_verb(curl)
       curl.set(
         :customrequest,

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

@@ -6,6 +6,18 @@ require 'json'
 
 module EacRest
   class Response < ::StandardError
+    HEADER_LINE_PARSER = /\A([^:]+):(.*)\z/.to_parser do |m|
+      [m[1].strip, m[2].strip]
+    end
+
+    # https://www.w3.org/wiki/LinkHeader
+    LINKS_HEADER_NAME = 'Link'
+
+    # https://www.w3.org/wiki/LinkHeader
+    LINK_PARSER = /\A\<(.+)\>\s*;\s*rel\s*=\s*\"(.*)\"\z/.to_parser do |m|
+      [m[2], m[1]]
+    end
+
     common_constructor :curl, :body_data_proc
 
     def body_data
@@ -23,7 +35,7 @@ module EacRest
       body_data
     end
 
-    delegate :body_str, :headers, to: :performed_curl
+    delegate :body_str, to: :performed_curl
 
     def body_str_or_raise
       raise_unless_200
@@ -31,6 +43,26 @@ module EacRest
       body_str
     end
 
+    def header(name)
+      hash_search(headers, name)
+    end
+
+    def headers
+      performed_curl.header_str.each_line.map(&:strip)[1..-1].reject(&:blank?)
+        .map { |header_line| HEADER_LINE_PARSER.parse!(header_line) }
+        .to_h
+    end
+
+    def link(rel)
+      hash_search(links, rel)
+    end
+
+    def links
+      header(LINKS_HEADER_NAME).if_present({}) do |v|
+        v.split(',').map { |w| LINK_PARSER.parse!(w.strip) }.to_h
+      end
+    end
+
     def raise_unless_200
       return nil if status == 200
 
@@ -57,6 +89,14 @@ module EacRest
       Hash.from_xml(body_str)
     end
 
+    def hash_search(hash, key)
+      key = key.to_s.downcase
+      hash.each do |k, v|
+        return v if k.to_s.downcase == key
+      end
+      nil
+    end
+
     def perform
       @perform ||= begin
         curl.perform || raise("CURL perform failed for #{url}")

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

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

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   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'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -23,7 +23,7 @@ module EacRubyBase0
     delegate :version, to: :self_gem
 
     def all_gems
-      vendor_gems + [self_gem]
+      sub_gems + [self_gem]
     end
 
     # @return [EacCli::Config]
@@ -75,7 +75,7 @@ CODE
       ::EacRubyGemsUtils::Gem.new(gemspec_dir)
     end
 
-    def vendor_gems_uncached
+    def sub_gems_uncached
       r = []
       vendor_dir.children.each do |c|
         vgem = ::EacRubyGemsUtils::Gem.new(c)

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

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

data/sub/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_utils', '~> 0.81'
 
   # Tests
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/version_file.rb

@@ -26,8 +26,8 @@ module EacRubyGemsUtils
 
       def new_value_content(new_value)
         path.read.each_line
-            .map { |line| new_value_line(line, new_value) }
-            .join
+          .map { |line| new_value_line(line, new_value) }
+          .join
       end
 
       def new_value_line(line, new_value)

data/sub/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

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

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '~> 2.6'
   s.add_dependency 'filesize'
   s.add_dependency 'net-ssh', '~> 4.2'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3', '>= 0.3.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/core_ext.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/locales/from_all_gems'
 require 'eac_ruby_utils/patches'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/custom_format.rb

@@ -9,7 +9,7 @@ module EacRubyUtils
     attr_reader :mapping
 
     def initialize(mapping)
-      @mapping = mapping.map { |k, v| [k.to_sym, v] }.to_h.freeze
+      @mapping = mapping.transform_keys(&:to_sym).freeze
     end
 
     def format(string)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/gems_registry/gem.rb

@@ -41,7 +41,7 @@ module EacRubyUtils
       def lib_file_found?
         gemspec.require_paths.any? do |require_path|
           ::Pathname.new(require_path).expand_path(gemspec.gem_dir).join(path_to_require + '.rb')
-                    .file?
+            .file?
         end
       end
 

data/sub/eac_ruby_utils/lib/eac_ruby_utils/gems_registry.rb

@@ -29,7 +29,7 @@ module EacRubyUtils
     # @return [Array<EacRubyUtils::GemsRegistry::Gem>]
     def all_gems
       ::Gem::Specification.map { |gemspec| ::EacRubyUtils::GemsRegistry::Gem.new(self, gemspec) }
-                          .sort
+        .sort
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb

@@ -16,7 +16,7 @@ module EacRubyUtils
       # @raise [ArgumentError]
       def variableize(string, validate = true)
         r = ::ActiveSupport::Inflector.transliterate(string).gsub(/[^_a-z0-9]/i, '_')
-                                      .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
+              .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
         m = VARIABLE_NAME_PATTERN.match(r)
         return r if m
         return nil unless validate

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/listable/value'
+
 module EacRubyUtils
   module Listable
     class List
+      BLANK_VALUE = nil
+      BLANK_KEY = :__blank
+
       attr_reader :item
 
       def initialize(lists, item, labels)
@@ -12,6 +17,10 @@ module EacRubyUtils
         apply_constants
       end
 
+      def blank_value
+        @blank_value ||= ::EacRubyUtils::Listable::Value.new(self, BLANK_VALUE, BLANK_KEY, false)
+      end
+
       def each_value(&block)
         values.each(&block)
       end
@@ -34,7 +43,7 @@ module EacRubyUtils
       end
 
       def hash_keys_validate!(hash, error_class = ::StandardError)
-        hash.keys.each { |key| value_validate!(key, error_class) }
+        hash.each_key { |key| value_validate!(key, error_class) }
         hash
       end
 
@@ -42,11 +51,14 @@ module EacRubyUtils
         "eac_ruby_utils.listable.#{class_i18n_key}.#{item}"
       end
 
+      # @return [EacRubyUtils::Listable::Value, nil]
       def instance_value(instance)
         v = instance.send(item)
+        return blank_value if v.blank?
         return @values[v] if @values.key?(v)
 
-        raise "List value unkown: #{v} (Source: #{@lists.source}, Item: #{item})"
+        raise "List value unkown: \"#{v}\" (Source: #{@lists.source}, Item: #{item}, Instance: " \
+          "#{instance.to_debug}, Values: #{@values.keys})"
       end
 
       def value_valid?(value)
@@ -70,7 +82,7 @@ module EacRubyUtils
       end
 
       def find_list_by_method(method)
-        @values.values.each do |v|
+        @values.each_value do |v|
           return v if method.to_s == "value_#{v.key}"
         end
         nil
@@ -81,7 +93,7 @@ module EacRubyUtils
       end
 
       def apply_constants
-        @values.values.each do |v|
+        @values.each_value do |v|
           @lists.source.const_set(v.constant_name, v.value)
         end
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb

@@ -7,10 +7,11 @@ module EacRubyUtils
     class Value
       attr_reader :value, :key
 
-      def initialize(list, value, key)
+      def initialize(list, value, key, translation_required = true)
         @list = list
         @value = value
         @key = key
+        @translation_required = translation_required
       end
 
       def to_s
@@ -29,10 +30,19 @@ module EacRubyUtils
         translate('description')
       end
 
+      def translation_required?
+        @translation_required
+      end
+
       private
 
       def translate(translate_key)
-        ::I18n.t("#{@list.i18n_key}.#{@key}.#{translate_key}")
+        full_translate_key = "#{@list.i18n_key}.#{@key}.#{translate_key}"
+        if !::I18n.exists?(full_translate_key) && !translation_required?
+          ''
+        else
+          ::I18n.t(full_translate_key)
+        end
       end
     end
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb

@@ -36,7 +36,7 @@ module EacRubyUtils
         return nil unless executable.exist?
 
         TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
-                                         .if_present { |v| ::ActiveSupport::TimeZone[v] }
+          .if_present { |v| ::ActiveSupport::TimeZone[v] }
       end
 
       # @return [ActiveSupport::TimeZone]

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_all_gems.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/locales/from_gem'
+::EacRubyUtils::Locales::FromGem.include_all

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/from_gem.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/object/to_pathname'
+
+module EacRubyUtils
+  module Locales
+    class FromGem
+      class << self
+        def include_all(i18n_obj = nil)
+          ::Gem::Specification.each { |gemspec| new(gemspec, i18n_obj).include }
+        end
+      end
+
+      LOCALES_DIR_SUBPATH = 'locale'
+      LOCALES_FILES_GLOB_PATTERNS = %w[*.yaml *.yml].freeze
+
+      common_constructor :gemspec, :i18n_obj, default: [nil] do
+        self.i18n_obj ||= ::I18n
+      end
+
+      # @return [Boolean]
+      delegate :exist?, to: :path
+
+      # @return [Pathname, nil]
+      def include
+        return nil unless exist?
+
+        ::I18n.load_path += paths_to_load.map(&:to_path)
+        path
+      end
+
+      # @return [Pathname]
+      def path
+        gemspec.gem_dir.to_pathname.join(LOCALES_DIR_SUBPATH)
+      end
+
+      # @return [Pathname]
+      def paths_to_load
+        return [] unless exist?
+
+        LOCALES_FILES_GLOB_PATTERNS.inject([]) { |a, e| a + path.glob(e) }
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales/module_i18n_translate.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/common_constructor'
+require 'i18n'
+
+module EacRubyUtils
+  module Locales
+    class ModuleI18nTranslate
+      TRANSLATE_LOCALE_KEY = :__locale
+
+      common_constructor :the_module, :entry_suffix, :values, default: [{}]
+
+      def ancestor_i18n_translate(ancestor)
+        t = self.class.new(ancestor, entry_suffix, values)
+        t.exists? ? t.i18n_translate : nil
+      end
+
+      def ancestors_i18n_translate
+        the_module.ancestors.lazy.map { |v| ancestor_i18n_translate(v) }.find(&:present?)
+      end
+
+      def exists?
+        ::I18n.exists?(i18n_key)
+      end
+
+      def i18n_key
+        "#{module_entry_prefix}.#{entry_suffix}"
+      end
+
+      def i18n_options
+        values.except(TRANSLATE_LOCALE_KEY)
+      end
+
+      def i18n_translate
+        ::I18n.translate(i18n_key, i18n_options)
+      end
+
+      def locale
+        values[TRANSLATE_LOCALE_KEY]
+      end
+
+      def module_entry_prefix
+        the_module.name.underscore.gsub('/', '.')
+      end
+
+      def on_locale(&block)
+        if locale.present?
+          on_present_locale(&block)
+        else
+          block.call
+        end
+      end
+
+      def result
+        on_locale do
+          ancestors_i18n_translate || i18n_translate
+        end
+      end
+
+      private
+
+      def on_present_locale(&block)
+        old_locale = ::I18n.locale
+        begin
+          ::I18n.locale = locale
+          block.call
+        ensure
+          ::I18n.locale = old_locale
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/locales.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRubyUtils
+  module Locales
+    ::EacRubyUtils.require_sub __FILE__
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/introspection'
+require 'eac_ruby_utils/patches/class/common_constructor'
+require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/string/inflector'
+
+module EacRubyUtils
+  module MethodClass
+    common_concern do
+      ::EacRubyUtils::MethodClass::Setup.new(self)
+    end
+
+    class Setup
+      common_constructor :method_class do
+        perform
+      end
+
+      def perform
+        the_setup = self
+        sender_module.define_method(method_name) do |*args, &block|
+          the_setup.method_class.new(self, *args, &block).result
+        end
+      end
+
+      def method_name
+        method_class.name.demodulize.underscore.variableize
+      end
+
+      def sender_module
+        method_class.module_parent
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/i18n_translate.rb

@@ -1,32 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'i18n'
+require 'eac_ruby_utils/locales/module_i18n_translate'
 
 class Module
-  TRANSLATE_LOCALE_KEY = :__locale
-
   def i18n_translate(entry_suffix, values = {})
-    on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
-      ::I18n.translate(i18n_translate_entry_full(entry_suffix), values)
-    end
-  end
-
-  def i18n_translate_entry_full(entry_suffix)
-    "#{i18n_translate_entry_self_prefix}.#{entry_suffix}"
-  end
-
-  def i18n_translate_entry_self_prefix
-    name.underscore.gsub('/', '.')
-  end
-
-  def on_i18n_locale(locale)
-    old_locale = ::I18n.locale
-    begin
-      ::I18n.locale = locale
-      yield
-    ensure
-      ::I18n.locale = old_locale
-    end
+    ::EacRubyUtils::Locales::ModuleI18nTranslate.new(self, entry_suffix, values).result
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/module/method_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+
+class Module
+  def enable_method_class
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::MethodClass)
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 class Object
+  def pretty_debug
+    STDERR.write(pretty_inspect)
+
+    self
+  end
+
   def print_debug
     STDERR.write(to_debug + "\n")