ehbrs-tools 0.21.0 → 0.22.0

data/vendor/eac_config/spec/lib/eac_config/old_configs_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+require 'eac_config/old_configs'
+
+RSpec.describe ::EacConfig::OldConfigs do
+  let(:configs_key) { 'configsspec' }
+  let(:storage_path) do
+    file = ::Tempfile.new(configs_key)
+    path = file.path
+    file.close
+    file.unlink
+    path
+  end
+  let(:instance) { described_class.new(configs_key, storage_path: storage_path) }
+
+  describe '#storage_path' do
+    it { expect(instance.storage_path).to eq(storage_path) }
+  end
+
+  describe '#write' do
+    let(:entry_key) { 'parent.child' }
+
+    before do
+      instance[entry_key] = 'value1'
+      instance.save
+    end
+
+    it { expect(::YAML.load_file(storage_path)).to eq(parent: { child: 'value1' }) }
+  end
+
+  describe '#read' do
+    let(:present_key) { 'a.present.key' }
+    let(:blank_key) { 'a.blank.key' }
+
+    before do
+      instance[present_key] = 'A value'
+      instance[blank_key] = ''
+      instance.save
+      instance.load
+    end
+
+    it { expect(instance[present_key]).to be_present }
+    it { expect(instance[blank_key]).to be_present }
+  end
+end

data/vendor/eac_config/spec/lib/eac_config/paths_hash_spec.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'eac_config/paths_hash'
+
+RSpec.describe ::EacConfig::PathsHash do
+  let(:source_hash) do
+    {
+      parent: {
+        child1: {
+          child1_1: 'v1_1',
+          child1_2: 'v1_2'
+        },
+        child2: 'v2'
+      }
+    }
+  end
+  let(:instance) { described_class.new(source_hash) }
+
+  describe '#[]' do
+    {
+      'parent.child1.child1_1' => 'v1_1',
+      'parent.child1.child1_2' => 'v1_2',
+      'parent.child2' => 'v2',
+      'no_exist' => nil,
+      'parent.child1' => {
+        child1_1: 'v1_1',
+        child1_2: 'v1_2'
+      }
+    }.each do |entry_key, expected_value|
+      it { expect(instance[entry_key]).to eq(expected_value) }
+    end
+
+    ['.only_suffix', '', '.', 'only_prefx.', 'empty..part'].each do |entry_key|
+      it "invalid entry key \"#{entry_key}\" raises EntryKeyError" do
+        expect { instance[entry_key] }.to raise_error(::EacConfig::PathsHash::EntryKeyError)
+      end
+    end
+  end
+
+  describe '#[]=' do
+    let(:source_hash) { {} }
+
+    before do
+      instance['a.b.c'] = '123'
+    end
+
+    it { expect(instance.to_h).to eq(a: { b: { c: '123' } }) }
+  end
+
+  describe '#fetch' do
+    {
+      'parent.child1.child1_1' => 'v1_1',
+      'parent.child1.child1_2' => 'v1_2',
+      'parent.child1.child1_2.no_exist' => ::EacConfig::PathsHash::EntryKeyError,
+      'parent.child1.child1_3' => ::EacConfig::PathsHash::EntryKeyError,
+      'parent.child2' => 'v2',
+      'no_exist' => ::EacConfig::PathsHash::EntryKeyError,
+      'parent.child1' => {
+        child1_1: 'v1_1',
+        child1_2: 'v1_2'
+      }
+    }.each do |entry_key, expected_value|
+      if expected_value.is_a?(::Class) && expected_value < ::Exception
+        it "raise error #{expected_value}" do
+          expect { instance.fetch(entry_key) }.to raise_error(expected_value)
+        end
+      else
+        it "\#fetch return \"#{expected_value}\"" do
+          expect(instance.fetch(entry_key)).to eq(expected_value)
+        end
+      end
+    end
+  end
+
+  describe '#key?' do
+    {
+      'parent.child1.child1_1' => true,
+      'parent.child1.child1_2' => true,
+      'parent.child1.child1_2.no_exist' => false,
+      'parent.child1.child1_3' => false,
+      'parent.child2' => true,
+      'no_exist' => false,
+      'parent.child1' => true
+    }.each do |entry_key, expected_value|
+      it { expect(instance.key?(entry_key)).to eq(expected_value) }
+    end
+  end
+end

data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+require 'eac_config/yaml_file_node'
+
+RSpec.describe ::EacConfig::YamlFileNode do
+  storages = %w[1 1_1 1_2 1_2_1].map do |suffix|
+    key = "storage#{suffix}"
+    subpath = "#{key}.yaml"
+    subpath = "storage1_2/#{subpath}" if suffix == '1_2_1'
+    ::EacRubyUtils::Struct.new(suffix: suffix, key: key, subpath: subpath.to_pathname)
+  end
+
+  let(:fixtures_dir) { ::Pathname.new(__dir__).join('yaml_file_node_spec_files') }
+  let(:target_dir) { temp_copy(fixtures_dir) }
+  let(:yaml_file_path) do
+    r = target_dir.join('storage1.yaml')
+    r.write(r.read.gsub('%%STORAGE1_2_ABSOLUTE_PATH%%',
+                        target_dir.join('storage1_2.yaml').expand_path.to_path))
+    r
+  end
+  let(:instance) { described_class.new(yaml_file_path) }
+
+  context 'with common entry' do
+    let(:entry) { instance.entry('common') }
+
+    it { expect(entry.value).to eq('AAA') }
+    it { expect(entry.found_node).to eq(instance) }
+    it { expect(entry).to be_found }
+  end
+
+  storages.each do |storage|
+    context "with entry in loaded path \"#{storage.subpath}\"" do
+      let(:entry) { instance.entry(storage.key) }
+      let(:storage_node) { described_class.new(target_dir.join(storage.subpath)) }
+
+      it { expect(entry).to be_a(::EacConfig::Entry) }
+      it { expect(entry).to be_found }
+      it { expect(entry.value).to eq(storage.key) }
+      it { expect(entry.found_node.url).to eq(storage_node.url) }
+    end
+  end
+
+  context 'with not existing entry' do
+    let(:entry) { instance.entry('no_exist') }
+
+    it { expect(entry).to be_a(::EacConfig::Entry) }
+    it { expect(entry.value).to eq(nil) }
+    it { expect(entry.found_node).to eq(nil) }
+    it { expect(entry).not_to be_found }
+  end
+end

