avm-tools 0.104.0 → 0.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4585c23cae62880e31d062cc01fbef21cd4736371756e717eaef78ddf16291bc
-  data.tar.gz: 7f45edf7e390d0ca3fbaf0de62ce51820090d9fc1fe5e692b9e6c0a6624efb3a
+  metadata.gz: f2aa6c6cff787569f6631e98dc1bb02e19e37358bffabdd12c770af457e4bf50
+  data.tar.gz: e324057b567e115c8449e3db04e82cf51955020539779e2d4928ede0338592c2
 SHA512:
-  metadata.gz: 1fa3e825fae8f70e9defcb19e44252ecd10872cf250fe043dfb8a6e40a5ccd12f6ce159f94afe602ad23a435e2e8ed84381d165f6498cb85ecfb6cdd3efe9033
-  data.tar.gz: 426f5496fe6e1701dc078f02ccd038d932a09fc362da23a89c9ce1e883ba0a515e1562031d0faaf0c817717a4fc92899af8820484297e0b183f860df33036f8d
+  metadata.gz: b8b1b1fd688eef382e3d483ffa6fa5af94bc6d334c944d2772774b55eacd87c63f56306121fe58e8e4254c4e09e3cf3d055b1c941991ce30cd418096418dba0e
+  data.tar.gz: 81e7f566f5cc5e0a202440343b3318b934d15258cb02662ab39fe708b458cac5365e07d01b05834da0263840e1e49b86283534139ebbb4f582f4ff11499b729f

data/lib/avm/instances/entry.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
+require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -31,7 +31,7 @@ module Avm
       end
 
       def read(extra_options = {})
-        ::Avm::Apps::Config.current.entry(full_path, options.merge(extra_options)).value
+        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
       end
 
       def suffix_as_array
@@ -47,7 +47,7 @@ module Avm
       end
 
       def write(value)
-        ::Avm::Apps::Config.current.entry(full_path).value = value
+        ::EacConfig::Node.context.current.entry(full_path).value = value
       end
     end
   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/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/patches/eac_ruby_gems_utils/gem.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/sources/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -13,7 +13,7 @@ module Avm
         private
 
         def configuration_uncached
-          ::Avm::Apps::Sources::Configuration.find_in_path(root)
+          ::Avm::Sources::Configuration.find_in_path(root)
         end
 
         def gemfile_path_uncached

data/lib/avm/ruby/rubocop/_configured.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/apps/sources/configuration'
+require 'avm/sources/configuration'
 
 module Avm
   module Ruby
@@ -22,7 +22,7 @@ module Avm
       private
 
       def configuration_uncached
-        ::Avm::Apps::Sources::Configuration.find_by_path(base_path)
+        ::Avm::Sources::Configuration.find_by_path(base_path)
       end
     end
   end

data/lib/avm/tools/app_src.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'avm/sources/configuration'
+require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
+require 'eac_ruby_utils/core_ext'
+require 'avm/projects/stereotypes'
+require 'i18n'
+
+module Avm
+  module Tools
+    class AppSrc
+      enable_simple_cache
+      common_constructor :path do
+        self.path = path.to_pathname
+        source_stereotypes_mixins
+      end
+
+      delegate :to_s, to: :path
+
+      def locale
+        configuration.if_present(&:locale) || ::I18n.default_locale
+      end
+
+      # Backward compatibility with [Avm::Launcher::Paths::Logical].
+      # @return [Avm::Launcher::Paths::Real].
+      def real
+        ::Avm::Launcher::Paths::Real.new(path.to_path)
+      end
+
+      def run_job(job, job_args = [])
+        stereotypes_jobs(job, job_args).each(&:run)
+      end
+
+      private
+
+      def avm_instance_uncached
+        ::Avm::Sources::Base.new(path)
+      end
+
+      # @return [Avm::Sources::Configuration]
+      def configuration_uncached
+        ::Avm::Sources::Configuration.find_in_path(path)
+      end
+
+      def stereotypes_jobs(job, job_args)
+        job_class_method = "#{job}_class"
+        r = []
+        stereotypes.each do |stereotype|
+          r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
+        end
+        r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
+      end
+
+      def stereotypes_uncached
+        ::Avm::Projects::Stereotypes.list.select { |s| s.match?(self) }
+      end
+
+      def source_stereotypes_mixins
+        stereotypes.each do |s|
+          s.local_project_mixin_module.if_present { |v| singleton_class.include(v) }
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/app_src/info.rb

@@ -12,8 +12,22 @@ module Avm
           end
 
           def run
-            infov 'Path', runner_context.call(:instance).path
-            infov 'Stereotypes', runner_context.call(:instance).stereotypes.map(&:label).join(', ')
+            infov 'Path', instance.path
+            infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
+            show_subs
+          end
+
+          private
+
+          def show_subs
+            infov 'Sub applications', instance.avm_instance.subs.count
+            instance.avm_instance.subs.each do |subapp|
+              infov '  * ', subapp.relative_path
+            end
+          end
+
+          def instance
+            runner_context.call(:instance)
           end
         end
       end

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/ruby/bundler/incompatible.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/fs_cache'
 require 'avm/ruby/bundler/incompatible_parser'
 require 'eac_ruby_base0/core_ext'
 
@@ -36,9 +35,8 @@ module Avm
                 fs_cache.content_path
               end
 
-              def fs_cache_uncached
-                ::Avm.fs_cache.child(self.class.name.variableize)
-                     .child(instance.path.to_s.variableize)
+              def fs_cache_object_id
+                instance.path.to_s.variableize
               end
 
               def gem_title(gem_in_conflict)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/app_src'
+require 'avm/tools/app_src'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -22,7 +22,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::AppSrc.new(instance_path)
+          ::Avm::Tools::AppSrc.new(instance_path)
         end
 
         def instance_path_uncached

data/lib/avm/tools/runner/config/load_path.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
 require 'avm/self'
 require 'avm/tools/core_ext'
+require 'eac_config/node'
+require 'eac_ruby_utils/recursive_builder'
 
 module Avm
   module Tools
@@ -15,15 +16,19 @@ module Avm
           end
 
           def run
-            run_show
+            config_nodes.each { |config_node| run_show(config_node) }
             run_add
           end
 
           private
 
           # @return [[EacCli::Config]]
-          def config_node
-            ::Avm::Apps::Config.current
+          def root_config_node
+            ::EacConfig::Node.context.current
+          end
+
+          def config_nodes
+            ::EacRubyUtils::RecursiveBuilder.new(root_config_node, &:self_loaded_nodes).result
           end
 
           def run_add
@@ -34,7 +39,7 @@ module Avm
             end
           end
 
-          def run_show
+          def run_show(config_node)
             infov 'Configuration path', config_node.url
             infov 'Paths included', config_node.self_loaded_nodes.count
             config_node.self_loaded_nodes.each do |loaded_node|

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/apps/config'
 require 'avm/launcher/git/base'
 require 'avm/git/commit'
+require 'eac_config/node'
 
 module Avm
   module Tools
@@ -91,7 +91,7 @@ module Avm
           end
 
           def variables_source
-            instance || ::Avm::Apps::Config.current
+            instance || ::EacConfig::Node.context.current
           end
 
           def instance_uncached

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

@@ -17,10 +17,6 @@ module Avm
       def application
         ::Avm::Self.application
       end
-
-      def run
-        ::Avm::Apps::Config.context.on(::Avm::Self.build_config) { super }
-      end
     end
   end
 end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.104.0'
+    VERSION = '0.108.0'
   end
 end

data/vendor/avm/avm.gemspec

@@ -16,6 +16,9 @@ Gem::Specification.new do |s|
   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_dependency 'filesize', '~> 0.2'
+  s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
+  s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.7', '>= 0.7.2'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'