avm-tools 0.94.2 → 0.94.3

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

@@ -54,8 +54,9 @@ module EacRubyUtils
       end
 
       def value_validate!(value, error_class = ::StandardError)
-        value_valid?(value) ||
-          raise(error_class, "Invalid value: \"#{value}\" (Valid: #{values_to_s})")
+        return value if value_valid?(value)
+
+        raise(error_class, "Invalid value: \"#{value}\" (Valid: #{values_to_s})")
       end
 
       def values_to_s

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.rb

@@ -2,7 +2,9 @@
 
 module Kernel
   # Raise exception with text "Not yet implemented".
-  def nyi
-    raise "Not yet implemented (Called in #{caller.first})"
+  def nyi(message = nil)
+    s = "Not yet implemented (Called in #{caller.first})"
+    s += ": #{message}" if message
+    raise s
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb

@@ -3,7 +3,9 @@
 require 'eac_ruby_utils/inflector'
 
 class String
-  def variableize
-    ::EacRubyUtils::Inflector.variableize(self)
+  # Shortcut to `EacRubyUtils::Inflector.variableize(self, ...)`.
+  # @see EacRubyUtils::Inflector.variableize
+  def variableize(validate = true)
+    ::EacRubyUtils::Inflector.variableize(self, validate)
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/options_consumer'
+require 'eac_ruby_utils/require_sub'
 
 module EacRubyUtils
   # Provide a option by constant, method or options object.
   module SettingsProvider
+    ::EacRubyUtils.require_sub __FILE__, base: self
+
     def setting_constant_name(key, fullname = false)
-      name = key.to_s.underscore.upcase
-      name = "#{self.class.name}::#{name}" if fullname
-      name
+      setting_value_instance(key).constant_name(fullname)
     end
 
     def setting_search_order
@@ -25,41 +24,23 @@ module EacRubyUtils
     end
 
     def setting_value(key, options = {})
-      options = parse_setting_value_options(options)
-      options.order.each do |method|
-        value = send("setting_value_by_#{method}", key)
-        return value if value
-      end
-      return nil unless options.required
-
-      raise "Setting \"#{key}\" not found. Supply in #{settings_object_name}, implement a " \
-        "\"#{key}\" method or declare a #{setting_constant_name(key, true)} constant."
+      setting_value_instance(key, options).value
     end
 
     def setting_value_by_constant(key)
-      constant_name = setting_constant_name(key)
-      begin
-        self.class.const_get(constant_name)
-      rescue NameError
-        nil
-      end
+      setting_value_instance(key).value_by_constant
     end
 
     def setting_value_by_method(key)
-      respond_to?(key) ? send(key) : nil
+      setting_value_instance(key).value_by_method
     end
 
     def setting_value_by_settings_object(key)
-      settings_object[key.to_s] || settings_object[key.to_sym]
+      setting_value_instance(key).value_by_settings_object
     end
 
-    private
-
-    def parse_setting_value_options(options)
-      r = ::EacRubyUtils::OptionsConsumer.new(options).consume_all(:required, :order, ostruct: true)
-      r.required = true if r.required.nil?
-      r.order = setting_search_order if r.order.nil?
-      r
+    def setting_value_instance(key, options = {})
+      ::EacRubyUtils::SettingsProvider::SettingValue.new(self, key, options)
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module SettingsProvider
+    class SettingValue
+      include ::EacRubyUtils::Listable
+      include ::EacRubyUtils::SimpleCache
+
+      attr_reader :source, :key, :options
+      lists.add_symbol :option, :default, :order, :required
+
+      def initialize(source, key, options)
+        @source = source
+        @key = key
+        @options = options
+      end
+
+      def constant_name(fullname = false)
+        name = key.to_s.underscore.upcase
+        name = "#{source.class.name}::#{name}" if fullname
+        name
+      end
+
+      def value
+        parsed_options.order.each do |method|
+          value = send("value_by_#{method}")
+          return value if value
+        end
+        return parsed_options.default if parsed_options.respond_to?(OPTION_DEFAULT)
+        return nil unless parsed_options.required
+
+        raise_key_not_found
+      end
+
+      def value_by_constant
+        source.class.const_get(constant_name)
+      rescue NameError
+        nil
+      end
+
+      def value_by_method
+        source.respond_to?(key, true) ? source.send(key) : nil
+      end
+
+      def value_by_settings_object
+        source.settings_object[key.to_s] || source.settings_object[key.to_sym]
+      end
+
+      private
+
+      def parsed_options_uncached
+        r = self.class.lists.option.hash_keys_validate!(options.symbolize_keys)
+        r[:required] = true unless r.key?(OPTION_REQUIRED)
+        r[:order] = source.setting_search_order if r[OPTION_ORDER].nil?
+        ::EacRubyUtils::Struct.new(r)
+      end
+
+      def raise_key_not_found
+        raise "Setting \"#{key}\" not found. Supply in #{source.settings_object_name}, implement "\
+          "a \"#{key}\" method or declare a #{constant_name(true)} constant."
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb

@@ -42,5 +42,13 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
     it do
       expect(stub.setting_value('key_e', required: false)).to eq(nil)
     end
