avm-tools 0.102.2 → 0.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1dc265a8c8828a917414ea4baac9765139517521d1d137df7893cf71c1c3b89
-  data.tar.gz: 46ec3d56d9ad2420929c24aba726b1a2e476bae418e90a793b106f95740ce5e1
+  metadata.gz: 3fe2686915966fcba0a1a718e139ea1e4ba92ee4c8f26ddb99abbe550e490061
+  data.tar.gz: a6a2010d4a8cf1a3647641669e967268a09a93ef993625a19407aae1d7ec9ecc
 SHA512:
-  metadata.gz: b2bde9ec40565deaf93c371d8c1df4443ff2ba084d4ab295493a585c4ed82d1f070625747a0ab7ac5fbed0424d1c4d7f2345beae7a03a6ef0efef13a4363e95a
-  data.tar.gz: ebf68de65906d8c17c31f4d49cbc3011afc0e793e25b70f01a25291d0c897526f4ef54beef345ffb9f7e08a49ba0b98e44b825e5feab19803c747d09917eae4c
+  metadata.gz: 21e08baec23bb4811d5ee4db550dd2b15909f26e02d40ca610f86e651194dcc6ccf19b91d82f9c0fa5b2cfe3c17a8ee8c37459a2e433d831e9a26f2748475e47
+  data.tar.gz: f150f90534d39728ec14e9ada47b2a0e13522b47218984447832075ee3876c20dad0cddf5bc11ee7c899eb06e49c7b6845354fb631c06affc439b5b72bfe0e23

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/projects/stereotypes/ruby_gem/local_project_mixin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'avm/version'
+require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -15,7 +15,7 @@ module Avm
           end
 
           def version
-            ruby_gem.version.if_present { |v| ::Avm::Version.new(v) }
+            ruby_gem.version.if_present { |v| ::Avm::VersionNumber.new(v) }
           end
 
           def version=(value)

data/lib/avm/self/instance.rb

@@ -12,6 +12,10 @@ module Avm
         ::Avm::Self::DockerImage
       end
 
+      def docker_registry
+        read_entry(::Avm::Self::Instance::EntryKeys::DOCKER_REGISTRY_NAME)
+      end
+
       def docker_run_arguments
         ['-e', "LOCAL_USER_ID=#{::Process.uid}"]
       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/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/app_src/version_bump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/version'
+require 'avm/version_number'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -63,7 +63,7 @@ module Avm
           end
 
           def target_version_from_new(_current, option_value)
-            ::Avm::Version.new(option_value)
+            ::Avm::VersionNumber.new(option_value)
           end
 
           def target_version_from_segment(current, option_value)

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

@@ -19,6 +19,7 @@ module Avm
           end
 
           def run
+            runner_context.call(:git).command('reset', 'HEAD').system!
             format_files
             files.each do |file|
               ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run

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?