eac_cli 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a1aee26ed2a25555ea82dd01ad541399bb81c022bc9c5485c9745b2bac64ab
-  data.tar.gz: 6a84576f580b79b3ff347c69a81651896c8a11ad2817e6448e9d7367173afca5
+  metadata.gz: 1c6c9d3ac7f26ac1fdc4cbb83a5c7c6b36bd9b293429b17ca63b25b3945d562e
+  data.tar.gz: a887a446a8f97edc9c2d4d093a22251a2e51cf47c5656c661c47530d3d3a0c51
 SHA512:
-  metadata.gz: 276eb8f31597ed422c7afe949097b7f9ec9991f8d8c4b65a4f0b4662db5903db6e82b5d34a50ee012ae4ba7303dce69e244f4380df1a806977bc7175bedf9506
-  data.tar.gz: 536d37085cfd346718ac5b583f1112406037bae03de277aa38b2f08a63a7f097fde980c7b02bdb5b6ea7ea48a84c0b1720e6386c8c38b147bb61cb0de3ffd2bc
+  metadata.gz: 371e1ab8cb6b93c36ad658168212c344c2c14e92ee783d91fc7d6251b21c85122284e800f1c1797b130df8bee6701e262e50e0894c018108bc55dfc91ba8cada
+  data.tar.gz: 7361269780fce5f667541fee9fe3ebbb1248b9335e59f1529f9099872fd0985635197b3c41cfc25f232a921b02c29067e28393983c6e55aba121129343d21ddc

data/lib/eac_cli/config/entry/options.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       class Options
         enable_simple_cache
         enable_listable

data/lib/eac_cli/config/entry/undefined.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'eac_cli/speaker/input_requested'
+require 'eac_config/entry/not_found_error'
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       module Undefined
         private
 
@@ -19,6 +22,8 @@ module EacCli
 
         def undefined_value_no_loop
           input("Value for entry \"#{path}\"", options.request_input_options)
+        rescue ::EacCli::Speaker::InputRequested
+          raise ::EacConfig::Entry::NotFoundError, self
         end
       end
     end

data/lib/eac_cli/config/entry.rb

@@ -2,21 +2,26 @@
 
 require 'eac_cli/speaker'
 require 'eac_config/entry_path'
+require 'eac_config/node_entry'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Config < ::SimpleDelegator
-    class Entry
+    class Entry < ::EacConfig::NodeEntry
       require_sub __FILE__, include_modules: true
       enable_listable
       enable_simple_cache
       enable_speaker
 
-      common_constructor :config, :path, :options do
-        self.path = ::EacConfig::EntryPath.assert(path)
+      common_constructor :root_node, :path, :options, super_args: -> { [root_node, path] } do
         self.options = ::EacCli::Config::Entry::Options.new(options)
       end
 
+      # @return [EacCli::Config]
+      def config
+        root_node
+      end
+
       def value
         value!
       end

data/lib/eac_cli/runner/class_runner.rb

@@ -18,33 +18,19 @@ module EacCli
       end
 
       def run
-        on_asserted_speaker do
-          r = create
-          begin
-            r.run_run
-          rescue ::EacCli::Parser::Error => e
-            run_parser_error(r, e)
-          end
-          r
+        r = create
+        begin
+          r.run_run
+        rescue ::EacCli::Parser::Error => e
+          run_parser_error(r, e)
         end
+        r
       end
 
       def run_parser_error(runner_instance, error)
         $stderr.write("#{runner_instance.program_name}: #{error}\n")
         ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

data/lib/eac_cli/speaker/input_blocked.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker/input_requested'
+
+module EacCli
+  class Speaker
+    class InputBlocked
+      %w[gets noecho].each do |method|
+        define_method(method) do
+          raise ::EacCli::Speaker::InputRequested,
+                "Method (\"#{method}\") was requested, but input is blocked"
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/speaker/input_requested.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Speaker
+    class InputRequested < ::RuntimeError
+    end
+  end
+end

data/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.29.0'
+  VERSION = '0.30.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -51,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.107'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.107.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +136,8 @@ files:
 - lib/eac_cli/runner_with_set.rb
 - lib/eac_cli/speaker.rb
 - lib/eac_cli/speaker/constants.rb
+- lib/eac_cli/speaker/input_blocked.rb
+- lib/eac_cli/speaker/input_requested.rb
 - lib/eac_cli/speaker/list.rb
 - lib/eac_cli/speaker/options.rb
 - lib/eac_cli/version.rb