avm-tools 0.94.0 → 0.94.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c0c0b3a077d30739e756476f997c1d74acc2f6cbf52ba89ca55efecc87879a
-  data.tar.gz: e26b9535c059c92e9a401db8552d33ca16f8ee38bf9743100cb61cbcf2d27c39
+  metadata.gz: dce4ced28e926994fcd39732b69129d78a0a84b4fa7327d4f717a8ea218be36e
+  data.tar.gz: 0561dd8132497d54f2eecb2b933968aca705c3976a6ae198d8394257bf9f0d29
 SHA512:
-  metadata.gz: ce8b71b8307d328e7a8ecb64d6c860eea72a47c22a769de30c101686b7089b9e6ee1d05a932c311139e3ba554bff03fae9d091cd9c1eb97ae2cb6d8135e8ee6b
-  data.tar.gz: eb891b911edc41e6989ab28f59f79b47e9d49ad18454cb8178a49f3e87f79f3b36206057476aa524d7a197d333228f551dfcce43553ae4aac2369382e62b94bf
+  metadata.gz: a63ff3adcd87aeaddcfee5045359c45d232bbc4d8d3dd4774a75d07feabc34493ee6432fe52a0b95e10aed80a3603a71f23dcfc5ae478e0dfd07cc331aeccfb1
+  data.tar.gz: 83e4d3667c0f4dbe11c3421a27f786dce65cd698c0c1867d23dc16191c13c6cbc6574be40aa9c9728b4c69a72e267792ad6de892da13c0d34df0c864142e4f13

data/lib/avm/git/file_auto_fixup.rb

@@ -11,7 +11,7 @@ module Avm
       enable_listable
 
       common_constructor :git, :path, :rules do
-        self.path = path.to_pathname
+        self.path = path.to_pathname.expand_path(git.root_path)
       end
 
       COMMITS_SEARCH_INTERVAL = 'origin/master..HEAD'
@@ -44,11 +44,21 @@ module Avm
         return false if commit_info.blank?
 
         infov '  Commit arguments', ::Shellwords.join(commit_args)
-        git.execute!('commit', *commit_args)
+        run_git_add_and_commit
         success '  Commited'
         true
       end
 
+      def run_git_add_and_commit
+        git.execute!('reset', '--soft', 'HEAD')
+        if path.exist?
+          git.execute!('add', git_relative_path)
+        else
+          git.execute!('rm', '-f', git_relative_path)
+        end
+        git.execute!('commit', *commit_args)
+      end
+
       def commits_uncached
         git.execute!('log', '--pretty=format:%H', COMMITS_SEARCH_INTERVAL, '--', path)
            .each_line.map { |sha1| ::Avm::Git::Commit.new(git, sha1.strip) }

data/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -30,7 +30,7 @@ module Avm
               local_repos.dirty_files.each do |file|
                 infov '  * Ammending', file.path
                 ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path,
-                                              ::Avm::Git::FileAutoFixup::OPTION_UNIQUE => true).run
+                                              [::Avm::Git::AutoCommit::Rules::Unique.new]).run
               end
             end
 

data/lib/avm/tools/runner/local_project/ruby.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
@@ -11,9 +9,7 @@ module Avm
       class LocalProject
         class Ruby
           require_sub __FILE__
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'Ruby utitilies for local projects.'
             subcommands
           end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.94.0'
+    VERSION = '0.94.1'
   end
 end

data/vendor/eac_cli/lib/eac_cli/core_ext.rb

@@ -2,3 +2,5 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/patches'
+
+::EacCli::RunnerWithSet.default.add_namespace(::EacCli::RunnerWith)

data/vendor/eac_cli/lib/eac_cli/parser/alternative/short_options.rb

@@ -14,7 +14,9 @@ module EacCli
         end
 
         def find_short_option(char)
-          alternative.options.find { |option| short_without_prefix(option.short) == char }
+          alternative.options.find do |option|
+            short_without_prefix(option.short).if_present(false) { |v| v == char }
+          end
         end
 
         def short_option_collect_argv_value
@@ -37,7 +39,7 @@ module EacCli
         end
 
         def short_without_prefix(short)
-          short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
+          short.to_s.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
         end
       end
     end

data/vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/runner'
 require 'eac_cli/runner_with'
+require 'eac_cli/runner_with_set'
 
 class Object
   def runner_with(*runners, &block)
@@ -10,7 +11,7 @@ class Object
     enable_simple_cache
     enable_console_speaker
     runners.each do |runner|
