avm-tools 0.102.1 → 0.104.0

data/{lib → vendor/avm/lib}/avm/docker/runner.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
-require 'avm/docker/registry'
+require 'eac_docker/registry'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Docker
     class Runner
+      DOCKER_DEFAULT_REGISTRY_METHOD = :docker_default_registry
+
       enable_speaker
       enable_simple_cache
 
@@ -88,21 +90,15 @@ module Avm
       end
 
       def registry_from_option
-        parsed.registry_name.if_present { |v| ::Avm::Docker::Registry.new(v) }
+        parsed.registry_name.if_present { |v| ::EacDocker::Registry.new(v) }
       end
 
       def registry_from_instance
-        if if_respond(:use_default_registry?, true)
-          instance.docker_registry_optional.if_present { |v| ::Avm::Docker::Registry.new(v) }
-        else
-          ::Avm::Docker::Registry.new(instance.docker_registry)
-        end
+        instance.docker_registry_optional.if_present { |v| ::EacDocker::Registry.new(v) }
       end
 
       def registry_from_default
-        return nil unless if_respond(:use_default_registry?, true)
-
-        ::Avm::Docker::Registry.default
+        if_respond(DOCKER_DEFAULT_REGISTRY_METHOD, nil)
       end
 
       def snapshot?

data/{lib → vendor/avm/lib}/avm/executables.rb

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[docker file git latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[file git js-beautify latex php-cs-fixer tidy yapf xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

data/{lib → vendor/avm/lib}/avm/files/appendable/templatized_directory.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable/resource_base'
+require 'eac_templates/directory'
 
 module Avm
   module Files

data/{lib → vendor/avm/lib}/avm/files/deploy.rb

@@ -2,7 +2,6 @@
 
 require 'addressable'
 require 'avm/files/appendable'
-require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/{lib → vendor/avm/lib}/avm/files/formatter.rb

@@ -16,7 +16,7 @@ module Avm
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
-      FORMATS = %w[ruby php html python xml json generic_plain].freeze
+      FORMATS = %w[ruby php html python xml javascript json generic_plain].freeze
 
       def run
         clear

data/vendor/avm/lib/avm/files/formatter/formats/javascript.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/files/formatter/formats/generic_plain'
+
+module Avm
+  module Files
+    class Formatter
+      module Formats
+        class Javascript < ::Avm::Files::Formatter::Formats::GenericPlain
+          VALID_BASENAMES = %w[*.js].freeze
+          VALID_TYPES = [].freeze
+
+          def internal_apply(files)
+            ::Avm::Executables.js_beautify.command.append(
+              ['--indent-size=2', '--end-with-newline', '--replace', *files]
+            ).system!
+            super(files)
+          end
+        end
+      end
+    end
+  end
+end

data/{lib → vendor/avm/lib}/avm/git/auto_commit_path.rb

@@ -21,7 +21,7 @@ module Avm
       end
 
       def relative_path
-        path.relative_path_from(git.root_path)
+        path.expand_path.relative_path_from(git.root_path.expand_path)
       end
     end
   end

data/{lib → vendor/avm/lib}/avm/git/commit.rb

@@ -18,13 +18,14 @@ module Avm
 
       attr_reader :git, :sha1
 
+      # @param git [EacGit::Local]
       def initialize(git, sha1)
         @git = git
         @sha1 = sha1
       end
 
       def format(format)
-        git.execute!('--no-pager', 'log', '-1', "--pretty=format:#{format}", sha1).strip
+        git.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", sha1).execute!.strip
       end
 
       FIELDS.each do |field, format|
@@ -51,7 +52,7 @@ module Avm
         args = []
         args << '--root' if root_child?
         args << sha1
-        git.execute!(*::Avm::Git::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args)
+        git.command(*::Avm::Git::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
       end
     end
   end

data/{lib → vendor/avm/lib}/avm/git/commit/deploy.rb

@@ -4,7 +4,6 @@ require 'addressable'
 require 'eac_ruby_utils/core_ext'
 require 'avm/files/appendable'
 require 'avm/files/deploy'
-require 'avm/patches/object/template'
 
 module Avm
   module Git

data/{lib → vendor/avm/lib}/avm/git/commit/file.rb

@@ -12,7 +12,7 @@ module Avm
 
         attr_reader :git, :diff_tree
 
-        # git: [Avm::Launcher::Git::Base]
+        # git: [EacGit::Local]
         # diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
         def initialize(git, diff_tree_line)
           @git = git
@@ -38,7 +38,7 @@ module Avm
         def size(sha1)
           return 0 if /\A0+\z/.match(sha1)
 
-          git.execute!('cat-file', '-s', sha1).strip.to_i
+          git.command('cat-file', '-s', sha1).execute!.strip.to_i
         end
       end
     end

data/{lib → vendor/avm/lib}/avm/git/issue/complete.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/options_consumer'
-require 'eac_ruby_utils/require_sub'
-require 'eac_ruby_utils/simple_cache'
-::EacRubyUtils.require_sub(__FILE__)
+require 'avm/tools/core_ext'
 
 module Avm
   module Git
     module Issue
       class Complete
-        include ::EacRubyUtils::SimpleCache
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
         enable_speaker
 
         attr_reader :skip_validations

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Commits
+          def commits_result
+            ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
+          end
+
+          def commits_uncached
+            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)
+          end
+
+          def bifurcations_result
+            commits.each do |commit|
+              if multiple_parents?(commit)
+                return ::Avm::Result.error("#{commit} has multiple parents")
+              end
+            end
+            ::Avm::Result.success('no')
+          end
+
+          def multiple_parents?(commit)
+            commit_parents(commit).count > 1
+          end
+
+          def commit_parents(commit)
+            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                .select(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module GitSubrepos
+          def git_subrepos_result
+            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.check_remote = true
+            r.result
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalBranch
+          def branch_uncached
+            @git.current_branch
+          end
+
+          def branch_hash_uncached
+            @git.rev_parse("refs/heads/#{branch}")
+          end
+
+          def branch_name
+            branch.split('/')[-1]
+          end
+
+          def branch_name_result
+            ::Avm::Result.success_or_error(issue_id.present?, branch_name)
+          end
+
+          def branch_hash_result
+            ::Avm::Result.success_or_error(
+              branch_hash.present?,
+              branch_hash
+            )
+          end
+
+          def follow_master_result
+            return ::Avm::Result.neutral('No branch hash') unless branch_hash
+
+            r = follow_master?
+            ::Avm::Result.success_or_error(r, 'yes', 'no')
+          end
+
+          def follow_master?
+            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+          end
+
+          def remove_local_branch
+            info 'Removendo branch local...'
+            bn = branch_name
+            git(['checkout', branch_hash])
+            git(['branch', '-D', bn])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/result'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module LocalTag
+          def assert_tag
+            if tag_hash
+              return if tag_hash == branch_hash
+
+              delete_tag
+            end
+            create_tag
+          end
+
+          def delete_tag
+            info 'Removendo tag...'
+            git(['tag', '-d', branch_name])
+          end
+
+          def tag
+            "refs/tags/#{branch_name}"
+          end
+
+          def tag_hash
+            @git.rev_parse(tag)
+          end
+
+          def create_tag
+            git(['tag', branch_name, branch_hash])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Push
+          def dry_push_args
+            %w[push --dry-run] + [remote_name] + pushs
+          end
+
+          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)
+          end
+
+          def push
+            if pushs.empty?
+              info 'PUSH: Nada a enviar'
+            else
+              info "PUSH: enviando \"#{pushs}\"..."
+              git(%w[push origin] + pushs)
+            end
+          end
+
+          def pushs_uncached
+            [master_push, remove_branch_push, tag_push].reject(&:nil?)
+          end
+
+          def master_push
+            remote_master_hash != branch_hash ? "#{branch_hash}:refs/heads/master" : nil
+          end
+
+          def remove_branch_push
+            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+          end
+
+          def tag_push
+            return nil unless !remote_tag_hash || remote_tag_hash != branch_hash
+
+            "#{branch_hash}:#{tag}"
+          end
+        end
+      end
+    end
+  end
+end