avm-tools 0.44.1 → 0.44.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be68fd9248dde307039746994095610b01d6573d51bcbb10fe5e2ea60401e5f
-  data.tar.gz: 96a8c8a84d42f093c3a9f294c5666a81f5dd4a16c175feb5628cfafddac42d31
+  metadata.gz: 7c9d91dc20429e3c9c932f57e47152b19fb1e468f3e564c44f4f395f7d04b5d7
+  data.tar.gz: 18bfbdc67f8f8a9c93bccff6798f4b444fc6c20e3a9a4318e1acae168c6cccd1
 SHA512:
-  metadata.gz: 6474b6c59010f5e188f80fa6af2680b12f75c6b8c5cc0a944bbe6a8c85beb0be96654fa71eb59f86ebf8937e3cd270a83524b184ea8b7755742752f7c786a59d
-  data.tar.gz: 0cc329cd19e10c92ab7ffc38d1afda69bb03c07524a39e557d8d337084897c1b40330808a514603a64bba20d5185824a2fcc3464ddde5d3f6c32588addae644e
+  metadata.gz: ab35a0b3b98a2885cc1de50a117b5fa579429160aa1cae64d9edf4edc94fa819afad0bb470bcbd7b7f293ca3ff90bda4d56c37460455093dab45ac4879174532
+  data.tar.gz: 6f7ec8185a22da62ec5b5ada88065ba74ca6a0971235322732aff502c94d5853be532dc188fae5bef70830de18cd20412af536ff82f3c3dd991d08a69f7a4559

data/lib/avm/files/formatter.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/filesystem_traverser'
+require 'eac_ruby_utils/fs/traversable'
 
 module Avm
   module Files
     class Formatter
+      include ::EacRubyUtils::Fs::Traversable
       require_sub __FILE__
       enable_simple_cache
       enable_console_speaker
@@ -32,7 +33,7 @@ module Avm
         end
       end
 
-      def check_file(file)
+      def traverser_check_file(file)
         format = find_format(file)
         infov file, format ? format.class : '-' if options.fetch(:verbose)
         return unless format
@@ -59,18 +60,11 @@ module Avm
         end
       end
 
-      def fs_traverser_uncached
-        r = ::EacRubyUtils::FilesystemTraverser.new
-        r.check_file = method(:check_file)
-        r.recursive = options.fetch(:recursive)
-        r
-      end
-
       def search_files
         infov 'Directories to search', source_paths.count
         source_paths.each do |source_path|
           infom "Searching files on \"#{source_path}\"..."
-          fs_traverser.check_path(source_path)
+          traverser_check_path(source_path)
         end
       end
 
@@ -83,6 +77,10 @@ module Avm
         end
         infov('Files changed', "#{changed.count}/#{@result.count}")
       end
+
+      def traverser_recursive
+        options.fetch(:recursive)
+      end
     end
   end
 end

data/lib/avm/patches/eac_launcher_git_base.rb

@@ -9,43 +9,66 @@ require 'eac_ruby_utils/require_sub'
 module Avm
   module Patches
     module EacLauncherGitBase
-      def execute(*args)
-        args, options = build_args(args)
-        ::EacRubyUtils::Envs.local.command(*args).execute(options)
-      end
+      extend ::ActiveSupport::Concern
 
-      def command(*args)
-        args, _options = build_args(args)
-        ::EacRubyUtils::Envs.local.command(*args)
+      included do
+        extend ClassMethods
+        include InstanceMethods
       end
 
-      def dirty?
-        dirty_files.any?
-      end
+      module ClassMethods
+        # @return [EacLauncher::Git::Base]
+        def by_root(search_base_path)
+          new(find_root(search_base_path).to_path)
+        end
+
+        # Searches the root path for the Git repository which includes +search_base_path+.
+        # @return [Pathname]
+        def find_root(search_base_path)
+          path = search_base_path.to_pathname.expand_path
+          loop do
+            return path if path.join('.git').exist?
+            raise "\".git\" not found for \"#{search_base_path}\"" if path.parent.root?
 
-      def dirty_files
-        execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
-          parse_status_line(line.gsub(/\n\z/, ''))
+            path = path.parent
+          end
         end
       end
 
-      def root_path
-        r = ::Pathname.new(to_s).expand_path
-        loop do
-          return r if r.join('.git').exist?
-          raise "\".git\" not found for \"#{self}\"" if r.dirname.root?
+      module InstanceMethods
+        def execute(*args)
+          args, options = build_args(args)
+          ::EacRubyUtils::Envs.local.command(*args).execute(options)
+        end
 
-          r = r.dirname
+        def command(*args)
+          args, _options = build_args(args)
+          ::EacRubyUtils::Envs.local.command(*args)
         end
-      end
 
-      private
+        def dirty?
+          dirty_files.any?
+        end
 
-      def parse_status_line(line)
-        m = /\A(.)(.)\s(.+)\z/.match(line)
-        ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
-        ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
-                         absolute_path: ::File.expand_path(m[3], self))
+        def dirty_files
+          execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
+            parse_status_line(line.gsub(/\n\z/, ''))
+          end
+        end
+
+        # @return [Pathname]
+        def root_path
+          @root_path ||= self.class.find_root(to_s)
+        end
+
+        private
+
+        def parse_status_line(line)
+          m = /\A(.)(.)\s(.+)\z/.match(line)
+          ::Kernel.raise "Status pattern does not match \"#{line}\"" unless m
+          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3],
+                           absolute_path: ::File.expand_path(m[3], self))
+        end
       end
     end
   end

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

@@ -30,7 +30,7 @@ module Avm
         end
 
         def git
-          @git ||= ::EacLauncher::Git::Base.new(repository_path)
+          @git ||= ::EacLauncher::Git::Base.by_root(repository_path)
         end
       end
     end

data/lib/avm/tools/runner/git/auto_fixup.rb

@@ -33,7 +33,7 @@ module Avm
 
           def files_from_option
             r = options.fetch('<files>')
-            r.any? ? r : nil
+            r.any? ? r.map { |p| p.to_pathname.expand_path } : nil
           end
 
           def dirty_files

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.44.1'
+    VERSION = '0.44.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.44.1
+  version: 0.44.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement