avm-tools 0.101.0 → 0.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5243b812d2aa6e9e61cff80a964aa4b035abd9dd85051f5798fbfc6b1c00486a
-  data.tar.gz: 8c79b0a42a1d863349129e5a2ab8d091f8765abea99815d4f706e64126f843bc
+  metadata.gz: af55442cdb7aacd8752fa1cf1b548fe867d7bdd74dfc9e9abd72d754de22772c
+  data.tar.gz: c9fd2f59d75013325820f1d7ff8c8d54a35c09851a1032ccd31ff95427304a5d
 SHA512:
-  metadata.gz: f1c66dd955e5367563ccad9d9ae5e44946c109b9abf519b3bddb04cd5bda6dcb4b74a6bc4745f1ba7fd400111ab5ce41e5172cd3d28765ea44106531ba8d8644
-  data.tar.gz: 2b7c051160d2c1b549a25b6a620a9458c151b85887c1bcffd859ac4099fd72e57a6d2af17309b293883a1da0b431a64b54e8491446e191efed274f18a2f93dfe
+  metadata.gz: c19e110f9557287b2b84b18385370111d1ba5bb1e99636f2425ab2c6a5729599f7d9bdba985fde3e4b4f7e4aece5614c3e443a4e61150370d9c1f2ac08bf411e
+  data.tar.gz: 87dfc0c5042d2c0deba256ad7e7869bf4b547f48c1376f9e25114834e739b6e3d6be7c49cc03d3975128fd27de2b586f933f0f8fd67edffdd5350824f49208eb

data/lib/avm/app_src.rb

@@ -2,6 +2,7 @@
 
 require 'avm/apps/sources/configuration'
 require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 require 'i18n'
@@ -27,7 +28,7 @@ module Avm
     end
 
     def run_job(job, job_args = [])
-      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+      stereotypes_jobs(job, job_args).each(&:run)
     end
 
     private
@@ -37,14 +38,14 @@ module Avm
       ::Avm::Apps::Sources::Configuration.find_in_path(path)
     end
 
-    def run_stereotype_job(stereotype, job, job_args)
+    def stereotypes_jobs(job, job_args)
       job_class_method = "#{job}_class"
-      if stereotype.send(job_class_method).present?
-        puts stereotype.label + ": #{job} class found. Running..."
-        stereotype.send(job_class_method).new(self, *job_args).run
-      else
-        puts stereotype.label + ": #{job} class not found"
+      r = []
+      stereotypes.each do |stereotype|
+        r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
       end
+      r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
     end
 
     def stereotypes_uncached

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -17,7 +17,7 @@ module Avm
               return nil unless file.commits.any?
 
               commits_banner
-              request_input('Which commit?', list: commits_by_position).if_present do |v|
+              input('Which commit?', list: commits_by_position).if_present do |v|
                 new_commit_info.fixup(v)
               end
             end

data/lib/avm/git/issue/complete.rb

@@ -12,7 +12,7 @@ module Avm
     module Issue
       class Complete
         include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        enable_speaker
 
         attr_reader :skip_validations
 

data/lib/avm/git/revision_test.rb

@@ -13,12 +13,8 @@ module Avm
 
       def banner
         infov 'Revision to test', sha1
-        on_speaker_node do |node|
-          node.stderr_line_prefix = '  '
-          infov '* Subject', commit.subject
-          infov '* Success?', successful_label
-          infov '* STDOUT', stdout_cache.content_path
-          infov '* STDERR', stderr_cache.content_path
+        ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
+          revision_banner
         end
       end
 
@@ -49,6 +45,13 @@ module Avm
         ::File.expand_path(git.to_s)
       end
 
+      def revision_banner
+        infov '* Subject', commit.subject
+        infov '* Success?', successful_label
+        infov '* STDOUT', stdout_cache.content_path
+        infov '* STDERR', stderr_cache.content_path
+      end
+
       def root_cache
         ::Avm.fs_cache.child('git', 'revision_test', git_absolute_path.parameterize, sha1,
                              options.fetch(:test_command).to_s.parameterize)

data/lib/avm/launcher/context.rb

@@ -13,7 +13,7 @@ module Avm
   module Launcher
     class Context
       include ::EacRubyUtils::SimpleCache
-      include ::EacCli::Speaker
+      enable_speaker
 
       DEFAULT_PROJECTS_ROOT = '.'
       DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')

data/lib/avm/launcher/git/publish_base.rb

@@ -10,7 +10,7 @@ module Avm
     module Git
       class PublishBase < ::Avm::Launcher::Publish::Base
         include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        enable_speaker
 
         CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                       local_following].freeze

data/lib/avm/launcher/instances/base.rb

@@ -2,6 +2,7 @@
 
 require_relative 'base/cache'
 require 'avm/launcher/errors/non_project'
+require 'eac_ruby_utils/speaker/sender'
 
 module Avm
   module Launcher
@@ -10,7 +11,7 @@ module Avm
         class << self
           def extend_object(object)
             object.extend ::EacRubyUtils::SimpleCache
-            object.extend ::EacCli::Speaker
+            object.extend ::EacRubyUtils::Speaker::Sender
             object.extend ::Avm::Launcher::Instances::Base::Cache
             super
           end

data/lib/avm/launcher/ruby/gem/build.rb

@@ -10,7 +10,7 @@ module Avm
     module Ruby
       module Gem
         class Build
-          include ::EacCli::Speaker
+          enable_speaker
 
           def initialize(original_gem_root)
             @original_gem_root = original_gem_root

data/lib/avm/projects/stereotype/job_comparator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotype
+      class JobComparator
+        common_constructor :job1, :job2
+
+        def result
+          return -1 if run_before?(job1, job2)
+          return 1 if run_before?(job2, job1)
+
+          job1.object_id <=> job2.class.name
+        end
+
+        private
+
+        def run_before?(a_job, other_job)
+          return false unless a_job.respond_to?(:run_before)
+
+          a_job.run_before.map(&:to_sym).include?(job_stereotype_key(other_job))
+        end
+
+        def job_stereotype_key(job)
+          job.class.name.split('::')[0..-2].join('::').demodulize.variableize.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git/update.rb

@@ -19,8 +19,7 @@ module Avm
             clean_all
             selected_subrepos.map do |f|
               infov 'Subrepo', f
-              on_speaker_node do |node|
-                node.stderr_line_prefix = '  '
+              ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
                 ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
               end
             end

data/lib/avm/projects/stereotypes/ruby_gem/publish.rb

@@ -15,7 +15,7 @@ module Avm
       class RubyGem
         class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacCli::Speaker
+          enable_speaker
 
           protected
 

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -19,6 +19,10 @@ module Avm
             gemfile_lock_commit
           end
 
+          def run_before
+            [:git]
+          end
+
           private
 
           def bundle_update

data/lib/avm/tools/runner/app_src/version_bump.rb

@@ -44,7 +44,7 @@ module Avm
           end
 
           def confirm?
-            parsed.yes? || request_input('Confirm version bump?', bool: true)
+            parsed.yes? || input('Confirm version bump?', bool: true)
           end
 
           def current_version_uncached

data/lib/avm/tools/runner/git/organize.rb

@@ -58,7 +58,7 @@ module Avm
             return true if parsed.yes?
             return false if parsed.no?
 
-            request_input('Confirm operations?', bool: true)
+            input('Confirm operations?', bool: true)
           end
 
           def repository_uncached

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.101.0'
+    VERSION = '0.102.0'
   end
 end

data/vendor/avm-apps/avm-apps.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.58', '>= 0.58.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'docopt', '~> 0.6.1'
   s.add_dependency 'eac_config', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.64'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -10,7 +10,7 @@ module EacCli
       require_sub __FILE__, include_modules: true
       enable_listable
       enable_simple_cache
-      include ::EacCli::Speaker
+      enable_speaker
 
       common_constructor :config, :path, :options do
         self.path = ::EacConfig::EntryPath.assert(path)

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

@@ -18,7 +18,7 @@ module EacCli
         end
 
         def undefined_value_no_loop
-          request_input("Value for entry \"#{path}\"", options.request_input_options)
+          input("Value for entry \"#{path}\"", options.request_input_options)
         end
       end
     end

data/vendor/eac_cli/lib/eac_cli/old_configs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_cli/patches/module/speaker'
 
 module EacCli
   class OldConfigs

data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb

@@ -70,8 +70,8 @@ module EacCli
       end
 
       def entry_value_from_input(entry_key, options)
-        entry_value = request_input("Value for entry \"#{entry_key}\"",
-                                    options.request_input_options)
+        entry_value = input("Value for entry \"#{entry_key}\"",
+                            options.request_input_options)
         warn('Entered value is blank') if entry_value.blank?
         entry_value
       end

data/vendor/eac_cli/lib/eac_cli/speaker.rb

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
 require 'colorize'
-require 'io/console'
-require 'eac_ruby_utils/patches/hash/options_consumer'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub __FILE__
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker/receiver'
 
 module EacCli
-  # https://github.com/fazibear/colorize
-  module Speaker
-    def on_speaker_node(&block)
-      ::EacCli::Speaker.on_node(&block)
+  class Speaker
+    require_sub __FILE__, include_modules: true
+    include ::EacRubyUtils::Speaker::Receiver
+
+    common_constructor :options, default: [{}] do
+      self.options = self.class.lists.option.hash_keys_validate!(options)
     end
 
     def puts(string = '')
       string.to_s.each_line do |line|
-        current_node.stderr.puts(current_node.stderr_line_prefix.to_s + line)
+        err_out.puts(err_line_prefix.to_s + line)
       end
     end
 
     def out(string = '')
-      current_node.stdout.write(string.to_s)
+      out_out.write(string.to_s)
     end
 
     def fatal_error(string)
@@ -52,7 +52,7 @@ module EacCli
     #   +bool+ ([Boolean], default: +false+): requires a answer "yes" or "no".
     #   +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
     #   +noecho+ ([Boolean], default: +false+): does not output answer.
-    def request_input(question, options = {})
+    def input(question, options = {})
       bool, list, noecho = options.to_options_consumer.consume_all(:bool, :list, :noecho)
       if list
         request_from_list(question, list, noecho)
@@ -110,22 +110,18 @@ module EacCli
     end
 
     def request_string(question, noecho)
-      current_node.stderr.write "#{question}: ".to_s.yellow
+      err_out.write "#{question}: ".to_s.yellow
       noecho ? request_string_noecho : request_string_echo
     end
 
     def request_string_noecho
-      r = current_node.stdin.noecho(&:gets).chomp.strip
-      current_node.stderr.write("\n")
+      r = in_in.noecho(&:gets).chomp.strip
+      err_out.write("\n")
       r
     end
 
     def request_string_echo
-      current_node.stdin.gets.chomp.strip
-    end
-
-    def current_node
-      ::EacCli::Speaker.current_node
+      in_in.gets.chomp.strip
     end
   end
 end

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

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

data/vendor/eac_cli/lib/eac_cli/speaker/list.rb

@@ -4,7 +4,7 @@ require 'active_support/hash_with_indifferent_access'
 require 'ostruct'
 
 module EacCli
-  module Speaker
+  class Speaker
     class List
       class << self
         def build(list)

data/vendor/eac_cli/lib/eac_cli/speaker/options.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Speaker
+    module Options
+      common_concern do
+        enable_listable
+        lists.add_symbol :option, :out_out, :err_out, :in_in, :parent, :err_line_prefix
+      end
+
+      def err_out
+        option(OPTION_ERR_OUT, ::EacCli::Speaker::STDERR)
+      end
+
+      def out_out
+        option(OPTION_OUT_OUT, ::EacCli::Speaker::STDOUT)
+      end
+
+      def in_in
+        option(OPTION_IN_IN, ::EacCli::Speaker::STDIN)
+      end
+
+      def err_line_prefix
+        option(OPTION_ERR_LINE_PREFIX, '')
+      end
+
+      def parent
+        options[OPTION_PARENT]
+      end
+
+      def option(key, default)
+        options[key] || parent.if_present(default) { |v| v.send(__METHOD__) }
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/version.rb

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

data/vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb

@@ -3,23 +3,19 @@
 require 'eac_cli/speaker'
 
 RSpec.describe ::EacCli::Speaker do
-  let(:instance) do
-    r = ::Object.new
-    r.extend(described_class)
-    r
-  end
+  let(:instance) { described_class.new }
 
-  describe '#request_input' do
+  describe '#input' do
     it 'recover value from hash list' do
       allow(instance).to receive(:request_string).and_return('opt1')
       list = { opt1: 'value1', opt2: 'value2' }
-      expect(instance.request_input('Question', list: list)).to eq('value1')
+      expect(instance.input('Question', list: list)).to eq('value1')
     end
 
     it 'recover value from array list' do
       allow(instance).to receive(:request_string).and_return('OPT1')
       list = %w[opt1 opt2]
-      expect(instance.request_input('Question', list: list)).to eq('opt1')
+      expect(instance.input('Question', list: list)).to eq('opt1')
     end
 
     {
@@ -28,7 +24,7 @@ RSpec.describe ::EacCli::Speaker do
       context "when bool: true and input is \"#{input}\"" do
         it "return #{expected}" do
           allow(instance).to receive(:request_string).and_return(input)
-          expect(instance.request_input('Question', bool: true)).to eq(expected)
+          expect(instance.input('Question', bool: true)).to eq(expected)
         end
       end
     end

data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.15', '>= 0.15.1'
+  s.add_dependency 'eac_cli', '~> 0.20'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.64'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
   module Runner
@@ -20,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
@@ -48,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/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb

@@ -22,7 +22,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
         )

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

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

data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['{spec}/**/*', '.rspec']
 
   s.add_dependency 'bundler', '~> 2.2', '>= 2.2.17'
-  s.add_dependency 'eac_ruby_utils', '~> 0.29'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
   # Tests
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module EacRubyGemsUtils
   module Tests
     class Multiple

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/speaker/sender'
+
+class Module
+  def enable_speaker
+    include ::EacRubyUtils::Speaker::Sender
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/contextualizable'
+
+module EacRubyUtils
+  module Speaker
+    include ::EacRubyUtils::Contextualizable
+
+    class << self
+      # @return [EacRubyUtils::Speaker::Receiver]
+      def current_receiver
+        context.current
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/abstract_methods'
+
+module EacRubyUtils
+  module Speaker
+    module Receiver
+      extend ::EacRubyUtils::AbstractMethods
+
+      def error(_string)
+        raise_abstract_method(__FILE__)
+      end
+
+      def fatal_error(string)
+        error(string)
+        ::Kernel.exit 1 # rubocop:disable Rails/Exit
+      end
+
+      # @see EacRubyUtils::Speaker::Sender.input
+      def input(_question, _options = {})
+        raise_abstract_method(__FILE__)
+      end
+
+      def info(_string)
+        raise_abstract_method(__FILE__)
+      end
+
+      def infom(_string)
+        raise_abstract_method(__FILE__)
+      end
+
+      def infov(*_args)
+        raise_abstract_method(__FILE__)
+      end
+
+      def out(_string = '')
+        raise_abstract_method(__FILE__)
+      end
+
+      def puts(_string = '')
+        raise_abstract_method(__FILE__)
+      end
+
+      def success(_string)
+        raise_abstract_method(__FILE__)
+      end
+
+      def title(_string)
+        raise_abstract_method(__FILE__)
+      end
+
+      def warn(_string)
+        raise_abstract_method(__FILE__)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Speaker
+    module Sender
+      delegate :error, :fatal_error, :info, :infom, :title, :success, :warn, to: :speaker_receiver
+
+      def infov(*args)
+        speaker_receiver.infov(*args)
+      end
+
+      delegate :out, to: :speaker_receiver
+
+      delegate :puts, to: :speaker_receiver
+
+      # Shortcut to [EacRubyUtils::Speaker.current_receiver].
+      #
+      # @return [EacRubyUtils::Speaker::Receiver]
+      def speaker_receiver
+        ::EacRubyUtils::Speaker.current_receiver
+      end
+
+      # Options:
+      #   +bool+ ([Boolean], default: +false+): requires a answer "yes" or "no".
+      #   +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
+      #   +noecho+ ([Boolean], default: +false+): does not output answer.
+      def input(question, options = {})
+        speaker_receiver.input(question, options)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.66.0'
+  VERSION = '0.67.0'
 end

data/vendor/{eac_cli/spec/lib → eac_ruby_utils/spec/lib/eac_ruby_utils/patches}/module/speaker_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_cli/patches/module/speaker'
+require 'eac_ruby_utils/patches/module/speaker'
 
 RSpec.describe ::Module do
   class StubClass # rubocop:disable RSpec/LeakyConstantDeclaration
