avm-tools 0.113.3 → 0.114.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df7ad19d9031c2e3d94cb8051798479282760386da32c55533f461a85d51580
-  data.tar.gz: 69fe1de1ee67d5000c1a56aae122d1bf98e55a65b175616c73e9a99d28c4d472
+  metadata.gz: ab94e9f5fae951a039dc33fadb807fa8331899a843526fa957beeb05193a8419
+  data.tar.gz: ebb72038ffaa5b8c9c37d20e8b7a6de6b6303886665940474c36318804cdc600
 SHA512:
-  metadata.gz: 92453344e1eb2751ed5d653cb11fea487284315750b9e61e3044da5883c9aed8ec46d1ab5979489c1c733ed963ab844ede90a4bf81dbb0f1e8c6414bb35fceab
-  data.tar.gz: c882830e166e9f7f59b1fca59d3658afccd2e3ad9dc6bf8929af4dae6a2ae6531537a9c97e924fdcd450c342d276b8d6029f917735c71702de8c9304884545ef
+  metadata.gz: b25329ca5da5c3aeda2bd26b9f2cf91edadfe965e3eba3e891eb590a3b7a9483870b80e45b2e804eb44d56877445c1da00a98b75b9c8feac81fb44165020e21a
+  data.tar.gz: bf211cebb15418b176c681020f825e64ba8d12cecd3d2022b3026326fcc3d062e846c763143b75cf17a2d38f7c71b244b4748166deb3cc873fe61eac319afc3b

data/lib/avm/launcher/context.rb

@@ -8,6 +8,7 @@ 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
@@ -15,10 +16,6 @@ module Avm
       include ::EacRubyUtils::SimpleCache
       enable_speaker
 
-      DEFAULT_PROJECTS_ROOT = '.'
-      DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')
-      DEFAULT_CACHE_ROOT = ::File.join(ENV['HOME'], '.cache', 'eac_launcher')
-
       class << self
         attr_writer :current
 
@@ -34,6 +31,8 @@ module Avm
       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), '/')
@@ -59,15 +58,27 @@ module Avm
       private
 
       def build_option(key)
-        @options[key] || env_option(key) || default_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 env_option(key)
-        ENV["EAC_LAUNCHER_#{key}".underscore.upcase]
+      def default_cache_root
+        ::Avm::Tools::Self.application.cache_dir.join('launcher')
       end
 
       def default_option(key)
-        self.class.const_get("DEFAULT_#{key}".underscore.upcase)
+        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

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

@@ -17,7 +17,7 @@ module Avm
 
               def run
                 infov 'Cache path', fs_cache.content_path
-                infov 'Cached?', fs_cache.cached?
+                infov 'Cached?', fs_cache.stored?
                 parser.gems_in_conflict.each do |gem_in_conflict|
                   print_gem_in_conflict(gem_in_conflict)
                 end
@@ -31,7 +31,7 @@ module Avm
               end
 
               def content_path
-                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.write(bundle_update) unless fs_cache.stored? && parsed.last?
                 fs_cache.content_path
               end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/tools/self'
+require 'avm/self/instance'
 
 module Avm
   module Tools
@@ -14,7 +14,7 @@ module Avm
         end
 
         def instance
-          ::Avm::Tools::Self.instance
+          ::Avm::Self::Instance.default
         end
       end
     end

data/lib/avm/tools/self.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli/old_configs_bridge'
 require 'eac_ruby_base0/application'
 require 'eac_ruby_utils/require_sub'
 require 'avm/instances/base'
@@ -15,18 +14,6 @@ module Avm
           @application ||= ::EacRubyBase0::Application.new(root.to_path)
         end
 
-        # @return [EacCli::OldConfigsBridge]
-        def build_config(path = nil)
-          ::EacCli::OldConfigsBridge.new(
-            application.name,
-            path.if_present({}) { |v| { storage_path: v } }
-          )
-        end
-
-        def instance
-          @instance ||= ::Avm::Tools::Self::Instance.by_id('avm-tools_self')
-        end
-
         def root
           ::Pathname.new('../../..').expand_path(__dir__)
         end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.113.3'
+    VERSION = '0.114.0'
   end
 end

data/sub/avm/lib/avm/instances/base/auto_values/data.rb

