eac_ruby_base0 0.7.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f7c0d02f93751b57d727ec34df37d8cdaf2124fc084f122f86dd2b71493a81
-  data.tar.gz: 3a55fa3722e1a1867783defb171815f65b36555c5761111f010cc3830c4d0b0a
+  metadata.gz: 34b99d130c097b0cc5861ef5bbf142142ce55196d3a7871ac301bad86591c2b6
+  data.tar.gz: 8fbd22d9230277a1658d234706639241b6838f36d02693d7763babfd8e2300b9
 SHA512:
-  metadata.gz: ce58f60898f6acccee9e2973813ef04f64c20c74a4a85847fda9cd238f88ff5cfafa4d866718593ffb97a3721fccafb154d180eda68e1df6622957e8ff57d32b
-  data.tar.gz: 01ef701c6677f14615847a9a951d55c6cc7664de07350ca097c537d860d619abcd56497ed4e165707f2ee03ed9847918cd81107d5ae33b277b4bca3a8f8218c8
+  metadata.gz: 949b3bce253b5517eab405243f681ffb9851ea514386ef1cf3d4b117777245e4b90c018840307fcc66afa8716449ac78a7d795fd33b53b345a8b3b1f06253060
+  data.tar.gz: 537b3af24a0ce7cfa5bb4909b102c81d4c4ca5cb86e0e0003c2e458d96fba375fd5d14ab3a8235f2438e53e6b164e86ba095a036369056f3b9712e408c1fa0fe

data/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/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/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/lib/eac_ruby_base0/runner.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_cli/runner_with/help'
-require 'eac_cli/runner_with/subcommands'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
+require 'eac_cli/speaker'
+require 'eac_config/node'
+require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
   module Runner
@@ -22,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
@@ -50,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/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/lib/eac_ruby_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_base0
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +74,7 @@ extra_rdoc_files: []
 files:
 - lib/eac_ruby_base0.rb
 - lib/eac_ruby_base0/application.rb
+- lib/eac_ruby_base0/application_xdg.rb
 - lib/eac_ruby_base0/core_ext.rb
 - lib/eac_ruby_base0/jobs_runner.rb
 - lib/eac_ruby_base0/patches.rb