avm-tools 0.102.0 → 0.102.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af55442cdb7aacd8752fa1cf1b548fe867d7bdd74dfc9e9abd72d754de22772c
-  data.tar.gz: c9fd2f59d75013325820f1d7ff8c8d54a35c09851a1032ccd31ff95427304a5d
+  metadata.gz: 6182ce43a4fee65202cfec5b9134751ac9b15fb6df367b1393331263264339ef
+  data.tar.gz: 5ecb6def157bb85b53115f4bfe3fcda93f290c0a720a16969577d0606de9b1f9
 SHA512:
-  metadata.gz: c19e110f9557287b2b84b18385370111d1ba5bb1e99636f2425ab2c6a5729599f7d9bdba985fde3e4b4f7e4aece5614c3e443a4e61150370d9c1f2ac08bf411e
-  data.tar.gz: 87dfc0c5042d2c0deba256ad7e7869bf4b547f48c1376f9e25114834e739b6e3d6be7c49cc03d3975128fd27de2b586f933f0f8fd67edffdd5350824f49208eb
+  metadata.gz: bd57b81fdfb81500e6426f17c7e981d141547a174e13d6e109a11b16db0987773bf6ab82269d025da663cb6872464ff883d2367a9809f9a5cb878472c09ac380
+  data.tar.gz: 17af742c5cf348bb9efec3551000f3ce5f0cd79010d2522b2239c61dc4b294dd9e0806e322a6c81a00401171ef87c5710da5ed9757ec0710a7d0f2c2fa60244b

data/lib/avm/docker/registry.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/self/instance'
+require 'eac_docker/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Docker
-    class Registry
+    class Registry < ::EacDocker::Registry
       class << self
         def default
           @default ||= new(::Avm::Self.instance.read_entry(
@@ -13,16 +14,6 @@ module Avm
                            ))
         end
       end
-
-      common_constructor :name
-
-      def to_s
-        name
-      end
-
-      def sub(suffix)
-        self.class.new("#{name}#{suffix}")
-      end
     end
   end
 end

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

@@ -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/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/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.102.0'
+    VERSION = '0.102.1'
   end
 end

data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb

@@ -6,6 +6,7 @@ require 'docopt'
 module EacCli
   class DocoptRunner
     require_sub __FILE__
+    extend ::EacCli::DocoptRunner::ClassMethods
     include ::EacCli::DocoptRunner::Context
 
     class << self

data/vendor/eac_cli/lib/eac_cli/docopt_runner/{_class_methods.rb → class_methods.rb}

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'docopt'
+
 module EacCli
   class DocoptRunner
-    DOCOPT_ERROR_EXIT_CODE = 0xC0
+    module ClassMethods
+      DOCOPT_ERROR_EXIT_CODE = 0xC0
 
-    class << self
       def run(options = {})
         create(options).send(:run)
-      rescue Docopt::Exit => e
+      rescue ::Docopt::Exit => e
         STDERR.write(e.message + "\n")
         ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE)
       end

data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/speaker'
+
 module EacCli
   module Runner
     module AfterClassMethods
@@ -10,9 +13,11 @@ module EacCli
       end
 
       def run(*runner_context_args)
-        r = create(*runner_context_args)
-        r.run_run
-        r
+        on_asserted_speaker do
+          r = create(*runner_context_args)
+          r.run_run
+          r
+        end
       end
 
       def runner_definition(&block)
@@ -24,6 +29,18 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
     end
   end
 end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.20.0'
+  VERSION = '0.20.2'
 end

data/vendor/eac_git/lib/eac_git/local.rb

@@ -39,13 +39,17 @@ module EacGit
       ::EacGit::Executables.git.command('-C', root_path.to_path, *args)
     end
 
+    def raise_error(message)
+      raise "#{root_path}: #{message}"
+    end
+
     def rev_parse(ref, required = false)
       r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
       r.strip! if r.is_a?(String)
       return r if r.present?
       return nil unless required
 
-      raise "Reference \"#{ref}\" not found"
+      raise_error "Reference \"#{ref}\" not found"
     end
 
     def subrepo(subpath)

data/vendor/eac_git/lib/eac_git/local/subrepo.rb

@@ -12,7 +12,8 @@ module EacGit
 
       common_constructor :local, :subpath do
         self.subpath = subpath.to_pathname
-        raise "Config file \"#{config_absolute_path}\" not found" unless config_absolute_path.file?
+        local.raise_error "Config file \"#{config_absolute_path}\" not found" unless
+          config_absolute_path.file?
       end
 
       def command(subrepo_subcommand, *subrepo_subcommand_args)

data/vendor/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_base0/application_xdg'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/filesystem_cache'
@@ -21,16 +22,8 @@ module EacRubyBase0
       vendor_gems + [self_gem]
     end
 
-    { cache: '.cache', config: '.config', data: '.local/share' }.each do |item, subpath|
-      xdg_env_method_name = "#{item}_xdg_env"
-
-      define_method xdg_env_method_name do
-        ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
-      end
-
-      define_method "#{item}_dir" do
-        (send(xdg_env_method_name) || home_dir.join(subpath)).join(name)
-      end
+    ::EacRubyBase0::ApplicationXdg::DIRECTORIES.each_key do |item|
+      delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
     def fs_cache
@@ -40,7 +33,7 @@ module EacRubyBase0
     end
 
     def home_dir
-      @home_dir ||= (options[OPTION_HOME_DIR] || ENV.fetch('HOME')).to_pathname
+      app_xdg.user_home_dir
     end
 
     def name
@@ -53,6 +46,10 @@ module EacRubyBase0
 
     private
 
+    def app_xdg_uncached
+      ::EacRubyBase0::ApplicationXdg.new(name, options[OPTION_HOME_DIR])
+    end
+
     def self_gem_uncached
       ::EacRubyGemsUtils::Gem.new(gemspec_dir)
     end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacRubyBase0
+  # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  class ApplicationXdg
+    class << self
+      # @return [Pathname]
+      def user_home_dir_from_env
+        ENV.fetch('HOME').to_pathname
+      end
+    end
+
+    DIRECTORIES = { cache: '.cache', config: '.config', data: '.local/share',
+                    state: '.local/state' }.freeze
+
+    common_constructor :app_name, :user_home_dir, default: [nil] do
+      self.user_home_dir ||= self.class.user_home_dir_from_env
+    end
+
+    DIRECTORIES.each do |item, subpath|
+      xdg_env_method_name = "#{item}_xdg_env"
+
+      define_method xdg_env_method_name do
+        ENV["XDG_#{item.upcase}_HOME"].if_present(&:to_pathname)
+      end
+
+      define_method "#{item}_dir" do
+        (send(xdg_env_method_name) || user_home_dir.join(subpath)).join(app_name)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb

@@ -12,6 +12,7 @@ module EacRubyBase0
       common_concern do
         include ::EacCli::Runner
         enable_settings_provider
+        enable_simple_cache
         runner_definition do
           bool_opt '--no', 'Deny confirmation without question.'
           bool_opt '--yes', 'Accept confirmation without question.'
@@ -31,6 +32,12 @@ module EacRubyBase0
       def run_confirm(message = nil)
         yield if confirm?(message)
       end
+
+      private
+
+      def cached_confirm_uncached?(message = nil)
+        confirm?(message)
+      end
     end
   end
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.7.4'
+  VERSION = '0.8.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb

@@ -3,11 +3,19 @@
 module EacRubyUtils
   module SimpleCache
     UNCACHED_METHOD_NAME_SUFFIX = '_uncached'
-    UNCACHED_METHOD_PATTERN = /\A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}\z/.freeze
+    UNCACHED_METHOD_PATTERN = /
+      \A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}([\!\?]?)\z
+    /x.freeze
 
     class << self
       def uncached_method_name(method_name)
-        "#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}"
+        method_name = method_name.to_s
+        end_mark = nil
+        if %w[! ?].any? { |mark| method_name.end_with?(mark) }
+          end_mark = method_name[-1]
+          method_name = method_name[0..-2]
+        end
+        "#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}#{end_mark}"
       end
     end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.67.0'
+  VERSION = '0.68.0'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb

@@ -10,6 +10,14 @@ class CacheableObject
     @counter += 1
   end
 
+  def method_with_question_uncached?
+    'question'
+  end
+
+  def method_with_exclamation_uncached!
+    'exclamation'
+  end
+
   def method_with_args_uncached(arg1)
     @counter2 ||= 0
     @counter2 += 1
@@ -74,6 +82,16 @@ RSpec.describe ::EacRubyUtils::SimpleCache do
     end
   end
 
+  describe 'method with marks' do
+    it 'found uncached method with exclamation mark' do
+      expect(instance.method_with_exclamation!).to eq('exclamation')
+    end
+
+    it 'found uncached method with question mark' do
+      expect(instance.method_with_question?).to eq('question')
+    end
+  end
+
   describe '#respond_to?' do
     it 'responds to cached method without args' do
       expect(instance.respond_to?(:my_method)).to be(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.102.0
+  version: 0.102.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -734,10 +734,10 @@ files:
 - vendor/eac_cli/lib/eac_cli/docopt/runner_context_replacement.rb
 - vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb
 - vendor/eac_cli/lib/eac_cli/docopt_runner.rb
-- vendor/eac_cli/lib/eac_cli/docopt_runner/_class_methods.rb
 - vendor/eac_cli/lib/eac_cli/docopt_runner/_doc.rb
 - vendor/eac_cli/lib/eac_cli/docopt_runner/_settings.rb
 - vendor/eac_cli/lib/eac_cli/docopt_runner/_subcommands.rb
+- vendor/eac_cli/lib/eac_cli/docopt_runner/class_methods.rb
 - vendor/eac_cli/lib/eac_cli/docopt_runner/context.rb
 - vendor/eac_cli/lib/eac_cli/old_configs.rb
 - vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb
@@ -1060,6 +1060,7 @@ files:
 - vendor/eac_ruby_base0/eac_ruby_base0.gemspec
 - vendor/eac_ruby_base0/lib/eac_ruby_base0.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/application_xdg.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/patches.rb