avm-tools 0.62.3 → 0.62.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373072ac50452efe90c4a8408828dff28b48209d5a387709d89972678ab92e21
-  data.tar.gz: 2f09de5ac81af5bc0992c6c3facb97e908001deffcd5d0f17492fc0258aa415c
+  metadata.gz: 38f999acefb3965e6b892798012b79d38fe80aed211c008efbb4f0e7d0d1de11
+  data.tar.gz: 6bb113d722f19ce336368e675d3785aee55ee1f63e2e67cc3ff3b681c9de5811
 SHA512:
-  metadata.gz: 7a9f83824449276c9fedbd9d7ef07aa8e124f8de1d948c477bb9734c57cfbffef29b1416e249edc5de11e5a23ee9d02c982a9e80d6b9a40b9f9b5a011807d27b
-  data.tar.gz: 5a09becd99a994a50fa875ae2566262c461d3f9bd6557b670c8a1e81d59768f736e59bbad5cbea127efb4ae6476d7104347169b13958c0d15dde5a158e41a5de
+  metadata.gz: 979ca70b0e402b50b7b5a92340d1da20312937e4d9fa7df4bb1dd358e08f68f63a9e973109abb3d5568e5d7e0e4ebef672ed03dbd74d8dc1e992069e1e90bcc1
+  data.tar.gz: 990a1f70e3317c05ac0764b4dfe0d28183eae7723f1b599cfaf2bf7ac192226f45a370f9b6ef29e9bfe367427f67fb3a57cec5764d48d4773601856a2cc9bbfa

data/lib/avm/instances/configuration.rb

@@ -17,15 +17,23 @@ module Avm
           internal_find_path(path.expand_path)
         end
 
-        private
-
-        def internal_find_path(absolute_pathname)
+        def find_in_path(path)
+          absolute_pathname = path.to_pathname.expand_path
           if absolute_pathname.directory?
             FILENAMES.each do |filename|
               file = absolute_pathname.join(filename)
               return new(file) if file.exist?
             end
           end
+          nil
+        end
+
+        private
+
+        def internal_find_path(absolute_pathname)
+          r = find_in_path(absolute_pathname)
+          return r if r.present?
+
           internal_find_path(absolute_pathname.dirname) unless absolute_pathname.root?
         end
       end

data/lib/avm/instances/configuration/_tests.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 
 module Avm
   module Instances

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gems_utils/gem'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Patches
+    module EacRubyGemsUtils
+      module Gem
+        enable_simple_cache
+
+        private
+
+        def configuration_uncached
+          ::Avm::Instances::Configuration.find_in_path(root)
+        end
+
+        def gemfile_path_uncached
+          return super unless configuration.present? && configuration.rubocop_gemfile.present?
+
+          configuration.rubocop_gemfile
+        end
+      end
+    end
+  end
+end
+
+::EacRubyGemsUtils::Gem.prepend(::Avm::Patches::EacRubyGemsUtils::Gem)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/on_clean_ruby_environment'
 
@@ -14,7 +14,7 @@ module Avm
       end
 
       def rubocop_command_by_gemfile_path(path)
-        ::EacRubyGemsUtils::Gem.new(path).bundle('exec', 'rubocop')
+        ::EacRubyGemsUtils::Gem.new(path).bundle('exec', 'rubocop').chdir_root
       end
 
       def rubocop_gemfile?

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.62.3'
+    VERSION = '0.62.4'
   end
 end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -64,7 +64,7 @@ module EacRubyGemsUtils
     end
 
     def gemfile_lock_path_uncached
-      root.join('Gemfile.lock')
+      gemfile_path.basename_sub { |b| "#{b}.lock" }
     end
 
     def gemspec_path_uncached

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.62.3
+  version: 0.62.4
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -374,6 +374,7 @@ files:
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
+- lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
 - lib/avm/projects.rb