@@ -9,8 +9,8 @@ module Avm
       module AutoValues
         module Data
           def auto_data_default_dump_path
-            ::Avm::Self
-              .instance
+            ::Avm::Self::Instance
+              .default
               .read_entry_optional(::Avm::Self::Instance::EntryKeys::DATA_DEFAULT_PATH)
               .if_present do |v|
               ::File.join(

data/sub/avm/lib/avm/instances/base/auto_values/filesystem.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
+
 module Avm
   module Instances
     class Base
       module AutoValues
         module Filesystem
-          FS_PATH_KEY = :fs_path
-
           def auto_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, FS_PATH_KEY) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_data_fs_path
-            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, :data_fs_path) do |v|
-              v + '/' + id
-            end
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::DATA_FS_PATH) { |v| v + '/' + id }
           end
 
           def auto_fs_url

data/sub/avm/lib/avm/instances/entry.rb

@@ -27,11 +27,11 @@ module Avm
       end
 
       def optional_value
-        read(required: false, noinput: true) || auto_value
+        context_entry.found? ? context_entry.value : auto_value
       end
 
-      def read(extra_options = {})
-        ::EacConfig::Node.context.current.entry(full_path, options.merge(extra_options)).value
+      def read
+        context_entry.value
       end
 
       def suffix_as_array
@@ -47,7 +47,13 @@ module Avm
       end
 
       def write(value)
-        ::EacConfig::Node.context.current.entry(full_path).value = value
+        context_entry.value = value
+      end
+
+      private
+
+      def context_entry
+        ::EacConfig::Node.context.current.entry(full_path)
       end
     end
   end

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -42,7 +42,7 @@ module Avm
       end
 
       {
-        '' => %w[fs_path host_id name source_instance_id],
+        '' => %w[data_fs_path fs_path host_id name source_instance_id],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
         mailer: {

data/sub/avm/lib/avm/self/instance.rb

@@ -8,6 +8,14 @@ require 'avm/eac_ubuntu_base0/docker_image'
 module Avm
   module Self
     class Instance < ::Avm::Instances::Base
+      DEFAULT_INSTANCE_ID = 'avm_self'
+
+      class << self
+        def default
+          @default ||= by_id(DEFAULT_INSTANCE_ID)
+        end
+      end
+
       def docker_image_class
         ::Avm::Self::DockerImage
       end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.12.1'
+  VERSION = '0.14.0'
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -15,6 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
-  s.add_development_dependency 'eac_cli', '~> 0.24', '~> 0.24.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/runners/base.rb

@@ -2,6 +2,8 @@
 
 require 'avm/eac_rails_base0/instance'
 require 'avm/eac_rails_base0/deploy'
+require 'avm/eac_rails_base0/apache_host'
+require 'avm/eac_rails_base0/apache_path'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'
 

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.1.1'
+    VERSION = '0.1.3'
   end
 end

data/sub/avm-eac_rails_base0/spec/lib/avm/eac_rails_base0/apache_path_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe ::Avm::EacRailsBase0::ApachePath do
     let(:expected_content) { expect_file.read }
 
     before do
-      instance.entry(::Avm::Instances::Base::FS_PATH_KEY).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
       instance.entry('web.url').write('http://stubapp.net/stub-app_0')
     end
 

data/sub/avm-eac_rails_base0/spec/spec_helper.rb

@@ -2,8 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
-
-require 'eac_cli/old_configs_bridge'
-::EacRubyUtils::Rspec.default_setup.stub_eac_config_node do |file|
-  ::EacCli::OldConfigsBridge.new(file)
-end
+::EacRubyUtils::Rspec.default_setup.stub_eac_config_node

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'avm-files', '~> 0.1'
-  s.add_dependency 'eac_git', '~> 0.9'
+  s.add_dependency 'eac_git', '~> 0.11'
   s.add_dependency 'eac_ruby_utils', '~> 0.76'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/issue/complete/commits.rb

@@ -15,7 +15,7 @@ module Avm
             return [] unless branch_hash && follow_master?
 
             interval = remote_master_hash ? "#{remote_master_hash}..#{branch_hash}" : branch_hash
-            @git.execute!('rev-list', interval).each_line.map(&:strip)
+            launcher_git.execute!('rev-list', interval).each_line.map(&:strip)
           end
 
           def bifurcations_result
@@ -32,8 +32,8 @@ module Avm
           end
 
           def commit_parents(commit)
-            @git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
-                .select(&:present?)
+            launcher_git.execute!('log', '--pretty=%P', '-n', '1', commit).split(' ').map(&:strip)
+                        .select(&:present?)
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/git_subrepos.rb

@@ -12,7 +12,7 @@ module Avm
             return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
 
             infom 'Checking Git subrepos...'
-            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+            r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(launcher_git)).add_all_subrepos
             r.check_remote = true
             r.result
           end

data/sub/avm-git/lib/avm/git/issue/complete/local_branch.rb

@@ -7,16 +7,21 @@ module Avm
     module Issue
       class Complete
         module LocalBranch
+          NO_CURRENT_BRANCH_NAME = 'none'
+
+          # Retrieves the current local branch.
+          #
+          # @return [EacGit::Local::Branch, nil]
           def branch_uncached
-            @git.current_branch
+            eac_git.current_branch
           end
 
           def branch_hash_uncached
-            @git.rev_parse("refs/heads/#{branch}")
+            branch.if_present(&:current_commit_id)
           end
 
           def branch_name
-            branch.split('/')[-1]
+            branch.if_present(NO_CURRENT_BRANCH_NAME, &:name)
           end
 
           def branch_name_result
@@ -38,14 +43,16 @@ module Avm
           end
 
           def follow_master?
-            remote_master_hash ? @git.descendant?(branch_hash, remote_master_hash) : true
+            remote_master_hash ? launcher_git.descendant?(branch_hash, remote_master_hash) : true
           end
 
           def remove_local_branch
+            return unless branch
+
             info 'Removendo branch local...'
             bn = branch_name
-            git(['checkout', branch_hash])
-            git(['branch', '-D', bn])
+            git_execute(['checkout', branch_hash])
+            git_execute(['branch', '-D', bn])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/local_tag.rb

@@ -18,7 +18,7 @@ module Avm
 
           def delete_tag
             info 'Removendo tag...'
-            git(['tag', '-d', branch_name])
+            git_execute(['tag', '-d', branch_name])
           end
 
           def tag
@@ -26,11 +26,11 @@ module Avm
           end
 
           def tag_hash
-            @git.rev_parse(tag)
+            launcher_git.rev_parse(tag)
           end
 
           def create_tag
-            git(['tag', branch_name, branch_hash])
+            git_execute(['tag', branch_name, branch_hash])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/push.rb

@@ -12,13 +12,7 @@ module Avm
           def dry_push_result
             return ::Avm::Result.error('Nothing to push') if pushs.empty?
 
-            r = @git.execute(dry_push_args)
-            message = if r.fetch(:exit_code).zero?
-                        'ok'
-                      else
-                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
-                      end
-            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+            dry_push_execution_result
           end
 
           def push
@@ -26,7 +20,7 @@ module Avm
               info 'PUSH: Nada a enviar'
             else
               info "PUSH: enviando \"#{pushs}\"..."
-              git(%w[push origin] + pushs)
+              git_execute(%w[push origin] + pushs)
             end
           end
 
@@ -39,7 +33,7 @@ module Avm
           end
 
           def remove_branch_push
-            remote_branch_hash ? ":refs/heads/#{branch}" : nil
+            remote_branch_hash ? ":refs/heads/#{branch.name}" : nil
           end
 
           def tag_push
@@ -47,6 +41,18 @@ module Avm
 
             "#{branch_hash}:#{tag}"
           end
+
+          private
+
+          def dry_push_execution_result
+            r = launcher_git.execute(dry_push_args)
+            message = if r.fetch(:exit_code).zero?
+                        'ok'
+                      else
+                        r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
+                      end
+            ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
+          end
         end
       end
     end

data/sub/avm-git/lib/avm/git/issue/complete/remote.rb

@@ -10,7 +10,7 @@ module Avm
           end
 
           def remote_branch_hash
-            remote_hashs["refs/heads/#{branch}"]
+            remote_hashs["refs/heads/#{branch.name}"]
           end
 
           def remote_tag_hash
@@ -24,7 +24,7 @@ module Avm
           end
 
           def remote_hashs_uncached
-            @git.remote_hashs(remote_name)
+            launcher_git.remote_hashs(remote_name)
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/test.rb

@@ -28,7 +28,7 @@ module Avm
 
           def test_performer
             ::Avm::Sources::Tests::Builder
-              .new(::Avm::Registry.sources.detect(@git))
+              .new(::Avm::Registry.sources.detect(launcher_git))
               .include_main(true)
               .include_subs(true)
               .performer

data/sub/avm-git/lib/avm/git/issue/complete/tracker.rb

@@ -19,7 +19,7 @@ module Avm
           end
 
           def branch_short_hash
-            git(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
+            git_execute(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/validation.rb

@@ -11,6 +11,8 @@ module Avm
           enable_simple_cache
           common_constructor :parent, :key, :label
 
+          SKIPPED_RESULT_MESSAGE = 'skipped'
+
           def skip?
             parent.skip_validations.include?(key)
           end
@@ -18,11 +20,17 @@ module Avm
           private
 
           def result_uncached
-            if skip?
-              ::Avm::Result.neutral('skipped')
-            else
-              parent.send("#{key}_result")
-            end
+            skip? ? skipped_result : validation_result
+          end
+
+          def skipped_result
+            ::Avm::Result.neutral(SKIPPED_RESULT_MESSAGE)
+          end
+
+          def validation_result
+            parent.send("#{key}_result")
+          rescue ::RuntimeError => e
+            ::Avm::Result.error("error raised: #{e.message}")
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete/working_tree.rb

@@ -10,7 +10,7 @@ module Avm
           end
 
           def clean_workspace?
-            @git.dirty_files.none?
+            launcher_git.dirty_files.none?
           end
         end
       end

data/sub/avm-git/lib/avm/git/issue/complete.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
+require 'eac_git/local'
 
 module Avm
   module Git
@@ -10,14 +11,15 @@ module Avm
         enable_simple_cache
         enable_speaker
 
-        attr_reader :skip_validations
+        BRANCH_NAME_ISSUE_ID_PATTERN =
+
+          attr_reader :dir, :skip_validations
 
         def initialize(options)
           consumer = ::EacRubyUtils::OptionsConsumer.new(options)
-          dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
+          @dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
           validate_skip_validations
           consumer.validate
-          @git = ::Avm::Launcher::Git::Base.new(dir)
         end
 
         def start_banner
@@ -35,16 +37,29 @@ module Avm
         end
 
         def issue_id
-          m = branch_name.match(/\A#{Regexp.quote('issue_')}(\d+)\z/)
-          m ? m[1].to_i : nil
+          branch ? issue_id_parser.parse(branch_name) : nil
+        end
+
+        # @return [EacRubyUtils::RegexpParser]
+        def issue_id_parser
+          /\A#{Regexp.quote('issue_')}(\d+)\z/.to_parser { |m| m[1].to_i }
         end
 
         private
 
-        def git(args, exit_outputs = {})
-          r = @git.execute!(args, exit_outputs: exit_outputs)
+        # @return [EacGit::Local]
+        def eac_git_uncached
+          ::EacGit::Local.new(dir)
+        end
+
+        def git_execute(args, exit_outputs = {})
+          r = launcher_git.execute!(args, exit_outputs: exit_outputs)
           r.is_a?(String) ? r.strip : r
         end
+
+        def launcher_git_uncached
+          ::Avm::Launcher::Git::Base.new(dir)
+        end
       end
     end
   end

data/sub/avm-git/lib/avm/git/revision_test.rb

@@ -77,7 +77,7 @@ module Avm
       end
 
       def successful_uncached
-        if options.fetch(:no_cache) || !successful_cache.cached?
+        if options.fetch(:no_cache) || !successful_cache.stored?
           checkout_revision
           run_test
         end

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
   s.add_dependency 'colorize', '~> 0.8.1'
-  s.add_dependency 'eac_config', '~> 0.5', '>= 0.5.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80'
+  s.add_dependency 'eac_config', '~> 0.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.83'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
 end

data/sub/eac_cli/lib/eac_cli/config/entry/options.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     class Entry
       class Options
         enable_simple_cache