avm-tools 0.94.2 → 0.94.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a418fd7c14cb6599e9c75eeba391a576aefb0897c6ce0f069568495cf0cb9802
-  data.tar.gz: 9ae79ac488f4fb96331b6d71bb7db9e943947b37577ffb725c3e10241b8b6206
+  metadata.gz: 266e7f05ba459608c81b684bb675e5efab20d7be043e59424398a3c810cf1db9
+  data.tar.gz: f9b04149ba95fa4cd4b4aba277118918351727999ed1a363b4782f0cd5ffcd96
 SHA512:
-  metadata.gz: 4faba2cbbbcdcc77ca7a925373de53056f7e1ef8caaa183f9eb6e8ca56c4de4e77e923cfa0567f8c83995cad400a3d09d698e18a77aa95dfbca98fcf8aa1d320
-  data.tar.gz: 772e38b1000548d8e37bc44b2ac9380948fbeaca3706b7d7218140895765fd053e589eabe95a23e64d19c931ee7e28cc18ce865931e76536d3f8c5dd83cd0ed5
+  metadata.gz: 1b2028e2aa894113dcbcee37742d302d1e12a363fddd5b569da22d84ea6c9e8f49ce87e9675af1bf8cef0b1a5d9e11dc94c969f61e71ff6ab1164371b145e987
+  data.tar.gz: 356839265fa90cc3d360af76194562840fa88aea67f0743814f22044263903fa5007b6617878610e19e43763bc5e238c6a37b697c379cccdf376ff61596ce1fa

data/lib/avm/eac_webapp_base0/instance.rb

@@ -9,6 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
+      require_sub __FILE__
       include ::Avm::Postgresql::InstanceWith
 
       FILES_UNITS = [].freeze
@@ -26,8 +27,10 @@ module Avm
       end
 
       def run_subcommand(subcommand_class, argv)
-        parent = ::OpenStruct.new(instance: self)
-        subcommand_class.new(argv: argv, parent: parent).run
+        subcommand_class.create(
+          argv: argv,
+          parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+        ).run
       end
 
       def data_package

data/lib/avm/eac_webapp_base0/instance/subcommand_parent.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Instance < ::Avm::Instances::Base
+      class SubcommandParent
+        enable_simple_cache
+        common_constructor :instance
+
+        private
+
+        def runner_context_uncached
+          ::EacCli::Runner::Context.new(self, argv: runner_argv)
+        end
+
+        def runner_argv
+          [instance.class.name.split('::')[-2].dasherize, instance.id]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/runner/data.rb

@@ -9,6 +9,7 @@ module Avm
         require_sub __FILE__
         runner_with :help, :subcommands do
           desc 'Data utilities for EacRailsBase0 instances.'
+          subcommands
         end
       end
     end

data/lib/avm/eac_webapp_base0/runner/data/dump.rb

@@ -15,7 +15,7 @@ module Avm
 
           runner_with :help do
             desc 'Dump utility for EacRailsBase instance.'
-            bool_opt '-w', 'rewrite', 'Forces dump overwrite.'
+            bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
             arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
           end
 

data/lib/avm/eac_webapp_base0/runner/data/load.rb

@@ -9,7 +9,7 @@ module Avm
     class Runner < ::Avm::Instances::Runner
       class Data
         class Load
-          runner_with :ĥelp do
+          runner_with :help do
             desc 'Load utility for EacRailsBase instance.'
             arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
             pos_arg :dump_path, optional: true

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.94.2'
+    VERSION = '0.94.3'
   end
 end

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

@@ -28,7 +28,11 @@ module EacCli
       end
 
       def identifier
-        long.to_s.variableize.to_sym
+        [long, short].each do |v|
+          v.to_s.if_present { |vv| return vv.variableize.to_sym }
+        end
+
+        raise 'No short or long option to build identifier'
       end
 
       def repeat?

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

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

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/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

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

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

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_git/local/commit/diff_tree_line'
+
+RSpec.describe ::EacGit::Local::Commit::DiffTreeLine, git: true do
+  include_examples 'source_target_fixtures', __FILE__ do
+    def source_data(source_file)
+      ::File.read(source_file).each_line.map do |line|
+        described_class.new(line).fields
+      end
+    end
+  end
+end

data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.source.out

@@ -0,0 +1 @@
+:000000 100644 0000000000000000000000000000000000000000 f380aec0bd8dd777edac43b11636e46cad04273a A	nomes.txt

data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/add.target.yaml

@@ -0,0 +1,7 @@
+---
+- src_mode: '000000'
+  dst_mode: '100644'
+  src_sha1: '0000000000000000000000000000000000000000'
+  dst_sha1: f380aec0bd8dd777edac43b11636e46cad04273a
+  status: A
+  path: nomes.txt

data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.source.out

@@ -0,0 +1 @@
+:100644 100644 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8 4a30dfae816b984f05cfb594e0d5958bb8c387ae M	nomes.txt

data/vendor/eac_git/spec/lib/eac_git/local/commit/diff_tree_line_spec_files/modify.target.yaml

@@ -0,0 +1,7 @@
+---
+- src_mode: '100644'
+  dst_mode: '100644'
+  src_sha1: 40bcdecb4214cd8a3fcf96cd25a2beb87e7e7cd8
+  dst_sha1: 4a30dfae816b984f05cfb594e0d5958bb8c387ae
+  status: M
+  path: nomes.txt