avm-tools 0.92.0 → 0.94.3

data/vendor/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Definition
+    class BaseOption
+      class InitializeArgsParser
+        PROPERTIES = %i[short long description options].freeze
+        attr_reader(*PROPERTIES)
+
+        def initialize(args)
+          self.options = args.extract_options!.freeze
+          args.each { |arg| absorb_arg(arg) }
+        end
+
+        private
+
+        attr_writer(*PROPERTIES)
+
+        def absorb_arg(arg)
+          arg_ext = ArgumentParser.new(arg)
+          send("#{arg_ext.type}=", arg_ext.value)
+        end
+
+        class ArgumentParser
+          TYPES = %i[short long description].freeze
+          common_constructor :value
+
+          def type
+            TYPES.find { |type| send("#{type}?") } || raise("Unknown type for \"#{value}\"")
+          end
+
+          def short?
+            value.start_with?('-') && !long?
+          end
+
+          def long?
+            value.start_with?('--')
+          end
+
+          def description?
+            !short? || !long?
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -19,10 +19,24 @@ module EacCli
           b += '=<value>' if option.argument?
           b
         end
+
+        def option_short(option)
+          b = option.short
+          b += '=<value>' if option.argument?
+          b
+        end
+
+        def option_usage_full(option)
+          if option.long.present?
+            [option.short, option_long(option)].reject(&:blank?).join(SEP)
+          else
+            option_short(option)
+          end
+        end
       end
 
       def option_definition(option)
-        option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
       end
 
       def section(header, include_header = true)

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/context.rb

@@ -27,8 +27,9 @@ module EacCli
 
       def parent_call(method_name, *args)
         return parent.context(method_name, *args) if parent.respond_to?(:context)
+        return parent.runner_context.call(method_name, *args) if parent.respond_to?(:runner_context)
 
-        parent.runner_context.call(method_name, *args)
+        raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"
       end
     end
   end

data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -3,15 +3,22 @@
 module EacCli
   module Runner
     module InstanceMethods
+      PARSER_ERROR_EXIT_CODE = 1
+
       def run_run
         parsed
         run_callbacks(:run) { run }
       rescue ::EacCli::Parser::Error => e
-        $stderr.write("#{e}\n")
+        run_parser_error(e)
       rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
         # Do nothing
       end
 
+      def run_parser_error(error)
+        $stderr.write("#{error}\n")
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+      end
+
       def runner_context
         return @runner_context if @runner_context
 

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.13.0'
+  VERSION = '0.16.1'
 end

data/vendor/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb

@@ -7,6 +7,10 @@ RSpec.describe ::EacCli::Definition::Alternative do
 
   it { expect { instance.arg_opt '-a', '--opt2', 'A argument option' }.not_to raise_error }
   it { expect { instance.bool_opt '-b', '--opt1', 'A boolean option' }.not_to raise_error }
+  it { expect { instance.bool_opt '-b', '--no-description' }.not_to raise_error }
+  it { expect { instance.bool_opt '--opt1', 'A option without short' }.not_to raise_error }
+  it { expect { instance.bool_opt '-b', 'A option without long' }.not_to raise_error }
+  it { expect { instance.bool_opt 'A option without selectors' }.to raise_error(::StandardError) }
   it { expect { instance.options_argument(true) }.not_to raise_error }
   it { expect { instance.pos_arg :pos1 }.not_to raise_error }
   it { expect { instance.pos_arg :pos2, optional: true, repeat: true }.not_to raise_error }

data/vendor/eac_git/eac_git.gemspec

@@ -15,5 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_utils', '~> 0.37'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
 
+  s.add_development_dependency 'aranha-parsers', '~> 0.7'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

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

@@ -12,6 +12,10 @@ module EacGit
       self.root_path = root_path.to_pathname
     end
 
+    def commit(ref, required = false)
+      rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Commit
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+
+      FIELDS = {
+        author_name: '%an', author_email: '%ae', author_date: '%ai',
+        subject: '%s',
+        author_all: '%an <%ae>, %ai',
+        commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
+        commiter_all: '%cn <%ce>, %ci'
+      }.freeze
+
+      common_constructor :repo, :hash
+
+      def format(format)
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", hash).execute!.strip
+      end
+
+      FIELDS.each do |field, format|
+        define_method(field) { format(format) }
+      end
+
+      def changed_files_uncached
+        diff_tree_execute.each_line.map do |line|
+          ::EacGit::Local::Commit::ChangedFile.new(self, line)
+        end
+      end
+
+      def changed_files_size_uncached
+        changed_files.inject(0) { |a, e| a + e.dst_size }
+      end
+
+      def root_child?
+        format('%P').blank?
+      end
+
+      private
+
+      def diff_tree_execute
+        args = []
+        args << '--root' if root_child?
+        args << hash
+        repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/local/commit/changed_file.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_git/local/commit/diff_tree_line'
+
+module EacGit
+  class Local
+    class Commit
+      class ChangedFile
+        enable_simple_cache
+
+        attr_reader :commit, :diff_tree
+
+        # @param commit [EacGit::Local::Commit]
+        # @param diff_tree_line [String] A line from command "repo diff-tree --no-commit-id -r
+        #   --full-index"'s output.
+        def initialize(commit, diff_tree_line)
+          @commit = commit
+          @diff_tree = ::EacGit::Local::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::EacGit::Local::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
+
+        def to_s
+          "#{path}|#{status}"
+        end
+
+        def src_size_uncached
+          size(src_sha1)
+        end
+
+        def dst_size_uncached
+          size(dst_sha1)
+        end
+
+        private
+
+        def size(id)
+          return 0 if /\A0+\z/.match(id)
+
+          commit.repo.command('cat-file', '-s', id).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/vendor/eac_git/lib/eac_git/local/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze
+        FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
+        GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
+
+        attr_reader(*FIELDS)
+
+        # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
+        # Reference: https://git-scm.com/docs/git-diff-tree
+        def initialize(line)
+          m = DIFF_TREE_PATTERN.match(line.strip)
+          raise "\"#{line}\" did not match pattern" unless m
+
+          FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
+        end
+
+        def fields
+          FIELDS.map { |field| [field, send(field)] }.to_h
+        end
+
+        private
+
+        attr_writer(*FIELDS)
+      end
+    end
+  end
+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/rspec.rb

@@ -5,12 +5,17 @@ require 'eac_git/executables'
 
 module EacGit
   module Rspec
+    require_sub __FILE__
+
     class << self
       def configure
         ::EacRubyUtils::Rspec::Conditional.default.add(:git) do
           ::EacGit::Executables.git.validate
         end
-        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
+        RSpec.configure do |config|
+          ::EacRubyUtils::Rspec::Conditional.default.configure(config)
+          config.include ::EacGit::Rspec::StubbedGitLocalRepo
+        end
       end
     end
   end

data/{lib/avm/git/spec_helper.rb → vendor/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb}

@@ -1,28 +1,31 @@
 # frozen_string_literal: true
 
+require 'eac_git/local'
 require 'eac_ruby_utils/envs'
-require 'eac_launcher/git/base'
 require 'fileutils'
 require 'tmpdir'
 
-module Avm
-  module Git
-    module SpecHelper
-      def stubbed_git_repository(bare = false)
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      def stubbed_git_local_repo(bare = false)
         path = ::Dir.mktmpdir
-        ::EacRubyUtils::Envs.local.command(stubbed_git_repository_args(path, bare)).execute!
-        StubbedGitRepository.new(path)
+        ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
+        repo = StubbedGitRepository.new(path)
+        repo.command('config', 'user.email', 'theuser@example.net').execute!
+        repo.command('config', 'user.name', 'The User').execute!
+        repo
       end
 
       private
 
-      def stubbed_git_repository_args(path, bare)
+      def stubbed_git_local_repo_args(path, bare)
         r = %w[git init]
         r << '--bare' if bare
         r + [path]
       end
 
-      class StubbedGitRepository < ::EacLauncher::Git::Base
+      class StubbedGitRepository < ::EacGit::Local
         def file(*subpath)
           StubbedGitRepositoryFile.new(self, subpath)
         end
@@ -37,19 +40,19 @@ module Avm
         end
 
         def path
-          ::File.join(git, *subpath)
+          git.root_path.join(*subpath)
         end
 
         def touch
-          ::FileUtils.touch(path)
+          ::FileUtils.touch(path.to_path)
         end
 
         def delete
-          ::File.unlink(path)
+          path.unlink
         end
 
         def write(content)
-          ::File.write(path, content)
+          path.write(content)
         end
       end
     end