+
+    it do
+      expect(stub.setting_value('key_e', default: nil)).to eq(nil)
+    end
+
+    it do
+      expect(stub.setting_value('key_e', default: 'default_e')).to eq('default_e')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.94.2
+  version: 0.94.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -354,6 +354,7 @@ files:
 - lib/avm/eac_webapp_base0/deploy/version.rb
 - lib/avm/eac_webapp_base0/deploy/write_on_target.rb
 - lib/avm/eac_webapp_base0/instance.rb
+- lib/avm/eac_webapp_base0/instance/subcommand_parent.rb
 - lib/avm/eac_webapp_base0/runner.rb
 - lib/avm/eac_webapp_base0/runner/apache_host.rb
 - lib/avm/eac_webapp_base0/runner/apache_path.rb
@@ -437,7 +438,6 @@ files:
 - lib/avm/git/organize/reference_update.rb
 - lib/avm/git/organize/repository.rb
 - lib/avm/git/revision_test.rb
-- lib/avm/git/spec_helper.rb
 - lib/avm/git/subrepo_check.rb
 - lib/avm/git/subrepo_check/parent.rb
 - lib/avm/git/subrepo_check/remote.rb
@@ -688,7 +688,6 @@ files:
 - vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
-- vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb
 - vendor/eac_cli/lib/eac_cli/runner_with_set.rb
 - vendor/eac_cli/lib/eac_cli/version.rb
@@ -697,7 +696,6 @@ files:
 - vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
-- vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
 - vendor/eac_cli/spec/spec_helper.rb
@@ -726,14 +724,30 @@ files:
 - vendor/eac_git/lib/eac_git.rb
 - vendor/eac_git/lib/eac_git/executables.rb
 - vendor/eac_git/lib/eac_git/local.rb
+- vendor/eac_git/lib/eac_git/local/commit.rb
+- vendor/eac_git/lib/eac_git/local/commit/changed_file.rb
+- vendor/eac_git/lib/eac_git/local/commit/diff_tree_line.rb
 - vendor/eac_git/lib/eac_git/local/dirty_files.rb
 - vendor/eac_git/lib/eac_git/local/subrepo.rb
 - vendor/eac_git/lib/eac_git/local/subrepo/config.rb
 - vendor/eac_git/lib/eac_git/remote.rb
 - vendor/eac_git/lib/eac_git/remote/ls_result.rb
 - vendor/eac_git/lib/eac_git/rspec.rb
+- vendor/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb
 - vendor/eac_git/lib/eac_git/version.rb
 - vendor/eac_git/spec/lib/eac_git/executables_spec.rb
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec.rb
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/remove.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.source.out
+- vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/rename_modify.target.yaml
+- vendor/eac_git/spec/lib/eac_git/local/commit_spec.rb
 - vendor/eac_git/spec/rubocop_spec.rb
 - vendor/eac_git/spec/spec_helper.rb
 - vendor/eac_git/vendor/git-subrepo/Changes
@@ -937,8 +951,10 @@ files:
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/filesystem_traverser.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb
 - vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
+- vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/output_spec.rb
 - vendor/eac_ruby_base0/spec/rubocop_spec.rb
 - vendor/eac_ruby_base0/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/Gemfile
@@ -1028,6 +1044,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/clearable_directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/extname.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/logs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp/file.rb
@@ -1108,6 +1125,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb
@@ -1191,7 +1209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Tools for AVM.

data/vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/abstract_methods'
-
-module EacCli
-  module RunnerWith
-    module OutputFile
-      common_concern do
-        include ::EacCli::Runner
-        include ::EacRubyUtils::AbstractMethods
-
-        abstract_methods :output_content
-
-        runner_definition do
-          arg_opt '-o', '--output-file', 'Output to file.'
-        end
-      end
-
-      def run_output
-        if parsed.output_file.present?
-          ::File.write(parsed.output_file, output_content)
-        else
-          $stdout.write(output_content)
-        end
-      end
-    end
-  end
-end

data/vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/runner_with/output_file'
-require 'eac_ruby_utils/fs/temp'
-
-RSpec.describe ::EacCli::RunnerWith::OutputFile do
-  let(:runner) do
-    the_module = described_class
-    Class.new do
-      include the_module
-
-      runner_definition do
-        desc 'A stub root runner.'
-        pos_arg :input_text
-      end
-
-      def run
-        run_output
-      end
-
-      def output_content
-        parsed.input_text
-      end
-    end
-  end
-
-  let(:stub_text) { 'STUB_TEXT' }
-  let(:instance) { runner.create(argv: runner_argv) }
-
-  context 'without --output-file option' do
-    let(:runner_argv) { [stub_text] }
-
-    it do
-      expect { instance.run }.to output(stub_text).to_stdout_from_any_process
-    end
-  end
-
-  context 'with --output-file option' do
-    let(:output_file) { ::EacRubyUtils::Fs::Temp.file }
-    let(:runner_argv) { ['--output-file', output_file.to_path, stub_text] }
-
-    before do
-      instance.run
-    end
-
-    after do
-      output_file.remove
-    end
-
-    it { expect(output_file).to exist }
-    it { expect(output_file.read).to eq(stub_text) }
-  end
-end