@@ -8,6 +8,6 @@ RSpec.describe ::Module do
   end
 
   describe '#enable_speaker' do
-    it { expect(StubClass.included_modules).to include(::EacCli::Speaker) }
+    it { expect(StubClass.included_modules).to include(::EacRubyUtils::Speaker::Sender) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.101.0
+  version: 0.102.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -549,6 +549,7 @@ files:
 - lib/avm/postgresql/instance_with.rb
 - lib/avm/projects.rb
 - lib/avm/projects/stereotype.rb
+- lib/avm/projects/stereotype/job_comparator.rb
 - lib/avm/projects/stereotypes.rb
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
@@ -756,8 +757,6 @@ files:
 - vendor/eac_cli/lib/eac_cli/parser/collector.rb
 - vendor/eac_cli/lib/eac_cli/parser/error.rb
 - vendor/eac_cli/lib/eac_cli/patches.rb
-- vendor/eac_cli/lib/eac_cli/patches/module.rb
-- vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb
 - vendor/eac_cli/lib/eac_cli/patches/object.rb
 - vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner.rb
@@ -771,10 +770,9 @@ files:
 - vendor/eac_cli/lib/eac_cli/runner_with/subcommands/definition_concern.rb
 - vendor/eac_cli/lib/eac_cli/runner_with_set.rb
 - vendor/eac_cli/lib/eac_cli/speaker.rb
-- vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb
 - vendor/eac_cli/lib/eac_cli/speaker/_constants.rb
 - vendor/eac_cli/lib/eac_cli/speaker/list.rb
-- vendor/eac_cli/lib/eac_cli/speaker/node.rb
+- vendor/eac_cli/lib/eac_cli/speaker/options.rb
 - vendor/eac_cli/lib/eac_cli/version.rb
 - vendor/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb
@@ -785,7 +783,6 @@ files:
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/speaker_spec.rb
-- vendor/eac_cli/spec/lib/module/speaker_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
 - vendor/eac_cli/spec/spec_helper.rb
 - vendor/eac_config/Gemfile
@@ -1203,6 +1200,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/speaker.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb
@@ -1230,6 +1228,9 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/receiver.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/speaker/sender.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb
@@ -1256,6 +1257,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/sym_keys_hash_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/listable_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/simple_cache_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/speaker_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/if_present_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec_files/path/my_stub_with_template
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/pathname/basename_sub_spec.rb

data/vendor/eac_cli/lib/eac_cli/patches/module.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/patch'
-
-class Module
-  def enable_speaker
-    ::EacRubyUtils.patch(self, ::EacCli::Speaker)
-  end
-end

data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/speaker/node'
-
-module EacCli
-  module Speaker
-    class << self
-      def current_node
-        nodes_stack.last
-      end
-
-      def on_node(&block)
-        push
-        yield(*(block.arity.zero? ? [] : [current_node]))
-      ensure
-        pop
-      end
-
-      def push
-        nodes_stack << ::EacCli::Speaker::Node.new
-        current_node
-      end
-
-      def pop
-        return nodes_stack.pop if nodes_stack.count > 1
-
-        raise "Cannot remove first node (nodes_stack.count: #{nodes_stack.count})"
-      end
-
-      private
-
-      def nodes_stack
-        @nodes_stack ||= [::EacCli::Speaker::Node.new]
-      end
-    end
-  end
-end

data/vendor/eac_cli/lib/eac_cli/speaker/node.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/patches/object/if_present'
-require 'eac_cli/speaker/_constants'
-
-module EacCli
-  module Speaker
-    class Node
-      attr_accessor :stdin, :stdout, :stderr, :stderr_line_prefix
-
-      def initialize(parent = nil)
-        self.stdin = parent.if_present(::EacCli::Speaker::STDIN, &:stdin)
-        self.stdout = parent.if_present(::EacCli::Speaker::STDOUT, &:stdout)
-        self.stderr = parent.if_present(::EacCli::Speaker::STDERR, &:stderr)
-        self.stderr_line_prefix = parent.if_present('', &:stderr_line_prefix)
-      end
-
-      def configure
-        yield(self)
-        self
-      end
-    end
-  end
-end