eac_git 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbaa3bcfa8bc46c1f611e08799e4a391d73ff3851f71ed3d076f1acd5c2f6ff
-  data.tar.gz: 90e5a236919f519e06c8ff11321417e140a91c8f95be074d546584e8cd2d6927
+  metadata.gz: e3e59f62094b03ab4c24d4ee36a542cef813a308c797a8835482ae52174d50ea
+  data.tar.gz: 9c1dcb9b11dbd6cd4292f198a77efb089dae5ecc06ff077f89f94a9d6423ad9b
 SHA512:
-  metadata.gz: 85545d07434e100d1ddaa58c2bdcfcaa10ea0f4faefa54a35bcaf8fc1caf75443e8eaea471d5998b24e90ba73408c5e71f8cb182a5beac12138bf4a66b90b79a
-  data.tar.gz: 4f040b8eb11a692e63e464a53b41d84974d491db29ae4a16362940f0524cb2529fee319eaec2b41756af12e357a2a60fd5a07324436847163a530173793baf3c
+  metadata.gz: dbd211017dbe7125bfdff651ca0336573a09cd37ad160ab627a61f0d5bd21a9aa73896a074af517623ea8854d525cee93651f9b23d64b799192aea2ce40a0cff
+  data.tar.gz: ecf155ca625baca1be22721e7dbf29807c49a3d5d3e8d4eaf26c36466f99bea708fc55ddf17d9e0c26dbb3c4c533f6d18917aab860693f14205f36055344f132

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

@@ -9,7 +9,7 @@ module EacGit
         # @return [EacRubyUtils::Envs::Command]
         def archive_to_dir(path)
           path = path.to_pathname
-          repo.command('archive', '--format=tar', hash).pipe(
+          repo.command('archive', '--format=tar', id).pipe(
             ::EacGit::Executables.tar.command('-xC', path)
           )
         end

data/lib/eac_git/local/commit.rb

@@ -7,19 +7,25 @@ module EacGit
     class Commit
       require_sub __FILE__, include_modules: true
       enable_simple_cache
+      include ::Comparable
 
       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'
+        commiter_all: '%cn <%ce>, %ci',
+        raw_body: '%B'
       }.freeze
 
-      common_constructor :repo, :hash
+      common_constructor :repo, :id
+
+      def <=>(other)
+        [repo, id] <=> [other.repo, other.id]
+      end
 
       def format(format)
-        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", hash).execute!.strip
+        repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", id).execute!.strip
       end
 
       FIELDS.each do |field, format|
@@ -36,8 +42,21 @@ module EacGit
         changed_files.inject(0) { |a, e| a + e.dst_size }
       end
 
+      # @return [EacGit::Local::Commit, nil]
+      def parent
+        ps = parents
+        raise "#{self} has more than one parent" if ps.count > 2
+
+        ps.empty? ? nil : ps.first
+      end
+
+      # @return [Array<EacGit::Local::Commit>]
+      def parents
+        format('%P').each_line.map { |line| repo.commitize(line) }
+      end
+
       def root_child?
-        format('%P').blank?
+        parents.empty?
       end
 
       private
@@ -45,7 +64,7 @@ module EacGit
       def diff_tree_execute
         args = []
         args << '--root' if root_child?
-        args << hash
+        args << id
         repo.command(*::EacGit::Local::Commit::DiffTreeLine::GIT_COMMAND_ARGS, *args).execute!
       end
     end

data/lib/eac_git/local/log.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    module Log
+      def log(until_commit = nil, from_commit = nil)
+        until_commit, from_commit = [until_commit, from_commit].map { |c| commitize(c) }
+        from_commit ||= head
+        command('log', '--format=%H', "#{until_commit.id}..#{from_commit.id}")
+          .execute!.each_line.map { |line| commitize(line.strip) }
+      end
+    end
+  end
+end

data/lib/eac_git/local.rb

@@ -7,15 +7,43 @@ module EacGit
   # A Git repository in local filesystem.
   class Local
     require_sub __FILE__, include_modules: true
+    include ::Comparable
+
+    HEAD_REFERENCE = 'HEAD'
+
+    class << self
+      def find(path)
+        path = path.to_pathname.expand_path
+        if path.join('.git').exist?
+          new(path)
+        elsif path.to_path != '/'
+          find(path.parent)
+        end
+      end
+    end
 
     common_constructor :root_path do
       self.root_path = root_path.to_pathname
     end
 
+    def <=>(other)
+      root_path <=> other.root_path
+    end
+
     def commit(ref, required = false)
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
+    def commitize(source)
+      if source.is_a?(::EacGit::Local::Commit)
+        return source if source.repo == self
+
+        source = source.id
+      end
+
+      source.to_s.strip.if_present(nil) { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?
@@ -24,6 +52,11 @@ module EacGit
       base == revparse
     end
 
+    # @return [EacGit::Local::Commit
+    def head(required = true)
+      commit(HEAD_REFERENCE, required)
+    end
+
     def merge_base(*commits)
       refs = commits.dup
       while refs.count > 1
@@ -56,6 +89,12 @@ module EacGit
       ::EacGit::Local::Subrepo.new(self, subpath)
     end
 
+    # @return [Array<EacGit::Local::Subrepo>]
+    def subrepos
+      command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip).select(&:present?)
+                                        .map { |subpath| subrepo(subpath) }
+    end
+
     def to_s
       "#{self.class}[#{root_path}]"
     end

data/lib/eac_git/rspec/setup.rb

@@ -5,20 +5,18 @@ require 'eac_git/rspec/stubbed_git_local_repo'
 
 module EacGit
   module Rspec
-    class Setup
-      common_constructor :setup_obj
-
-      def perform
-        setup_conditional_git
-        setup_stubbed_git_local_repo
+    module Setup
+      def self.extended(setup_obj)
+        setup_obj.setup_conditional_git
+        setup_obj.setup_stubbed_git_local_repo
       end
 
       def setup_conditional_git
-        setup_obj.conditional(:git) { ::EacGit::Executables.git.validate }
+        conditional(:git) { ::EacGit::Executables.git.validate }
       end
 
       def setup_stubbed_git_local_repo
-        setup_obj.rspec_config.include ::EacGit::Rspec::StubbedGitLocalRepo
+        rspec_config.include ::EacGit::Rspec::StubbedGitLocalRepo
       end
     end
   end

data/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -3,6 +3,7 @@
 require 'eac_git/local'
 require 'eac_ruby_utils/envs'
 require 'fileutils'
+require 'securerandom'
 require 'tmpdir'
 
 module EacGit
@@ -29,6 +30,16 @@ module EacGit
         def file(*subpath)
           StubbedGitRepositoryFile.new(self, subpath)
         end
+
+        # @return [EacGit::Local::Commit
+        def random_commit
+          content = ::SecureRandom.hex
+          file = "#{content}.txt"
+          file(file).write(content)
+          command('add', file).execute!
+          command('commit', '-m', "Random commit: #{file}.").execute!
+          head
+        end
       end
 
       class StubbedGitRepositoryFile

data/lib/eac_git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.72'
+        version: '0.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.72'
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 description: 
 email: 
 executables: []
@@ -98,6 +98,7 @@ files:
 - 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/log.rb
 - lib/eac_git/local/subrepo.rb
 - lib/eac_git/local/subrepo/config.rb
 - lib/eac_git/remote.rb