avm-tools 0.113.2 → 0.113.6

data/sub/avm-git/avm-git.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'avm-files', '~> 0.1'
-  s.add_dependency 'eac_git', '~> 0.9'
+  s.add_dependency 'eac_git', '~> 0.11'
   s.add_dependency 'eac_ruby_utils', '~> 0.76'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/issue/complete/commits.rb

@@ -15,7 +15,7 @@ module Avm
             return [] unless branch_hash && follow_master?
 
             interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
-            @git.execute!('rev-list', interval).each_line.map(&:strip)
+            launcher_git.execute!('rev-list', interval).each_line.map(&:strip)
           end
 
           def bifurcations_result
@@ -32,8 +32,8 @@ module Avm
           end
 
           def commit_parents(commit)
-            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
-                .select(&:present?)
+            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                        .select(&:present?)
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/git_subrepos.rb

@@ -12,7 +12,7 @@ module Avm
             return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
 
             infom 'Checking Git subrepos...'
-            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
             r.check_remote = true
             r.result
           end

data/sub/avm-git/lib/avm/git/issue/complete/local_branch.rb

@@ -7,16 +7,21 @@ module Avm
     module Issue
       class Complete
         module LocalBranch
+          NO_CURRENT_BRANCH_NAME = 'none'
+
+          # Retrieves the current local branch.
+          #
+          # @return [EacGit::Local::Branch, nil]
           def branch_uncached
-            @git.current_branch
+            eac_git.current_branch
           end
 
           def branch_hash_uncached
-            @git.rev_parse("refs/heads/#{branch}")
+            branch.if_present(&:current_commit_id)
           end
 
           def branch_name
-            branch.split('/')[-1]
+            branch.if_present(NO_CURRENT_BRANCH_NAME, &:name)
           end
 
           def branch_name_result
@@ -38,14 +43,16 @@ module Avm
           end
 
           def follow_master?
-            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+            remote_master_hash ? launcher_git.descendant?(branch_hash, remote_master_hash) : true
           end
 
           def remove_local_branch
+            return unless branch
+
             info 'Removendo branch local...'
             bn = branch_name
-            git(['checkout', branch_hash])
-            git(['branch', '-D', bn])
+            git_execute(['checkout', branch_hash])
+            git_execute(['branch', '-D', bn])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/local_tag.rb

@@ -18,7 +18,7 @@ module Avm
 
           def delete_tag
             info 'Removendo tag...'
-            git(['tag', '-d', branch_name])
+            git_execute(['tag', '-d', branch_name])
           end
 
           def tag
@@ -26,11 +26,11 @@ module Avm
           end
 
           def tag_hash
-            @git.rev_parse(tag)
+            launcher_git.rev_parse(tag)
           end
 
           def create_tag
-            git(['tag', branch_name, branch_hash])
+            git_execute(['tag', branch_name, branch_hash])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/push.rb

@@ -12,13 +12,7 @@ module Avm
           def dry_push_result
             return ::Avm::Result.error('Nothing to push') if pushs.empty?
 
-            r = @git.execute(dry_push_args)
-            message = if r.fetch(:exit_code).zero?
-                        'ok'
-                      else
-                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
-                      end
-            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+            dry_push_execution_result
           end
 
           def push
@@ -26,7 +20,7 @@ module Avm
               info 'PUSH: Nada a enviar'
             else
               info "PUSH: enviando \"#{pushs}\"..."
-              git(%w[push origin] + pushs)
+              git_execute(%w[push origin] + pushs)
             end
           end
 
@@ -39,7 +33,7 @@ module Avm
           end
 
           def remove_branch_push
-            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+            remote_branch_hash ? ":refs/heads/#{branch.name}" : nil
           end
 
           def tag_push
@@ -47,6 +41,18 @@ module Avm
 
             "#{branch_hash}:#{tag}"
           end
+
+          private
+
+          def dry_push_execution_result
+            r = launcher_git.execute(dry_push_args)
+            message = if r.fetch(:exit_code).zero?
+                        'ok'
+                      else
+                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
+                      end
+            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+          end
         end
       end
     end

data/sub/avm-git/lib/avm/git/issue/complete/remote.rb

@@ -10,7 +10,7 @@ module Avm
           end
 
           def remote_branch_hash
-            remote_hashs["refs/heads/#{branch}"]
+            remote_hashs["refs/heads/#{branch.name}"]
           end
 
           def remote_tag_hash
@@ -24,7 +24,7 @@ module Avm
           end
 
           def remote_hashs_uncached
-            @git.remote_hashs(remote_name)
+            launcher_git.remote_hashs(remote_name)
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/test.rb

@@ -28,7 +28,7 @@ module Avm
 
           def test_performer
             ::Avm::Sources::Tests::Builder
-              .new(::Avm::Registry.sources.detect(@git))
+              .new(::Avm::Registry.sources.detect(launcher_git))
               .include_main(true)
               .include_subs(true)
               .performer

data/sub/avm-git/lib/avm/git/issue/complete/tracker.rb

@@ -19,7 +19,7 @@ module Avm
           end
 
           def branch_short_hash
-            git(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
+            git_execute(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/validation.rb

@@ -11,6 +11,8 @@ module Avm
           enable_simple_cache
           common_constructor :parent, :key, :label
 
+          SKIPPED_RESULT_MESSAGE = 'skipped'
+
           def skip?
             parent.skip_validations.include?(key)
           end
@@ -18,11 +20,17 @@ module Avm
           private
 
           def result_uncached
-            if skip?
-              ::Avm::Result.neutral('skipped')
-            else
-              parent.send("#{key}_result")
-            end
+            skip? ? skipped_result : validation_result
+          end
+
+          def skipped_result
+            ::Avm::Result.neutral(SKIPPED_RESULT_MESSAGE)
+          end
+
+          def validation_result
+            parent.send("#{key}_result")
+          rescue ::RuntimeError => e
+            ::Avm::Result.error("error raised: #{e.message}")
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/working_tree.rb

@@ -10,7 +10,7 @@ module Avm
           end
 
           def clean_workspace?
-            @git.dirty_files.none?
+            launcher_git.dirty_files.none?
           end
         end
       end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
+require 'eac_git/local'
 
 module Avm
   module Git
@@ -10,14 +11,15 @@ module Avm
         enable_simple_cache
         enable_speaker
 
-        attr_reader :skip_validations
+        BRANCH_NAME_ISSUE_ID_PATTERN =
+
+          attr_reader :dir, :skip_validations
 
         def initialize(options)
           consumer = ::EacRubyUtils::OptionsConsumer.new(options)
-          dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
+          @dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
           validate_skip_validations
           consumer.validate
-          @git = ::Avm::Launcher::Git::Base.new(dir)
         end
 
         def start_banner
@@ -35,16 +37,29 @@ module Avm
         end
 
         def issue_id
-          m = branch_name.match(/\A#{Regexp.quote('issue_')}(\d+)\z/)
-          m ? m[1].to_i : nil
+          branch ? issue_id_parser.parse(branch_name) : nil
+        end
+
+        # @return [EacRubyUtils::RegexpParser]
+        def issue_id_parser
+          /\A#{Regexp.quote('issue_')}(\d+)\z/.to_parser { |m| m[1].to_i }
         end
 
         private
 
-        def git(args, exit_outputs = {})
-          r = @git.execute!(args, exit_outputs: exit_outputs)
+        # @return [EacGit::Local]
+        def eac_git_uncached
+          ::EacGit::Local.new(dir)
+        end
+
+        def git_execute(args, exit_outputs = {})
+          r = launcher_git.execute!(args, exit_outputs: exit_outputs)
           r.is_a?(String) ? r.strip : r
         end
+
+        def launcher_git_uncached
+          ::Avm::Launcher::Git::Base.new(dir)
+        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -13,8 +13,8 @@ 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_ruby_utils', '~> 0.80'
+  s.add_dependency 'eac_config', '~> 0.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.83'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
 end

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
@@ -24,6 +24,10 @@ module EacCli
         input_value
       end
 
+      def secret_value
+        self.class.new(config, path, options.merge(noecho: true)).value
+      end
+
       delegate :found?, :value=, to: :sub_entry
 
       private

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

@@ -0,0 +1,42 @@
+# 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(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.26.0'
 end

data/sub/eac_config/eac_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'addressable'
-  s.add_dependency 'eac_ruby_utils', '~> 0.81'
+  s.add_dependency 'eac_ruby_utils', '~> 0.83'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
 end

data/sub/eac_config/lib/eac_config/entry.rb

@@ -18,6 +18,10 @@ module EacConfig
       node_entry.if_present(&:node)
     end
 
+    def secret_value
+      node_entry.if_present(&:secret_value)
+    end
+
     def value
       node_entry.if_present(&:value)
     end

data/sub/eac_config/lib/eac_config/node_entry.rb

@@ -14,5 +14,9 @@ module EacConfig
     end
 
     abstract_methods :found?, :value, :value=
+
+    def secret_value
+      value
+    end
   end
 end

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

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
 require 'eac_config/envvars_node'
+require 'eac_config/node'
+require 'eac_config/yaml_file_node'
 
 module EacConfig
   module Rspec
@@ -25,6 +28,38 @@ module EacConfig
       def envvars_load_path_entry
         ::EacConfig::EnvvarsNode.new.load_path.entry
       end
+
+      # Wraps a RSpec example in a EacConfig node using a alternative file.
+      #
+      # @param target_example [RSpec::Core::ExampleGroup] The example to wrap. If not provided,
+      #   it is applied to all examples.
+      # @param target_file [Pathname] The file used by the EacConfig node. If not provided, a
+      #   temporary file is used.
+      # @param node_builder [Proc] Should return the desired EacConfig node. If not provided, a
+      #   EacConfig::YamlFileNode is created.
+      def stub_eac_config_node(target_example = nil, target_file = nil, &node_builder)
+        parent_self = self
+        (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
+            end
+          end
+        end
+      end
+
+      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.5.3'
+  VERSION = '0.8.0'
 end

data/sub/eac_fs/lib/eac_fs/logs/file.rb

@@ -11,6 +11,12 @@ module EacFs
       TRUNCATE_DEFAULT_LENGTH = 1000
       TRUNCATE_APPEND_TEXT = '(...) '
 
+      delegate :remove, to: :file
+
+      def clean
+        file.truncate(0) if file.exist?
+      end
+
       def file_size
         file.file? ? file.size : 0
       end

data/sub/eac_fs/lib/eac_fs/logs.rb

@@ -23,6 +23,11 @@ module EacFs
       self
     end
 
+    # @return [EacFs::Logs]
+    def clean_all
+      log_set.values.each(&:clean)
+    end
+
     # @return [EacFs::Logs]
     def remove_all
       log_set.each_key { |label| remove(label) }

data/sub/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/sub/eac_git/eac_git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,vendor}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.74'
+  s.add_dependency 'eac_ruby_utils', '~> 0.83'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.2'

data/sub/eac_git/lib/eac_git/local/branch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Branch
+      REFS_PREFIX = 'refs/heads/'
+
+      common_constructor :local, :name
+
+      # @return [String]
+      def current_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @return [Boolean]
+      def exist?
+        local.command('show-ref', '--quiet', full_ref_name).execute.fetch(:exit_code).zero?
+      end
+
+      def full_ref_name
+        "#{REFS_PREFIX}#{name}"
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/local.rb

@@ -30,6 +30,14 @@ module EacGit
       root_path <=> other.root_path
     end
 
+    # Retrieves a local branch.
+    #
+    # @param name [String] Ex.: for "refs/heads/master", name should be "master".
+    # @return [EacGit::Local::Branch]
+    def branch(name)
+      ::EacGit::Local::Branch.new(self, name)
+    end
+
     def commit(ref, required = false)
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
@@ -44,6 +52,16 @@ module EacGit
       source.to_s.strip.if_present(nil) { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
+    # Retrieves the current local branch.
+    #
+    # @return [EacGit::Local::Branch, nil]
+    def current_branch
+      command('symbolic-ref', '--quiet', HEAD_REFERENCE)
+        .execute!(exit_outputs: { 256 => '' })
+        .gsub(%r{\Arefs/heads/}, '').strip
+        .if_present { |v| branch(v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?

data/sub/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.10.0'
+  VERSION = '0.11.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.26'
   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'