avm-tools 0.138.0 → 0.140.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7bf83b886d7158f37723c559d52eab9c7212390f673937cd81fa75209b7f6ff
-  data.tar.gz: 88797a72e234d4fa2900365cf3793fd7f2ea91ae9f8f804e8d624bc2946c3f17
+  metadata.gz: ed2d914555d3c58362e1295400822e92705cae0150e957fd451d9bb88605bf52
+  data.tar.gz: 0fa211ad333f697fc6c07bb89205552f64e5be5730795e5828cb6b652eef500b
 SHA512:
-  metadata.gz: 3ea44e51d1adf4b4607f08f12437c6cda8bb26a180ff1b3be138cf492e4b025e0364be3e6a70bcc35704c9755a087636e111f7ffb187ebfed1654e0943489aa7
-  data.tar.gz: 504f1b7e9c8e8019452078ba76abc89a13daee3969a8e25cb4a4a671e26c297a4efd8bf3ba34b383efde402217644c1779552ff9eef03b32892b4e0f6ab30ca8
+  metadata.gz: 153e38b2a7f25f90736f65388c2cdc61a011aefeee2247fdd94f0165624af5dc73b78cb7a7d31a39bec85e37712ec745b80eca5ac36f7eb2bd7a3aa129860af0
+  data.tar.gz: bf4e32eaf0b13d24215b29fde58b9d0dc44335050fad19ab86d6f970312d260ea63b6244e70372ccb72ada83e199bdf4d69ae2acb96c220090a4e6f3952821b8

data/lib/avm/launcher/git/warp_base.rb

@@ -2,7 +2,7 @@
 
 require 'avm/launcher/git/mirror_update'
 require 'avm/launcher/instances/error'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
 module Avm
@@ -59,7 +59,7 @@ module Avm
         end
 
         def target_remote_url
-          ::Avm::Launcher::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
+          ::Avm::Git::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subrepo/warp.rb

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/simple_cache'
 require 'avm/launcher/git/sub_warp_base'
 require 'avm/launcher/errors/base'
 require 'avm/launcher/paths/real'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 
 module Avm
   module Projects
@@ -77,7 +77,7 @@ module Avm
           end
 
           def target_remote_url
-            ::Avm::Launcher::Vendor::Github.to_ssh_url(
+            ::Avm::Git::Vendor::Github.to_ssh_url(
               parent_git_warped.subrepo_remote_url(to_parent_git_path)
             )
           end

data/lib/avm/projects/stereotypes.rb

@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/projects/stereotype'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Projects
     module Stereotypes
       require_sub __FILE__, base: nil
-
-      class << self
-        def list
-          @list ||= constants.map { |c| const_get(c) }
-                      .select { |c| c.included_modules.include?(Avm::Projects::Stereotype) }
-                      .freeze
-        end
-      end
     end
   end
 end

data/lib/avm/tools/core_ext.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require 'avm/patches'
 require 'eac_ruby_base0/core_ext'

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

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

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

@@ -48,10 +48,6 @@ module Avm
               infov "  * #{name}", command
             end
           end
-
-          def instance
-            runner_context.call(:instance)
-          end
         end
       end
     end

data/lib/avm/tools/runner/source/test.rb

@@ -65,7 +65,7 @@ module Avm
           end
 
           def start_banner
-            runner_context.call(:instance_banner)
+            runner_context.call(:source_banner)
             infov 'Selected units', test_performer.units.count
           end
 

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/sources/runner'
-require 'avm/tools/source'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -10,20 +9,9 @@ module Avm
       class Source < ::Avm::Sources::Runner
         require_sub __FILE__
 
-        def instance_banner
-          infov 'Instance', instance
-          infov 'Stereotypes', instance.stereotypes.map(&:label).join(', ')
-        end
-
         def subject
           source
         end
-
-        private
-
-        def instance_uncached
-          ::Avm::Tools::Source.new(source_path)
-        end
       end
     end
   end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.138.0'
+    VERSION = '0.140.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.138.0
+  version: 0.140.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -252,13 +252,6 @@ files:
 - Gemfile
 - exe/avm
 - lib/avm.rb
-- lib/avm/launcher/context.rb
-- lib/avm/launcher/context/instance_collector.rb
-- lib/avm/launcher/context/instance_discovery.rb
-- lib/avm/launcher/context/instance_manager.rb
-- lib/avm/launcher/context/instance_manager/cached_instance.rb
-- lib/avm/launcher/context/instance_manager/cached_instances.rb
-- lib/avm/launcher/context/settings.rb
 - lib/avm/launcher/git.rb
 - lib/avm/launcher/git/base.rb
 - lib/avm/launcher/git/base/class_methods.rb
@@ -272,28 +265,12 @@ files:
 - lib/avm/launcher/git/remote.rb
 - lib/avm/launcher/git/sub_warp_base.rb
 - lib/avm/launcher/git/warp_base.rb
-- lib/avm/launcher/instances.rb
-- lib/avm/launcher/instances/base.rb
-- lib/avm/launcher/instances/base/cache.rb
-- lib/avm/launcher/instances/error.rb
-- lib/avm/launcher/instances/runner_helper.rb
-- lib/avm/launcher/instances/settings.rb
-- lib/avm/launcher/paths.rb
-- lib/avm/launcher/paths/logical.rb
-- lib/avm/launcher/project.rb
-- lib/avm/launcher/publish.rb
-- lib/avm/launcher/publish/base.rb
 - lib/avm/launcher/ruby.rb
 - lib/avm/launcher/ruby/gem.rb
 - lib/avm/launcher/ruby/gem/build.rb
 - lib/avm/launcher/ruby/gem/specification.rb
-- lib/avm/launcher/vendor.rb
-- lib/avm/launcher/vendor/github.rb
-- lib/avm/patches.rb
-- lib/avm/patches/i18n.rb
 - lib/avm/projects.rb
 - lib/avm/projects/stereotype.rb
-- lib/avm/projects/stereotype/job_comparator.rb
 - lib/avm/projects/stereotypes.rb
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
@@ -305,13 +282,9 @@ files:
 - lib/avm/projects/stereotypes/git_subtree.rb
 - lib/avm/projects/stereotypes/git_subtree/publish.rb
 - lib/avm/projects/stereotypes/git_subtree/warp.rb
-- lib/avm/projects/stereotypes/rails_application.rb
-- lib/avm/projects/stereotypes/rails_application/local_project_mixin.rb
-- lib/avm/projects/stereotypes/redmine_plugin.rb
 - lib/avm/projects/stereotypes/ruby_gem.rb
 - lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb
 - lib/avm/projects/stereotypes/ruby_gem/publish.rb
-- lib/avm/stereotypes.rb
 - lib/avm/tools.rb
 - lib/avm/tools/core_ext.rb
 - lib/avm/tools/runner.rb
@@ -353,10 +326,7 @@ files:
 - lib/avm/tools/runner/source/version_bump.rb
 - lib/avm/tools/runner/source_generate.rb
 - lib/avm/tools/self.rb
-- lib/avm/tools/source.rb
 - lib/avm/tools/version.rb
-- locale/en.yml
-- locale/pt-BR.yml
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
 homepage: 

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

@@ -1,46 +0,0 @@
-# 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/context/instance_discovery.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'ruby-progressbar'
-require 'avm/launcher/instances/base'
-
-module Avm
-  module Launcher
-    class Context
-      class InstanceDiscovery
-        attr_reader :instances
-
-        def initialize(context)
-          @context = context
-          @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
-          @instances = path_instances(@context.root, nil)
-        ensure
-          @progress&.finish
-        end
-
-        private
-
-        def path_instances(path, parent_instance)
-          update_progress_format(path)
-          on_rescued_path_instances(path) do |r|
-            if path.project?
-              parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
-              r << path
-            end
-            children = path.children
-            update_progress_count(children)
-            r.concat(children.flat_map { |c| path_instances(c, parent_instance) })
-          end
-        end
-
-        def on_rescued_path_instances(path)
-          r = []
-          begin
-            yield(r) if path.included?
-          rescue StandardError => e
-            warn("#{path}: #{e}")
-          end
-          r
-        end
-
-        def update_progress_format(path)
-          @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
-        end
-
-        def update_progress_count(children)
-          @progress.total += children.count
-          @progress.increment
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/context/instance_manager/cached_instance.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/instances/base'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Launcher
-    class Context
-      class InstanceManager
-        class CachedInstance
-          enable_speaker
-          enable_simple_cache
-          common_constructor :cached_instances, :data
-
-          private
-
-          def instance_uncached
-            ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
-          rescue ::Avm::Launcher::Errors::NonProject
-            warn "Cached instance \"#{data[:logical]}\" not found"
-            nil
-          end
-
-          def parent_instance_uncached
-            data[:parent]
-              .if_present { |v| cached_instances.by_logical_path(v) }
-              .if_present(&:instance)
-          end
-
-          def path_uncached
-            ::Avm::Launcher::Paths::Logical.from_h(cached_instances.context, data)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/context/instance_manager/cached_instances.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/context/instance_manager/cached_instance'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Launcher
-    class Context
-      class InstanceManager
-        class CachedInstances
-          enable_simple_cache
-          common_constructor :context, :content
-
-          def instances
-            content.keys.map { |k| by_logical_path(k).instance }.reject(&:blank?)
-          end
-
-          def by_logical_path(key)
-            cached_instances[key].if_blank do
-              cached_instances[key] = ::Avm::Launcher::Context::InstanceManager::CachedInstance.new(
-                self, content.fetch(key)
-              )
-            end
-          end
-
-          private
-
-          def cached_instances_uncached
-            {}
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/launcher/publish/check_result'
-require('yaml')
-
-module Avm
-  module Launcher
-    class Context
-      class InstanceManager
-        require_sub __FILE__
-        enable_simple_cache
-        common_constructor :context
-
-        def publish_state_set(instance, stereotype_name, check_status)
-          data = cached_instances_file_content_uncached
-          data[instance.logical] ||= {}
-          data[instance.logical][:publish_state] ||= {}
-          data[instance.logical][:publish_state][stereotype_name] = check_status
-          write_cache_file(data)
-        end
-
-        def pending_instances
-          instances.select { |instance| pending_instance?(instance) }
-        end
-
-        private
-
-        def instances_uncached
-          (cached_instances || search_instances).select(&:included?)
-        end
-
-        def search_instances
-          cache_instances(::Avm::Launcher::Context::InstanceDiscovery.new(context).instances)
-        end
-
-        def cached_instances
-          return nil if context.recache
-          return nil unless cached_instances_file_content
-
-          CachedInstances.new(self, cached_instances_file_content).instances
-        end
-
-        def cached_instances_file_content_uncached
-          r = YAML.load_file(cache_file_path)
-          r.is_a?(::Hash) ? r : nil
-        rescue Errno::ENOENT
-          nil
-        end
-
-        def cache_instances(instances)
-          write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
-          instances
-        end
-
-        def write_cache_file(data)
-          ::File.write(cache_file_path, data.to_yaml)
-        end
-
-        def cache_file_path
-          ::File.join(context.cache_root, 'instances.yml')
-        end
-
-        def pending_instance?(instance)
-          data = cached_instances_file_content
-          return false unless data[instance.logical]
-          return false unless data[instance.logical][:publish_state].is_a?(Hash)
-
-          data[instance.logical][:publish_state].any? do |_k, v|
-            ::Avm::Launcher::Publish::CheckResult.pending_status?(v)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/instances/settings'
-require 'eac_ruby_utils/simple_cache'
-require 'yaml'
-
-module Avm
-  module Launcher
-    class Context
-      class Settings
-        include ::EacRubyUtils::SimpleCache
-
-        def initialize(file)
-          unless ::File.exist?(file)
-            ::FileUtils.mkdir_p(::File.dirname(file))
-            ::File.write(file, {}.to_yaml)
-          end
-          @data = YAML.load_file(file)
-        end
-
-        def instance_settings(instance)
-          ::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
-        end
-
-        private
-
-        def excluded_projects_uncached
-          enum_value(%w[Projects Exclude])
-        end
-
-        def excluded_paths_uncached
-          enum_value(%w[Paths Exclude])
-        end
-
-        def enum_value(path)
-          r = value(path)
-          r.is_a?(Enumerable) ? r : []
-        end
-
-        def value(path)
-          node_value(@data, path)
-        end
-
-        def node_value(data, path)
-          return data if path.empty?
-          return nil unless data.is_a?(Hash)
-
-          node_value(data[path.first], path.drop(1))
-        end
-      end
-    end
-  end
-end

data/lib/avm/launcher/context.rb

@@ -1,94 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/hash/indifferent_access'
-require 'avm/launcher/context/instance_manager'
-require 'eac_ruby_utils/simple_cache'
-require 'eac_cli/speaker'
-require 'avm/launcher/context/instance_discovery'
-require 'avm/launcher/context/settings'
-require 'avm/launcher/paths/logical'
-require 'avm/launcher/project'
-require 'avm/tools/self'
-
-module Avm
-  module Launcher
-    class Context
-      include ::EacRubyUtils::SimpleCache
-      enable_speaker
-
-      class << self
-        attr_writer :current
-
-        def current
-          @current ||= default
-        end
-
-        def default
-          @default ||= Context.new
-        end
-      end
-
-      attr_reader :root, :settings, :cache_root
-      attr_accessor :publish_options, :recache, :instance_manager
-
-      CONFIG_PATH_PREFIX = 'launcher'
-
-      def initialize(options = {})
-        @options = options.with_indifferent_access
-        @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
-        @settings = ::Avm::Launcher::Context::Settings.new(build_option(:settings_file))
-        @cache_root = build_option(:cache_root)
-        @publish_options = { new: false, confirm: false, stereotype: nil }
-        @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
-        @recache = false
-      end
-
-      def instance(name)
-        instances.find { |i| i.name == name }
-      end
-
-      def instances
-        @instance_manager.instances
-      end
-
-      def pending_instances
-        @instance_manager.pending_instances
-      end
-
-      private
-
-      def build_option(key)
-        @options[key] || config_option(key) || default_option(key)
-      end
-
-      def config_option(key)
-        ::Avm::Self::Instance.default.entry([CONFIG_PATH_PREFIX, key].join('.')).optional_value
-      end
-
-      def default_cache_root
-        ::Avm::Tools::Self.application.cache_dir.join('launcher')
-      end
-
-      def default_option(key)
-        send("default_#{key}".underscore)
-      end
-
-      def default_projects_root
-        '.'
-      end
-
-      def default_settings_file
-        ::Avm::Tools::Self.application.config_dir.join('launcher.yaml')
-      end
-
-      def projects_uncached
-        r = {}
-        instances.each do |i|
-          r[i.project_name] ||= []
-          r[i.project_name] << i
-        end
-        r.map { |name, instances| ::Avm::Launcher::Project.new(name, instances) }
-      end
-    end
-  end
-end