avm-tools 0.102.2 → 0.105.0

data/lib/avm/tools/runner/launcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/ruby/rubocop'
 
 module Avm

data/lib/avm/tools/runner/self.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/self'
 
 module Avm

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.102.2'
+    VERSION = '0.105.0'
   end
 end

data/vendor/avm/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/avm/avm.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm'
+  s.version     = Avm::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'Ruby base library for Agora Vai! Methodology (https://avm.esquiloazul.tech).'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_docker', '~> 0.3'
+  s.add_dependency 'eac_git', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.68'
+  s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
+
+  s.add_development_dependency 'aranha-parsers', '~> 0.7', '>= 0.7.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
-require 'avm/executables'
+require 'eac_docker/executables'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Docker
@@ -10,7 +10,7 @@ module Avm
       common_constructor :instance
 
       def remove
-        ::Avm::Executables.docker.command.append(
+        ::EacDocker::Executables.docker.command.append(
           ['rm', '--force', instance.docker_container_name]
         ).system!
       end
@@ -28,12 +28,12 @@ module Avm
 
       def run_run(options)
         infom "\"docker run #{instance.docker_container_name}...\""
-        ::Avm::Executables.docker.command.append(run_run_arguments(options)).system!
+        ::EacDocker::Executables.docker.command.append(run_run_arguments(options)).system!
       end
 
       def run_start
         infom "\"docker start #{instance.docker_container_name}...\""
-        ::Avm::Executables.docker.command.append(run_start_arguments).system!
+        ::EacDocker::Executables.docker.command.append(run_start_arguments).system!
       end
 
       def run_run_arguments(options)

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
+require 'avm/version'
 require 'eac_ruby_utils/core_ext'
-require 'avm/executables'
-require 'avm/patches/object/template'
 require 'eac_docker/images/templatized'
 
 module Avm
@@ -25,11 +24,11 @@ module Avm
       end
 
       def generator_version
-        ::Avm::Tools::VERSION
+        ::Avm::VERSION
       end
 
       def push
-        ::Avm::Executables.docker.command.append(['push', tag]).system!
+        ::EacDocker::Executables.docker.command.append(['push', tag]).system!
       end
 
       def read_entry(path, options = {})

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/vendor/avm/lib/avm/docker.rb

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

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/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/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/{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/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/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/issue/complete/push.rb

@@ -17,7 +17,7 @@ module Avm
                         'ok'
                       else
                         r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
-            end
+                      end
             ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
           end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Git

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'clipboard'
 
 module Avm