-      include runner_with_to_module(runner)
+      include ::EacCli::RunnerWithSet.default.item_to_module(runner)
     end
     runner_definition(&block) if block
   end

data/vendor/eac_cli/lib/eac_cli/runner_with_set.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module EacCli
+  class RunnerWithSet
+    class << self
+      def default
+        @default ||= new
+      end
+    end
+
+    def add_namespace(namespace)
+      namespace = sanitize_namespace(namespace)
+      raise "\"#{namespace}\" already was included" if namespace_set.include?(namespace)
+
+      namespace_set << namespace
+      self
+    end
+
+    def item_to_module(item)
+      item.is_a?(::Module) ? item : key_to_module(item)
+    end
+
+    def namespaces
+      namespace_set.dup
+    end
+
+    private
+
+    def namespace_set
+      @namespace_set ||= ::Array.new
+    end
+
+    def key_to_module(key)
+      namespace_set.lazy
+                   .map { |namespace| key_to_module_in_namespace(namespace, key) }
+                   .find(&:present?) ||
+        raise("Not module found with key \"#{key}\" (Namespaces: #{namespace_set})")
+    end
+
+    def key_to_module_in_namespace(namespace, key)
+      namespace.const_get(key.to_s.camelize)
+    rescue ::NameError
+      nil
+    end
+
+    def sanitize_namespace(source)
+      source.is_a?(::Module) ? source : source.to_s.constantize
+    end
+  end
+end

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

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

data/vendor/eac_git/lib/eac_git/local/dirty_files.rb

@@ -20,9 +20,8 @@ module EacGit
       end
 
       def dirty_files
-        command('status', '--porcelain', '--untracked-files').execute!.each_line.map do |line|
-          parse_status_line(line.gsub(/\n\z/, ''))
-        end
+        command('status', '--porcelain=v1', '--untracked-files', '--no-renames')
+          .execute!.each_line.map { |line| parse_status_line(line.gsub(/\n\z/, '')) }
       end
 
       private

data/vendor/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_ruby_base0/patches'

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/settings_provider'
+
+module EacRubyBase0
+  module JobsRunner
+    common_concern do
+      include ::EacRubyUtils::Console::Speaker
+      include ::EacRubyUtils::SettingsProvider
+    end
+
+    def run_job(job)
+      return unless run_job?(job)
+
+      infom "Running job \"#{job}\"..."
+      send(job)
+    end
+
+    def run_job?(job)
+      the_method = "run_#{job}?"
+      respond_to?(the_method, true) ? send(the_method) : true
+    end
+
+    def run_jobs(*jobs)
+      jobs = setting_value(:jobs) if jobs.empty?
+      jobs.each { |job| run_job(job) }
+      success 'Done'
+    end
+  end
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/patches.rb

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

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class.rb

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

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class/jobs_runner.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/jobs_runner'
+require 'eac_ruby_utils/patch'
+
+class Class
+  def enable_jobs_runner
+    ::EacRubyUtils.patch(self, ::EacRubyBase0::JobsRunner)
+  end
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+  require path
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object/runner_with.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_ruby_base0/runner_with'
+::EacCli::RunnerWithSet.default.add_namespace(::EacRubyBase0::RunnerWith)

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb

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

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/traversable'
+
+module EacRubyBase0
+  module RunnerWith
+    module Confirmation
+      DEFAULT_CONFIRM_QUESTION_TEXT = 'Confirm?'
+
+      common_concern do
+        include ::EacCli::Runner
+        enable_settings_provider
+        runner_definition do
+          bool_opt '--no', 'Deny confirmation without question.'
+          bool_opt '--yes', 'Accept confirmation without question.'
+        end
+      end
+
+      def confirm?(message = nil)
+        return false if parsed.no?
+        return true if parsed.yes?
+
+        request_input(
+          message || setting_value(:confirm_question_text, default: DEFAULT_CONFIRM_QUESTION_TEXT),
+          bool: true
+        )
+      end
+
+      def run_confirm(message = nil)
+        yield if confirm?(message)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/filesystem_traverser.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/traversable'
+require 'eac_ruby_utils/settings_provider'
+
+module EacRubyBase0
+  module RunnerWith
+    module FilesystemTraverser
+      DEFAULT_DEFAULT_TRAVERSER_RECURSIVE = false
+
+      common_concern do
+        include ::EacCli::Runner
+        include ::EacRubyUtils::Fs::Traversable
+        enable_settings_provider
+        include TopMethods
+        runner_definition do
+          bool_opt '-R', '--recursive', 'Recursive.'
+          bool_opt '--no-recursive', 'No recursive.'
+          pos_arg :paths, optional: true, repeat: true
+        end
+      end
+
+      module TopMethods
+        def on_none_path_informed
+          infom 'Warning: none path informed'
+        end
+
+        def paths
+          parsed.paths.map(&:to_pathname)
+        end
+
+        def run_filesystem_traverser
+          if parsed.paths.any?
+            parsed.paths.each { |path| traverser_check_path(path) }
+          else
+            on_none_path_informed
+          end
+        end
+
+        def traverser_recursive
+          return false if parsed.no_recursive?
+          return true if parsed.recursive?
+
+          setting_value(:default_traverser_recursive, required: false)
+            .if_not_nil(DEFAULT_DEFAULT_TRAVERSER_RECURSIVE)
+        end
+      end
+    end
+  end
+end

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

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

