eac_git 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d32eaed0f2452280704ed81b57451f95d483778aaef75d6eec7dcdbc2082cd4
-  data.tar.gz: d3d015e778d5f1ffb030077c7327c04ccc493cc278ca6e7e780989e3520e6aae
+  metadata.gz: 4e93bc1263137fa2c49da54b4d9e126e66d18a366f3905600123aa29a7d1433b
+  data.tar.gz: e3b1255fcb3afbb74564e8b5e6518066d45c5c4f95a980a302fae55db5e07e4a
 SHA512:
-  metadata.gz: d472751905e193ff6e611e9edeb57bfc0d729d8ed8fdeb263cc4660d223b9a9bc97a21770a7cc8cd5feb4ac487345dd4bd71cec698a28162b25a76ebf56ca4c7
-  data.tar.gz: a09a19a625eb6b54b00a6db0f4c39203c1af5a0dd238e5b52990f2e80ce2f027d97a49fa6c0fa4116b9a6babd72c6554bff5eecce4a9750f5f73d8892262dc2d
+  metadata.gz: c0093f9f61cca73f4335c53c0e1c454ecb13e35a133d20f575de5c671da4687cd7d0722cfac8d6a5f8507da6dec1a5dd83063fcbd0d18b94bb27044d5cfa9d06
+  data.tar.gz: b7dad37d8394f54b5077fa34933a54a6319275f81544b9c097272a8758261d147a42e04812861f6cfdddebc6778b50a3d04d6e6de996be48234e0bbeb553934b

data/lib/eac_git/executables.rb

@@ -20,6 +20,10 @@ module EacGit
         r
       end
 
+      def tar_uncached
+        env.executable('tar', '--version')
+      end
+
       module GitCommandExtensions
         def command(*args)
           super(*args).envvar('PATH', path_with_git_subrepo)

data/lib/eac_git/local.rb

@@ -12,6 +12,10 @@ module EacGit
       self.root_path = root_path.to_pathname
     end
 
+    def commit(ref, required = false)
+      rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?

data/lib/eac_git/local/commit.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Commit
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+
+      FIELDS = {
+        author_name: '%an', author_email: '%ae', author_date: '%ai',
+        subject: '%s',
+        author_all: '%an <%ae>, %ai',
+        commiter_name: '%cn', commiter_email: '%ce', commiter_date: '%ci',
+        commiter_all: '%cn <%ce>, %ci'
+      }.freeze
+
+      common_constructor :repo, :hash
+
+      def format(format)
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", hash).execute!.strip
+      end
+
+      FIELDS.each do |field, format|
+        define_method(field) { format(format) }
+      end
+
+      def changed_files_uncached
+        diff_tree_execute.each_line.map do |line|
+          ::EacGit::Local::Commit::ChangedFile.new(self, line)
+        end
+      end
+
+      def changed_files_size_uncached
+        changed_files.inject(0) { |a, e| a + e.dst_size }
+      end
+
+      def root_child?
+        format('%P').blank?
+      end
+
+      private
+
+      def diff_tree_execute
+        args = []
+        args << '--root' if root_child?
+        args << hash
+        repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
+      end
+    end
+  end
+end

data/lib/eac_git/local/commit/archive.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Commit
+      module Archive
+        # @return [EacRubyUtils::Envs::Command]
+        def archive_to_dir(path)
+          path = path.to_pathname
+          repo.command('archive', '--format=tar', hash).pipe(
+            ::EacGit::Executables.tar.command('-xC', path)
+          )
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/local/commit/changed_file.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_git/local/commit/diff_tree_line'
+
+module EacGit
+  class Local
+    class Commit
+      class ChangedFile
+        enable_simple_cache
+
+        attr_reader :commit, :diff_tree
+
+        # @param commit [EacGit::Local::Commit]
+        # @param diff_tree_line [String] A line from command "repo diff-tree --no-commit-id -r
+        #   --full-index"'s output.
+        def initialize(commit, diff_tree_line)
+          @commit = commit
+          @diff_tree = ::EacGit::Local::Commit::DiffTreeLine.new(diff_tree_line)
+        end
+
+        delegate(*::EacGit::Local::Commit::DiffTreeLine::FIELDS, to: :diff_tree)
+
+        def to_s
+          "#{path}|#{status}"
+        end
+
+        def src_size_uncached
+          size(src_sha1)
+        end
+
+        def dst_size_uncached
+          size(dst_sha1)
+        end
+
+        private
+
+        def size(id)
+          return 0 if /\A0+\z/.match(id)
+
+          commit.repo.command('cat-file', '-s', id).execute!.strip.to_i
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/local/commit/diff_tree_line.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module EacGit
+  class Local
+    class Commit
+      class DiffTreeLine
+        DIFF_TREE_PATTERN = /\A:(\d{6}) (\d{6}) (\S+) (\S+) (\S+)\t(\S.*)\z/.freeze
+        FIELDS = %w[src_mode dst_mode src_sha1 dst_sha1 status path].freeze
+        GIT_COMMAND_ARGS = %w[-c core.quotepath=off diff-tree --no-commit-id -r --full-index].freeze
+
+        attr_reader(*FIELDS)
+
+        # line: a line of command "git [GIT_COMMAND_ARGS]"'s output.
+        # Reference: https://git-scm.com/docs/git-diff-tree
+        def initialize(line)
+          m = DIFF_TREE_PATTERN.match(line.strip)
+          raise "\"#{line}\" did not match pattern" unless m
+
+          FIELDS.count.times { |i| send("#{FIELDS[i]}=", m[i + 1]) }
+        end
+
+        def fields
+          FIELDS.map { |field| [field, send(field)] }.to_h
+        end
+
+        private
+
+        attr_writer(*FIELDS)
+      end
+    end
+  end
+end

