avm-tools 0.113.3 → 0.113.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df7ad19d9031c2e3d94cb8051798479282760386da32c55533f461a85d51580
-  data.tar.gz: 69fe1de1ee67d5000c1a56aae122d1bf98e55a65b175616c73e9a99d28c4d472
+  metadata.gz: 5488a15876aa81048d9c653caff915780167551415a60d351c3137fd2418f78a
+  data.tar.gz: 73cf7cf7ef72418ded4b5cffac2dd4f7e2e399ce3a2b3149d962a5f1805d1e85
 SHA512:
-  metadata.gz: 92453344e1eb2751ed5d653cb11fea487284315750b9e61e3044da5883c9aed8ec46d1ab5979489c1c733ed963ab844ede90a4bf81dbb0f1e8c6414bb35fceab
-  data.tar.gz: c882830e166e9f7f59b1fca59d3658afccd2e3ad9dc6bf8929af4dae6a2ae6531537a9c97e924fdcd450c342d276b8d6029f917735c71702de8c9304884545ef
+  metadata.gz: ed7d05f9c93b6710189ec11e8b3e9f604b5066a2612c4053e978ac23d04da049257a42e6eab379c27b594d3255b09e682b44ae47d596e7529e53dcbe72c5da11
+  data.tar.gz: 18511d97a59192acf9e1ed6c14bf8e8a892c2a4a5af6caacfc5d9e7e9453a75057b2a265ea73b6890edc0a04e6f12070e63f973a8329e0582a2f96d6dd5d2793

data/lib/avm/tools/runner/self.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/tools/self'
+require 'avm/self/instance'
 
 module Avm
   module Tools
@@ -14,7 +14,7 @@ module Avm
         end
 
         def instance
-          ::Avm::Tools::Self.instance
+          ::Avm::Self::Instance.default
         end
       end
     end

data/lib/avm/tools/self.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli/old_configs_bridge'
 require 'eac_ruby_base0/application'
 require 'eac_ruby_utils/require_sub'
 require 'avm/instances/base'
@@ -15,18 +14,6 @@ module Avm
           @application ||= ::EacRubyBase0::Application.new(root.to_path)
         end
 
-        # @return [EacCli::OldConfigsBridge]
-        def build_config(path = nil)
-          ::EacCli::OldConfigsBridge.new(
-            application.name,
-            path.if_present({}) { |v| { storage_path: v } }
-          )
-        end
-
-        def instance
-          @instance ||= ::Avm::Tools::Self::Instance.by_id('avm-tools_self')
-        end
-
         def root
           ::Pathname.new('../../..').expand_path(__dir__)
         end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.113.3'
+    VERSION = '0.113.4'
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/data.rb

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Data
           def auto_data_default_dump_path
-            ::Avm::Self
-              .instance
+            ::Avm::Self::Instance
+              .default
               .read_entry_optional(::Avm::Self::Instance::EntryKeys::DATA_DEFAULT_PATH)
               .if_present do |v|
               ::File.join(

data/sub/avm/lib/avm/instances/entry.rb

@@ -27,11 +27,11 @@ module Avm
       end
 
       def optional_value
-        read(required: false, noinput: true) || auto_value
+        context_entry.found? ? context_entry.value : auto_value
       end
 
-      def read(extra_options = {})
-        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
+      def read
+        context_entry.value
       end
 
       def suffix_as_array
@@ -47,7 +47,13 @@ module Avm
       end
 
       def write(value)
-        ::EacConfig::Node.context.current.entry(full_path).value = value
+        context_entry.value = value
+      end
+
+      private
+
+      def context_entry
+        ::EacConfig::Node.context.current.entry(full_path)
       end
     end
   end

data/sub/avm/lib/avm/self/instance.rb

@@ -8,6 +8,14 @@ require 'avm/eac_ubuntu_base0/docker_image'
 module Avm
   module Self
     class Instance < ::Avm::Instances::Base
+      DEFAULT_INSTANCE_ID = 'avm_self'
+
+      class << self
+        def default
+          @default ||= by_id(DEFAULT_INSTANCE_ID)
+        end
+      end
+
       def docker_image_class
         ::Avm::Self::DockerImage
       end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -15,6 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
-  s.add_development_dependency 'eac_cli', '~> 0.24', '~> 0.24.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

data/sub/avm-eac_rails_base0/spec/spec_helper.rb

@@ -2,8 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
-
-require 'eac_cli/old_configs_bridge'
-::EacRubyUtils::Rspec.default_setup.stub_eac_config_node do |file|
-  ::EacCli::OldConfigsBridge.new(file)
-end
+::EacRubyUtils::Rspec.default_setup.stub_eac_config_node

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
   s.add_dependency 'colorize', '~> 0.8.1'
-  s.add_dependency 'eac_config', '~> 0.5', '>= 0.5.3'
+  s.add_dependency 'eac_config', '~> 0.7'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'

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

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     class Entry
       class Options
         enable_simple_cache

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

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     class Entry
       module Undefined
         private

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

@@ -5,7 +5,7 @@ require 'eac_config/entry_path'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     class Entry
       require_sub __FILE__, include_modules: true
       enable_listable

data/sub/eac_cli/lib/eac_cli/rspec/setup.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_cli/config/entry'
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker'
+
+module EacCli
+  module Rspec
+    module Setup
+      def disable_input_request
+        disable_config_input_request
+        disable_speaker_input_request
+      end
+
+      def disable_config_input_request
+        rspec_config.before do
+          allow_any_instance_of(::EacCli::Config::Entry).to receive(:input_value) do |obj|
+            raise "Console input requested for entry (Path: #{obj.path})"
+          end
+        end
+      end
+
+      def disable_speaker_input_request
+        ::RSpec.configure do |config|
+          config.around do |example|
+            ::EacRubyUtils::Speaker.context.on(
+              ::EacCli::Speaker.new(err_out: ::StringIO.new, out_out: ::StringIO.new,
+                                    in_in: FailIfRequestInput.new)
+            ) { example.run }
+          end
+        end
+      end
+
+      class FailIfRequestInput
+        %w[gets noecho].each do |method|
+          define_method(method) do
+            raise "Input method requested: #{method}. Should not request input on RSpec."
+          end
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/rspec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_exts'
+
+module EacCli
+  module Rspec
+    require_sub __FILE__
+  end
+end

data/sub/eac_cli/lib/eac_cli/speaker/constants.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/by_reference'
+
+module EacCli
+  class Speaker
+    module Constants
+      STDERR = ::EacRubyUtils::ByReference.new { $stderr }
+      STDIN = ::EacRubyUtils::ByReference.new { $stdin }
+      STDOUT = ::EacRubyUtils::ByReference.new { $stdout }
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/version.rb

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

data/sub/eac_config/lib/eac_config/rspec/setup.rb

@@ -29,10 +29,10 @@ module EacConfig
         ::EacConfig::EnvvarsNode.new.load_path.entry
       end
 
-      def stub_eac_config_node(&node_builder)
+      def stub_eac_config_node(target_example = nil, target_file = nil, &node_builder)
         parent_self = self
-        rspec_config.around do |example|
-          ::EacRubyUtils::Fs::Temp.on_file do |file|
+        (target_example || rspec_config).around do |example|
+          parent_self.stub_eac_config_node_on_file(target_file) do |file|
             ::EacConfig::Node
               .context.on(parent_self.stub_eac_config_node_build(file, &node_builder)) do
               example.run
@@ -44,6 +44,14 @@ module EacConfig
       def stub_eac_config_node_build(file, &node_builder)
         node_builder.present? ? node_builder.call(file) : ::EacConfig::YamlFileNode.new(file)
       end
+
+      def stub_eac_config_node_on_file(target_file)
+        if target_file
+          yield(target_file.to_pathname)
+        else
+          ::EacRubyUtils::Fs::Temp.on_file { |file| yield(file) }
+        end
+      end
     end
   end
 end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.24', '>= 0.24.1'
+  s.add_dependency 'eac_cli', '~> 0.25'
   s.add_dependency 'eac_fs', '~> 0.3'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.70'

data/sub/eac_ruby_base0/lib/eac_ruby_base0/rspec/setup.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyBase0
+  module Rspec
+    module Setup
+      def self.extended(obj)
+        obj.disable_input_request
+        obj.stub_eac_config_node
+      end
+    end
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/rspec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_exts'
+
+module EacRubyBase0
+  module Rspec
+    require_sub __FILE__
+  end
+end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.113.3
+  version: 0.113.4
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -176,20 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
@@ -780,7 +774,6 @@ files:
 - sub/eac_cli/lib/eac_cli/old_configs/password_entry_reader.rb
 - sub/eac_cli/lib/eac_cli/old_configs/read_entry_options.rb
 - sub/eac_cli/lib/eac_cli/old_configs/store_passwords_entry_reader.rb
-- sub/eac_cli/lib/eac_cli/old_configs_bridge.rb
 - sub/eac_cli/lib/eac_cli/parser.rb
 - sub/eac_cli/lib/eac_cli/parser/alternative.rb
 - sub/eac_cli/lib/eac_cli/parser/alternative/argv.rb
@@ -795,6 +788,8 @@ files:
 - sub/eac_cli/lib/eac_cli/patches.rb
 - sub/eac_cli/lib/eac_cli/patches/object.rb
 - sub/eac_cli/lib/eac_cli/patches/object/runner_with.rb
+- sub/eac_cli/lib/eac_cli/rspec.rb
+- sub/eac_cli/lib/eac_cli/rspec/setup.rb
 - sub/eac_cli/lib/eac_cli/runner.rb
 - sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb
 - sub/eac_cli/lib/eac_cli/runner/context.rb
@@ -808,7 +803,7 @@ files:
 - sub/eac_cli/lib/eac_cli/runner_with/subcommands/definition_concern.rb
 - sub/eac_cli/lib/eac_cli/runner_with_set.rb
 - sub/eac_cli/lib/eac_cli/speaker.rb
-- sub/eac_cli/lib/eac_cli/speaker/_constants.rb
+- sub/eac_cli/lib/eac_cli/speaker/constants.rb
 - sub/eac_cli/lib/eac_cli/speaker/list.rb
 - sub/eac_cli/lib/eac_cli/speaker/options.rb
 - sub/eac_cli/lib/eac_cli/version.rb
@@ -1132,6 +1127,8 @@ files:
 - sub/eac_ruby_base0/lib/eac_ruby_base0/patches/class/jobs_runner.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/patches/object.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/patches/object/runner_with.rb
+- sub/eac_ruby_base0/lib/eac_ruby_base0/rspec.rb
+- sub/eac_ruby_base0/lib/eac_ruby_base0/rspec/setup.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb
 - sub/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb

data/sub/eac_cli/lib/eac_cli/old_configs_bridge.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/config'
-require 'eac_config/envvars_node'
-require 'eac_config/yaml_file_node'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class OldConfigsBridge < ::EacCli::Config
-    ENTRY_KEY = 'core.store_passwords'
-
-    class << self
-      def new_configs_path(configs_key, options)
-        options[:storage_path] || ::File.join(ENV['HOME'], '.config', configs_key, 'settings.yml')
-      end
-    end
-
-    def initialize(configs_key, options = {})
-      options.assert_argument(::Hash, 'options')
-      envvar_node = ::EacConfig::EnvvarsNode.new
-      file_node = ::EacConfig::YamlFileNode.new(self.class.new_configs_path(configs_key, options))
-      envvar_node.load_path.push(file_node.url)
-      envvar_node.write_node = file_node
-      super(envvar_node)
-    end
-
-    def read_entry(entry_key, options = {})
-      entry(entry_key, options).value
-    end
-
-    def read_password(entry_key, options = {})
-      entry(entry_key, options.merge(noecho: true, store: store_passwords?)).value
-    end
-
-    def store_passwords?
-      read_entry(ENTRY_KEY, bool: true)
-    end
-  end
-end

data/sub/eac_cli/lib/eac_cli/speaker/_constants.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/by_reference'
-
-module EacCli
-  # https://github.com/fazibear/colorize
-  class Speaker
-    STDERR = ::EacRubyUtils::ByReference.new { $stderr }
-    STDIN = ::EacRubyUtils::ByReference.new { $stdin }
-    STDOUT = ::EacRubyUtils::ByReference.new { $stdout }
-  end
-end