avm-tools 0.100.0 → 0.103.0

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'clipboard'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Tracker
+          def clipboard_copy_tracker_message
+            ::Clipboard.copy(textile_tracker_message)
+            infov 'Copied to clipboard', textile_tracker_message
+          end
+
+          private
+
+          def textile_tracker_message_uncached
+            "Revisado para commit:#{branch_short_hash}, ok."
+          end
+
+          def branch_short_hash
+            git(['log', '--pretty=format:%h', '-1', '-q', branch_hash])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/validations.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'avm/git/issue/complete/validation'
+require 'avm/result'
+require 'ostruct'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module Validations
+          VALIDATIONS = {
+            clean_workspace: 'Clean workspace?',
+            branch_name: 'Branch name',
+            branch_hash: 'Branch hash',
+            follow_master: 'Follow master?',
+            commits: 'Commits?',
+            bifurcations: 'Bifurcations?',
+            dry_push: 'Dry push?',
+            git_subrepos: 'Git subrepos ok?',
+            test: 'Test ok?'
+          }.with_indifferent_access.freeze
+
+          def valid?
+            validations.map(&:result).none?(&:error?)
+          end
+
+          def validations_banner
+            validations.each do |v|
+              infov "[#{v.key}] #{v.label}", v.result.label
+            end
+          end
+
+          def validate_skip_validations
+            skip_validations.each do |validation|
+              next if VALIDATIONS.keys.include?(validation)
+
+              raise "\"#{validation}\" is not a registered validation"
+            end
+          end
+
+          private
+
+          def validations_uncached
+            VALIDATIONS.map do |key, label|
+              ::Avm::Git::Issue::Complete::Validation.new(self, key, label)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module WorkingTree
+          def clean_workspace_result
+            ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+          end
+
+          def clean_workspace?
+            @git.dirty_files.none?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/revision_test.rb

@@ -13,12 +13,8 @@ module Avm
 
       def banner
         infov 'Revision to test', sha1
-        on_speaker_node do |node|
-          node.stderr_line_prefix = '  '
-          infov '* Subject', commit.subject
-          infov '* Success?', successful_label
-          infov '* STDOUT', stdout_cache.content_path
-          infov '* STDERR', stderr_cache.content_path
+        ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
+          revision_banner
         end
       end
 
@@ -49,6 +45,13 @@ module Avm
         ::File.expand_path(git.to_s)
       end
 
+      def revision_banner
+        infov '* Subject', commit.subject
+        infov '* Success?', successful_label
+        infov '* STDOUT', stdout_cache.content_path
+        infov '* STDERR', stderr_cache.content_path
+      end
+
       def root_cache
         ::Avm.fs_cache.child('git', 'revision_test', git_absolute_path.parameterize, sha1,
                              options.fetch(:test_command).to_s.parameterize)

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

@@ -33,6 +33,7 @@ module Avm
 
         def docker_image_uncached
           r = docker_image_class.new(docker_image_options.fetch(:registry))
+          r.instance = self if r.respond_to?(:instance)
           r.version = docker_image_options[:version] if docker_image_options.key?(:version)
           r.snapshot = docker_image_options[:snapshot] if docker_image_options.key?(:snapshot)
           r

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

@@ -7,9 +7,14 @@ module Avm
     class Base
       module EntryKeys
         ::Avm::Instances::EntryKeys.all.each do |key|
-          define_method key.to_s.variableize do
+          method_name = key.to_s.variableize
+          define_method method_name do
             read_entry(key)
           end
+
+          define_method "#{method_name}_optional" do
+            read_entry(key, required: false)
+          end
         end
       end
     end

data/lib/avm/instances/docker_image.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/docker/image'
+
+module Avm
+  module Instances
+    class DockerImage < ::Avm::Docker::Image
+      attr_accessor :instance
+
+      def stereotype_tag
+        instance.id
+      end
+    end
+  end
+end

data/lib/avm/instances/entries.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/configs'
 require 'avm/instances/entry'
 
 module Avm

data/lib/avm/instances/entry.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/apps/config'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -30,7 +31,7 @@ module Avm
       end
 
       def read(extra_options = {})
-        ::Avm.configs.read_entry(full_path, options.merge(extra_options))
+        ::Avm::Apps::Config.current.entry(full_path, options.merge(extra_options)).value
       end
 
       def suffix_as_array
@@ -46,7 +47,7 @@ module Avm
       end
 
       def write(value)
-        ::Avm.configs.sub.entry(full_path).value = value
+        ::Avm::Apps::Config.current.entry(full_path).value = value
       end
     end
   end

data/lib/avm/instances/entry_keys.rb

@@ -44,6 +44,7 @@ module Avm
       {
         '' => %w[fs_path host_id source_instance_id],
         database: %w[id hostname limit name password port system timeout username],
+        docker: %w[registry],
         mailer: {
           '' => %w[id from reply_to],
           smtp: %w[address port domain username password authentication starttls_auto]

data/lib/avm/launcher/context.rb

@@ -13,7 +13,7 @@ module Avm
   module Launcher
     class Context
       include ::EacRubyUtils::SimpleCache
-      include ::EacCli::Speaker
+      enable_speaker
 
       DEFAULT_PROJECTS_ROOT = '.'
       DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')

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

@@ -10,7 +10,7 @@ module Avm
     module Git
       class PublishBase < ::Avm::Launcher::Publish::Base
         include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        enable_speaker
 
         CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                       local_following].freeze
@@ -26,6 +26,8 @@ module Avm
             return result if result
           end
           divergent_result_check_result
+        rescue ::Avm::Launcher::Instances::Error => e
+          ::Avm::Launcher::Publish::CheckResult.blocked(e.message)
         rescue ::StandardError => e
           raise e unless remote_unavailable_error?(e)
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/git/mirror_update'
+require 'avm/launcher/instances/error'
 require 'avm/launcher/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
@@ -27,7 +28,17 @@ module Avm
 
         attr_reader :instance
 
+        def validate_source_current_revision
+          if source_git.rev_parse(source_instance.options.git_current_revision, false).present?
+            return
+          end
+
+          raise ::Avm::Launcher::Instances::Error, 'Refspec ' \
+            "\"#{source_instance.options.git_current_revision}\" not found in \"#{source_git}\""
+        end
+
         def update
+          validate_source_current_revision
           ::Avm::Launcher::Git::MirrorUpdate.new(
             path,
             source_instance.real,

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

@@ -2,6 +2,7 @@
 
 require_relative 'base/cache'
 require 'avm/launcher/errors/non_project'
+require 'eac_ruby_utils/speaker/sender'
 
 module Avm
   module Launcher
@@ -10,7 +11,7 @@ module Avm
         class << self
           def extend_object(object)
             object.extend ::EacRubyUtils::SimpleCache
-            object.extend ::EacCli::Speaker
+            object.extend ::EacRubyUtils::Speaker::Sender
             object.extend ::Avm::Launcher::Instances::Base::Cache
             super
           end

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

@@ -3,9 +3,7 @@
 module Avm
   module Launcher
     module Instances
-      module Errors
-        class Error < StandardError
-        end
+      class Error < StandardError
       end
     end
   end

data/lib/avm/launcher/ruby/gem/build.rb

@@ -10,7 +10,7 @@ module Avm
     module Ruby
       module Gem
         class Build
-          include ::EacCli::Speaker
+          enable_speaker
 
           def initialize(original_gem_root)
             @original_gem_root = original_gem_root

data/lib/avm/projects/stereotype/job_comparator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotype
+      class JobComparator
+        common_constructor :job1, :job2
+
+        def result
+          return -1 if run_before?(job1, job2)
+          return 1 if run_before?(job2, job1)
+
+          job1.object_id <=> job2.class.name
+        end
+
+        private
+
+        def run_before?(a_job, other_job)
+          return false unless a_job.respond_to?(:run_before)
+
+          a_job.run_before.map(&:to_sym).include?(job_stereotype_key(other_job))
+        end
+
+        def job_stereotype_key(job)
+          job.class.name.split('::')[0..-2].join('::').demodulize.variableize.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git/update.rb

@@ -19,8 +19,7 @@ module Avm
             clean_all
             selected_subrepos.map do |f|
               infov 'Subrepo', f
-              on_speaker_node do |node|
-                node.stderr_line_prefix = '  '
+              ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
                 ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
               end
             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/projects/stereotypes/ruby_gem/publish.rb

@@ -15,7 +15,7 @@ module Avm
       class RubyGem
         class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacCli::Speaker
+          enable_speaker
 
           protected
 

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -19,6 +19,10 @@ module Avm
             gemfile_lock_commit
           end
 
+          def run_before
+            [:git]
+          end
+
           private
 
           def bundle_update

data/lib/avm/self.rb

@@ -1,5 +1,6 @@
 # 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'
@@ -13,6 +14,14 @@ 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::Self::Instance.by_id('avm-tools_self')
       end

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

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