eac_ruby_base0 0.7.4 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc268f7a09e9262d85be31199e73103242f49b31081cd02c85ec847b1afcfb6d
-  data.tar.gz: 8906de337ba47f1613e059f55a3a1c9ecccd891c08e7f998ad3c16fd81288dad
+  metadata.gz: a709f0715b2ad1c20bd3dac837e4267b64f0e2bf553133544f2ef1dd767de9b9
+  data.tar.gz: c919d5103cf7eee653678b3655ec673d9b3fa3eef976d80ae0c0bbba390f7d1a
 SHA512:
-  metadata.gz: 4f13d20765e6d851774c62b0e2f3156b4187f9e78bd301a9d803e0b79bea973c2373c2395c5de9f8f407cf39f2ce96b198dbec29e51e8fe80dca388dfd605e45
-  data.tar.gz: 57a16e117774ad249ede385de1274bb2a55fa3cb34e0a7157d87050737177a439578291cae36029b53745c95c013690b86d1c97ac77a074d914f455cf2f93c54
+  metadata.gz: 701c01a6cd2902b2ef7b04687881787261dbac5e532a908a2bd2755b9b6b4a62efcd63f4b99f3680992657219a44cefdf16fbb9362d9c8e1e33ebf90ba0ae3af
+  data.tar.gz: 621cf6ef74fb023a029b8505a1d5a3fbb2bc03df336011e2f0b7d5faabfd42bb5439cfe5d3021f5bfb5952aa55392f5825011180cb88fd40cf20f891b5405e30

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

@@ -2,6 +2,7 @@
 
 require 'eac_cli/core_ext'
 require 'eac_cli/speaker'
+require 'eac_config/node'
 require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
@@ -23,10 +24,12 @@ module EacRubyBase0
 
     def run
       ::EacRubyUtils::Speaker.context.on(build_speaker) do
-        if parsed.version?
-          show_version
-        else
-          run_with_subcommand
+        ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
+          if parsed.version?
+            show_version
+          else
+            run_with_subcommand
+          end
         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.'
@@ -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.4'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_base0
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.10.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_cli
@@ -16,56 +16,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.67'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: 
 email: 
 executables: []
@@ -74,6 +86,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
@@ -107,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Put here de description.