avm-tools 0.103.0 → 0.106.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bffe9e6a04311e0c66d08f3b7ba116722ae23aa59707b96bd565988d1e3b3ff
-  data.tar.gz: bf8b80f6b8328e3327b78af66c3d7961ba81d2157d1133ca39ccd62bb18b8249
+  metadata.gz: 4a71fc17b60e581ba891e58d0b47ad9b4dbae79c2085540bb1816e02011e9af9
+  data.tar.gz: 15387681892ce7192edd15b0e68ee801ed0fca233454b802df21f7d5e0a211a4
 SHA512:
-  metadata.gz: fde4268d2ead8d77d08cb6e6c2c617126372bc4a6fef6adb582702544f1e16c1a82d7a99178e4ab092dd53504bed2abdf3c3ad11c6e8987d42f98469f07cd0ab
-  data.tar.gz: 75f730ff566ca0c50d3cf0f0a76eb68c2f9526186f66522d54376eb85ffdeaa0410b83cca52f0e96b98dd9eafe8611f0b06bc6c70ff4850a7b9aea679749ebba
+  metadata.gz: d61dadda2108d0d2b7a37f9ec55bbcbc73e222c87f463feec8b91d8f486b3869f1652849296a9bcb7c33e58fe65f1a99f5d12fe7e71c2b1fcf58231b2f453124
+  data.tar.gz: 13a712ee6f75e13797fcf5107ad9b0c72f730195d4264e36ea5368635205aa68c55deb88c8055f01381342cefe48bf74d0decba9d6fe5052df6c6571622a1daf

data/lib/avm/data/package/dump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/files/rotate'
 require 'minitar'
 

data/lib/avm/instances/base/dockerizable.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_docker/executables'
 require 'eac_ruby_utils/core_ext'
 require 'avm/docker/container'
 
@@ -16,7 +17,7 @@ module Avm
         end
 
         def docker_container_exist?
-          ::Avm::Executables.docker.command.append(
+          ::EacDocker::Executables.docker.command.append(
             ['ps', '-qaf', "name=#{docker_container_name}"]
           ).execute!.present?
         end

data/lib/avm/launcher/context/instance_collector.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceCollector
+        common_constructor :context
+
+        def add_all
+          instances_set.merge(context.instances)
+          self
+        end
+
+        def add_path(path)
+          instances_set.merge(instances_on_path(path))
+          self
+        end
+
+        def add_pending
+          instances_set.merge(context.pending_instances)
+          self
+        end
+
+        def instances
+          instances_set.sort
+        end
+
+        private
+
+        def instance_match?(instance, instance_name)
+          ::File.fnmatch?(instance_name, instance.name)
+        end
+
+        def instances_on_path(path)
+          context.instances.select { |instance| instance_match?(instance, path) }
+        end
+
+        def instances_set
+          @instances_set ||= ::Set.new
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/instances/runner_helper.rb

@@ -1,31 +1,33 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/launcher/context'
+require 'avm/tools/core_ext'
+require 'avm/launcher/context/instance_collector'
 
 module Avm
   module Launcher
     module Instances
-      class RunnerHelper
-        def context
-          @context ||= ::Avm::Launcher::Context.current
-        end
+      module RunnerHelper
+        common_concern do
+          runner_definition do
+            bool_opt '--all', 'Select all instances.'
+            bool_opt '--pending', 'Select pending instances.'
+            bool_opt '--recache', 'Rewrite instances cache.'
+          end
 
-        def find_instances(instance_name)
-          context.instances.select { |instance| instance_match?(instance, instance_name) }
+          set_callback :run, :before, :setup_cache
         end
 
-        def instance_match?(instance, instance_name)
-          ::File.fnmatch?(instance_name, instance.name)
+        def context
+          @context ||= ::Avm::Launcher::Context.current
         end
 
         def instances
-          if parsed.all?
-            context.instances
-          elsif parsed.pending?
-            context.pending_instances
-          else
-            parsed.instance_path.flat_map { |p| find_instances(p) }
-          end
+          collector = ::Avm::Launcher::Context::InstanceCollector.new(context)
+          collector.add_all if parsed.all?
+          collector.add_pending if parsed.pending?
+          parsed.instance_path.flat_map { |p| collector.add_path(p) }
+          collector.instances
         end
 
         def instance_stereotypes(instance)
@@ -35,6 +37,10 @@ module Avm
         def instance_label(instance)
           "#{instance.name} [#{instance_stereotypes(instance)}]"
         end
+
+        def setup_cache
+          ::Avm::Launcher::Context.current.recache = parsed.recache?
+        end
       end
     end
   end

data/lib/avm/launcher/paths/logical.rb

@@ -7,6 +7,7 @@ module Avm
   module Launcher
     module Paths
       class Logical
+        include ::Comparable
         include ::EacRubyUtils::SimpleCache
 
         class << self
@@ -25,6 +26,10 @@ module Avm
           @logical = logical
         end
 
+        def <=>(other)
+          [logical, real] <=> [other.logical, other.real]
+        end
+
         def to_s
           logical
         end

data/lib/avm/tools/runner/app_src/eac_asciidoctor_base0/build.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/eac_asciidoctor_base0/sources/build'
 require 'os'
 

data/lib/avm/tools/runner/app_src/info.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/app_src/ruby/bundler/gemfile_lock/git.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class AppSrc
+        class Ruby
+          class Bundler
+            class GemfileLock
+              module Git
+                private
+
+                def git_continue
+                  return unless check_capability(__method__, :git_repo, :continue)
+
+                  infom "Adding \"#{gemfile_lock}\"..."
+                  instance.git_repo.command('add', gemfile_lock).execute!
+                  if rebase_conflict?
+                    git_continue_run('rebase')
+                  elsif cherry_conflict?
+                    git_continue_run('cherry-pick')
+                  else
+                    raise 'Unknown how to continue'
+                  end
+                end
+
+                def git_continue_run(command)
+                  infom "\"#{command}\" --continue..."
+                  cmd = instance.git_repo.command(command, '--continue')
+                                .envvar('GIT_EDITOR', 'true')
+                  return unless !cmd.system && !conflict?
+
+                  fatal_error "\"#{cmd}\" failed and there is no conflict"
+                end
+
+                def git_reset_checkout
+                  return unless check_capability(__method__, :git_repo, nil)
+
+                  git_reset_gemfile_lock
+                  git_checkout_gemfile_lock
+                end
+
+                def git_checkout_gemfile_lock
+                  infom 'Checkouting...'
+                  instance.git_repo.command('checkout', '--', gemfile_lock).system!
+                end
+
+                def git_reset_gemfile_lock
+                  infom 'Reseting...'
+                  instance.git_repo.command('reset', gemfile_lock).system! if
+                  ::File.exist?(gemfile_lock)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/app_src/ruby/bundler/gemfile_lock.rb

@@ -9,18 +9,21 @@ module Avm
         class Ruby
           class Bundler
             class GemfileLock
+              require_sub __FILE__, include_modules: true
               runner_with :help do
                 desc 'Manipulage a "Gemfile.lock" file.'
                 bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
                 bool_opt '-i', '--install', 'Run "bundle install".'
                 bool_opt '-u', '--update', 'Run "bundle update".'
                 bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
-                bool_opt '-a', '--all', 'Same as "-ciru".'
+                bool_opt '-a', '--all', 'Same as "-cirud".'
+                bool_opt '-d', '--delete', 'Delete Gemfile.lock'
               end
 
               def run
                 loop do
                   git_reset_checkout
+                  delete_gemfile_lock
                   bundle_update
                   bundle_install
                   git_continue
@@ -34,17 +37,14 @@ module Avm
                 !option_or_all?(:recursive) || !conflict?
               end
 
-              def rebasing?
-                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
-              end
+              def delete_gemfile_lock
+                return unless check_capability(__method__, nil, :delete)
 
-              def git_reset_checkout
-                return unless check_capability(__method__, :git_repo, nil)
+                ::FileUtils.rm_f(gemfile_lock)
+              end
 
-                infom 'Reseting...'
-                instance.git_repo.command('reset', gemfile_lock).system!
-                infom 'Checkouting...'
-                instance.git_repo.command('checkout', '--', gemfile_lock).system!
+              def rebasing?
+                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
               end
 
               def bundle_install
@@ -61,44 +61,14 @@ module Avm
                 bundle_run('update')
               end
 
-              def git_continue
-                return unless check_capability(__method__, :git_repo, :continue)
-
-                infom "Adding \"#{gemfile_lock}\"..."
-                instance.git_repo.command('add', gemfile_lock).execute!
-                if rebase_conflict?
-                  git_continue_run('rebase')
-                elsif cherry_conflict?
-                  git_continue_run('cherry-pick')
-                else
-                  raise 'Unknown how to continue'
-                end
-              end
-
-              def git_continue_run(command)
-                infom "\"#{command}\" --continue..."
-                cmd = instance.git_repo.command(command, '--continue').envvar('GIT_EDITOR', 'true')
-                return unless !cmd.system && !conflict?
-
-                fatal_error "\"#{cmd}\" failed and there is no conflict"
-              end
-
               def gemfile_lock
                 'Gemfile.lock'
               end
 
-              def git_uncached
-                ::EacGit::Local.new(git_path)
-              end
-
               def bundle_run(*args)
                 instance.ruby_gem.bundle(*args).system!
               end
 
-              def git_path
-                '.'
-              end
-
               def conflict?
                 rebase_conflict? || cherry_conflict?
               end
@@ -121,7 +91,7 @@ module Avm
 
               def check_capability(caller, capability, option)
                 return false unless option.blank? || option_or_all?(option)
-                return true if instance.respond_to?(capability)
+                return true if capability.if_present(true) { |v| instance.respond_to?(v) }
 
                 warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
                 false

data/lib/avm/tools/runner/app_src/test.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/app_src/update.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/config/load_path.rb

@@ -2,7 +2,7 @@
 
 require 'avm/apps/config'
 require 'avm/self'
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/config.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/git/dirty_files.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/git/issue/complete.rb

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

data/lib/avm/tools/runner/git/issue/deliver.rb

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

data/lib/avm/tools/runner/git/issue.rb

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

data/lib/avm/tools/runner/git/revisions_test.rb

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

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

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

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

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

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

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

data/lib/avm/tools/runner/git/subrepo.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/git.rb

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

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

@@ -6,16 +6,14 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Instances < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Instances
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper do
             desc 'Mostra informações sobre instâncias.'
-            bool_opt '--recache', 'Rewrite instances cache.'
-            bool_opt '--all', 'Get all instances.'
+            bool_opt '-e', '--extra', 'Show instances\' extra data.'
             pos_arg :instance_path, repeat: true, optional: true
           end
 
           def run
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             instances.each { |i| show_instance(i) }
           end
 
@@ -23,6 +21,10 @@ module Avm
 
           def show_instance(instance)
             puts instance_label(instance)
+            show_instance_extra(instance) if parsed.extra?
+          end
+
+          def show_instance_extra(instance)
             infov('  * Parent', (instance.parent ? instance_label(instance.parent) : '-'))
             infov('  * Git current revision', instance.options.git_current_revision)
             infov('  * Git publish remote', instance.options.git_publish_remote)

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

@@ -7,15 +7,13 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Projects < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Projects
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper do
             desc 'Shows available projects.'
-            bool_opt '--recache', 'Rewrite instances cache.'
             bool_opt '-i', '--instances', 'Show instances.'
           end
 
           def run
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             ::Avm::Launcher::Context.current.projects.each do |p|
               show_project(p)
             end

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

@@ -6,21 +6,17 @@ module Avm
   module Tools
     class Runner
       class Launcher
-        class Publish < ::Avm::Launcher::Instances::RunnerHelper
-          runner_with :help do
+        class Publish
+          runner_with :help, ::Avm::Launcher::Instances::RunnerHelper do
             desc 'Publica projetos ou instâncias.'
-            bool_opt '--all', 'Get all instances.'
             bool_opt '-d', '--dry-run', '"Dry run" publishing.'
             bool_opt '--new', 'Publish projects not published before.'
-            bool_opt '--pending', 'Publish only pending.'
-            bool_opt '--recache', 'Rewrite instances cache.'
             bool_opt '--run', 'Confirm publishing.'
             arg_opt '-s', '--stereotype', 'Publish only for stereotype <stereotype>.'
             pos_arg :instance_path, repeat: true, optional: true
           end
 
           def run
-            ::Avm::Launcher::Context.current.recache = parsed.recache?
             build_publish_options
             instances.each do |i|
               next unless i.options.publishable?

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.103.0'
+    VERSION = '0.106.0'
   end
 end

data/vendor/avm/avm.gemspec

@@ -12,8 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_docker', '~> 0.2', '>= 0.2.2'
+  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/vendor/avm/lib/avm/docker/runner.rb

@@ -6,6 +6,8 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Docker
     class Runner
+      DOCKER_DEFAULT_REGISTRY_METHOD = :docker_default_registry
+
       enable_speaker
       enable_simple_cache
 
@@ -92,17 +94,11 @@ module Avm
       end
 
       def registry_from_instance
-        if if_respond(:use_default_registry?, true)
-          instance.docker_registry_optional.if_present { |v| ::EacDocker::Registry.new(v) }
-        else
-          ::EacDocker::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)
-
-        nyi 'Was "::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