data/lib/eac_git/local/dirty_files.rb

@@ -20,9 +20,8 @@ module EacGit
       end
 
       def dirty_files
-        command('status', '--porcelain', '--untracked-files').execute!.each_line.map do |line|
-          parse_status_line(line.gsub(/\n\z/, ''))
-        end
+        command('status', '--porcelain=v1', '--untracked-files', '--no-renames')
+          .execute!.each_line.map { |line| parse_status_line(line.gsub(/\n\z/, '')) }
       end
 
       private

data/lib/eac_git/rspec.rb

@@ -5,12 +5,17 @@ require 'eac_git/executables'
 
 module EacGit
   module Rspec
+    require_sub __FILE__
+
     class << self
       def configure
         ::EacRubyUtils::Rspec::Conditional.default.add(:git) do
           ::EacGit::Executables.git.validate
         end
-        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
+        RSpec.configure do |config|
+          ::EacRubyUtils::Rspec::Conditional.default.configure(config)
+          config.include ::EacGit::Rspec::StubbedGitLocalRepo
+        end
       end
     end
   end

data/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_ruby_utils/envs'
+require 'fileutils'
+require 'tmpdir'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      def stubbed_git_local_repo(bare = false)
+        path = ::Dir.mktmpdir
+        ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
+        repo = StubbedGitRepository.new(path)
+        repo.command('config', 'user.email', 'theuser@example.net').execute!
+        repo.command('config', 'user.name', 'The User').execute!
+        repo
+      end
+
+      private
+
+      def stubbed_git_local_repo_args(path, bare)
+        r = %w[git init]
+        r << '--bare' if bare
+        r + [path]
+      end
+
+      class StubbedGitRepository < ::EacGit::Local
+        def file(*subpath)
+          StubbedGitRepositoryFile.new(self, subpath)
+        end
+      end
+
+      class StubbedGitRepositoryFile
+        attr_reader :git, :subpath
+
+        def initialize(git, subpath)
+          @git = git
+          @subpath = subpath
+        end
+
+        def path
+          git.root_path.join(*subpath)
+        end
+
+        def touch
+          ::FileUtils.touch(path.to_path)
+        end
+
+        def delete
+          path.unlink
+        end
+
+        def write(content)
+          path.write(content)
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -45,25 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.8
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_gem_support
+  name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 description: 
 email: 
 executables: []
@@ -73,12 +81,17 @@ files:
 - lib/eac_git.rb
 - lib/eac_git/executables.rb
 - lib/eac_git/local.rb
+- lib/eac_git/local/commit.rb
+- lib/eac_git/local/commit/archive.rb
+- lib/eac_git/local/commit/changed_file.rb
+- lib/eac_git/local/commit/diff_tree_line.rb
 - lib/eac_git/local/dirty_files.rb
 - lib/eac_git/local/subrepo.rb
 - lib/eac_git/local/subrepo/config.rb
 - lib/eac_git/remote.rb
 - lib/eac_git/remote/ls_result.rb
 - lib/eac_git/rspec.rb
+- lib/eac_git/rspec/stubbed_git_local_repo.rb
 - lib/eac_git/version.rb
 - vendor/git-subrepo/Changes
 - vendor/git-subrepo/Intro.pod
@@ -283,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Put here de description.