data/vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/runner_with/confirmation'
+
+::RSpec.describe ::EacRubyBase0::RunnerWith::Confirmation do
+  let(:runner) do
+    the_module = described_class
+    Class.new do
+      include the_module
+
+      runner_definition do
+        desc 'A stub runner.'
+      end
+
+      def run
+        if confirm?
+          ::Kernel.puts 'Accepted'
+        else
+          ::Kernel.puts 'Denied'
+        end
+      end
+    end
+  end
+
+  let(:instance) { runner.create(argv: runner_argv) }
+
+  context 'without --no option' do
+    let(:runner_argv) { %w[--no] }
+
+    it do
+      expect { instance.run }.to output("Denied\n").to_stdout_from_any_process
+    end
+  end
+
+  context 'without --yes option' do
+    let(:runner_argv) { %w[--yes] }
+
+    it do
+      expect { instance.run }.to output("Accepted\n").to_stdout_from_any_process
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb

@@ -10,6 +10,7 @@ module EacRubyUtils
     class << self
       TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
 
+      # @return [ActiveSupport::TimeZone]
       def auto
         %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
       end
@@ -18,22 +19,27 @@ module EacRubyUtils
         ::Time.zone = auto
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_debian_config
         path = ::Pathname.new(DEBIAN_CONFIG_PATH)
-        path.exist? ? path.read.strip.presence : nil
+        path.exist? ? path.read.strip.if_present { |v| ::ActiveSupport::TimeZone[v] } : nil
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_offset
-        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset]
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_timedatectl
         executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
         return nil unless executable.exist?
 
         TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+                                         .if_present { |v| ::ActiveSupport::TimeZone[v] }
       end
 
+      # @return [ActiveSupport::TimeZone]
       def by_tz_env
         ENV['TZ'].presence
       end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/settings_provider.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patch'
+require 'eac_ruby_utils/settings_provider'
+
+class Class
+  def enable_settings_provider
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::SettingsProvider)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_nil.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Object
+  # @return +block.call(self)+ if +self+ is not nil, +default_value+ otherwise.
+  def if_not_nil(default_value = nil)
+    return default_value if nil?
+
+    block_given? ? yield(self) : self
+  end
+
+  # @return +yield+ if +self+ is nil, +self+ otherwise.
+  def if_nil
+    return yield if nil? && block_given?
+
+    self
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/required_zone.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/local_time_zone'
+
+class Time
+  class << self
+    def required_zone
+      zone || ::EacRubyUtils::LocalTimeZone.auto || raise('No zone set or discovered')
+    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.58.1'
+  VERSION = '0.59.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.94.0
+  version: 0.94.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -690,6 +690,7 @@ files:
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb
+- vendor/eac_cli/lib/eac_cli/runner_with_set.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
@@ -924,9 +925,20 @@ files:
 - vendor/eac_ruby_base0/eac_ruby_base0.gemspec
 - vendor/eac_ruby_base0/lib/eac_ruby_base0.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/class/jobs_runner.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/patches/object/runner_with.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/filesystem_traverser.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb
+- vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
 - vendor/eac_ruby_base0/spec/rubocop_spec.rb
 - vendor/eac_ruby_base0/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/Gemfile
@@ -1047,6 +1059,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/common_constructor.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/class/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerable/boolean_combinations.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/enumerator.rb
@@ -1070,6 +1083,7 @@ files:
 - 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
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_nil.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_respond.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb
@@ -1081,6 +1095,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/required_zone.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb