eac_ruby_base0 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ae142d31cfaa28f6d870e2a2401624770c2cb16a56e82b0140a0451367b708
-  data.tar.gz: f1715aca8f09e2cdb9ad2e795498d591a32c6c3fdccdab592f7185a2e9e3f7f7
+  metadata.gz: 10ee625f182f3829966f72f31ca5a5f8fd0e3014754ae85bcb77a4e0ddff1c34
+  data.tar.gz: 27cc3c2e2b5b60d294eb225a67aac634774b73611ff4246d3f0929815664a407
 SHA512:
-  metadata.gz: 62c88b779246c825454b48b225b9367ff7d0dedb8ff64d5e2208128929054c98ff7c459d6c864f859c8deeb7171abfc9c356a28156b647d6e3b91be819f1c094
-  data.tar.gz: a772912235c747dbb35224429c1870172c3aeb2a8763c2a0364a340f565b0f651bee91f910f93372e6e47cc57ed5e0f7f1bd0bcb22ff477072a6117da03a5323
+  metadata.gz: 7764d32f1bac074a0d096f6642264b59aea8363f89b9d50c0c4402e5eccd0d0230f374a4fb57ac73a8668319b9e10dd7d026ef10cdfe0d400e08a19f15d014ec
+  data.tar.gz: b420f162aa98c9772b63f171f5732b8d59865d45d4858071b8ceefcd6c91492aebedf3b8a7aa36a63e73bf0d639ccb6c2f9bc7218d061f05dff66c47b36abc7a

data/lib/eac_ruby_base0/application.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+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 +22,8 @@ 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"
-
-      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) || 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 +33,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 +46,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,32 @@
+# frozen_string_literal: true
+
+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_ruby_utils/console/speaker'
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/settings_provider'
 
 module EacRubyBase0
   module JobsRunner
     common_concern do
-      include ::EacRubyUtils::Console::Speaker
+      enable_speaker
       include ::EacRubyUtils::SettingsProvider
     end
 

data/lib/eac_ruby_base0/runner.rb

@@ -1,13 +1,13 @@
 # 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_ruby_utils/speaker'
 
 module EacRubyBase0
   module Runner
     require_sub __FILE__
-    enable_console_speaker
+    enable_speaker
     common_concern do
       include ::EacCli::RunnerWith::Help
       include ::EacCli::RunnerWith::Subcommands
@@ -22,9 +22,7 @@ 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?
+      ::EacRubyUtils::Speaker.context.on(build_speaker) do
         if parsed.version?
           show_version
         else
@@ -42,7 +40,7 @@ module EacRubyBase0
     end
 
     class FailIfRequestInput
-      enable_console_speaker
+      enable_speaker
 
       %w[gets noecho].each do |method|
         define_method(method) do
@@ -50,5 +48,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.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_base0
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-06-11 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,34 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 description: 
 email: 
 executables: []
@@ -86,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