data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1.yaml

@@ -0,0 +1,6 @@
+---
+common: AAA
+load_path:
+  - storage1_1.yaml
+  - %%STORAGE1_2_ABSOLUTE_PATH%%
+storage1: storage1

data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_1.yaml

@@ -0,0 +1,2 @@
+---
+storage1_1: storage1_1

data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2.yaml

@@ -0,0 +1,4 @@
+---
+load_path:
+  - ./storage1_2/storage1_2_1.yaml
+storage1_2: storage1_2

data/vendor/eac_config/spec/lib/eac_config/yaml_file_node_spec_files/storage1_2/storage1_2_1.yaml

@@ -0,0 +1,2 @@
+---
+storage1_2_1: storage1_2_1

data/vendor/eac_config/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_config/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.dirname(__dir__), config)
+end

data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.15', '>= 0.15.1'
+  s.add_dependency 'eac_cli', '~> 0.20'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.64'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'eac_cli/config'
+require 'eac_config/envvars_node'
+require 'eac_config/yaml_file_node'
+require 'eac_ruby_base0/application_xdg'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/filesystem_cache'
@@ -21,16 +25,22 @@ module EacRubyBase0
       vendor_gems + [self_gem]
     end
 
-    { cache: '.cache', config: '.config', data: '.local/share' }.each do |item, subpath|
-      xdg_env_method_name = "#{item}_xdg_env"
+    # @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
 
-      define_method xdg_env_method_name do
-        ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
-      end
+    # @return [EacCli::Config]
+    def config_default_path
+      config_dir.join('eac_config.yaml')
+    end
 
-      define_method "#{item}_dir" do
-        (send(xdg_env_method_name) || home_dir.join(subpath)).join(name)
-      end
+    ::EacRubyBase0::ApplicationXdg::DIRECTORIES.each_key do |item|
+      delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
     def fs_cache
@@ -40,7 +50,7 @@ module EacRubyBase0
     end
 
     def home_dir
-      @home_dir ||= (options[OPTION_HOME_DIR] || ENV.fetch('HOME')).to_pathname
+      app_xdg.user_home_dir
     end
 
     def name
@@ -53,6 +63,10 @@ module EacRubyBase0
 
     private
 
+    def app_xdg_uncached
+      ::EacRubyBase0::ApplicationXdg.new(name, options[OPTION_HOME_DIR])
+    end
+
     def self_gem_uncached
       ::EacRubyGemsUtils::Gem.new(gemspec_dir)
     end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyBase0
+  # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  class ApplicationXdg
+    class << self
+      # @return [Pathname]
+      def user_home_dir_from_env
+        ENV.fetch('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/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/settings_provider'
 
 module EacRubyBase0
   module JobsRunner
     common_concern do
-      include ::EacCli::Speaker
+      enable_speaker
       include ::EacRubyUtils::SettingsProvider
     end
 

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
+require 'eac_cli/speaker'
+require 'eac_config/node'
+require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
   module Runner
@@ -20,13 +23,13 @@ module EacRubyBase0
     end
 
     def run
-      on_speaker_node do |node|
-        node.stderr = ::StringIO.new if parsed.quiet?
-        node.stdin = FailIfRequestInput.new if parsed.no_input?
-        if parsed.version?
-          show_version
-        else
-          run_with_subcommand
+      ::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
         end
       end
     end
@@ -48,5 +51,14 @@ module EacRubyBase0
         end
       end
     end
+
+    private
+
+    def build_speaker
+      options = {}
+      options[:err_out] = ::StringIO.new if parsed.quiet?
+      options[:in_in] = FailIfRequestInput.new if parsed.no_input?
+      ::EacCli::Speaker.new(options)
+    end
   end
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb

@@ -12,6 +12,7 @@ module EacRubyBase0
       common_concern do
         include ::EacCli::Runner
         enable_settings_provider
+        enable_simple_cache
         runner_definition do
           bool_opt '--no', 'Deny confirmation without question.'
           bool_opt '--yes', 'Accept confirmation without question.'
@@ -22,7 +23,7 @@ module EacRubyBase0
         return false if parsed.no?
         return true if parsed.yes?
 
-        request_input(
+        input(
           message || setting_value(:confirm_question_text, default: DEFAULT_CONFIRM_QUESTION_TEXT),
           bool: true
         )
@@ -31,6 +32,12 @@ module EacRubyBase0
       def run_confirm(message = nil)
         yield if confirm?(message)
       end
+
+      private
+
+      def cached_confirm_uncached?(message = nil)
+        confirm?(message)
+      end
     end
   end
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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