eac_git 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666b1ea54c39fca3540650e25d754d02b665e9f66668f190b1f7bf187098edb6
-  data.tar.gz: 606c1187283de19695be48cf13aadb345b60ac4f0625d3477e97532e763ced4a
+  metadata.gz: e3e59f62094b03ab4c24d4ee36a542cef813a308c797a8835482ae52174d50ea
+  data.tar.gz: 9c1dcb9b11dbd6cd4292f198a77efb089dae5ecc06ff077f89f94a9d6423ad9b
 SHA512:
-  metadata.gz: 477b98b77bdefc6d1622603263eea2b60fde7736b2e44f36d201da1f6d0d37113d10c53a609876dad2338cdf48c18303105dfd3106952acb7154bff8491ca00d
-  data.tar.gz: d2cbcd3b0f43cd10bbfc1c17bb7fad3704927aa7585ab061aa04a396002d53cbb94dc07faef5369738c09e2c260a83183cd27f7ae23ba43a0e9acbdb7b46224c
+  metadata.gz: dbd211017dbe7125bfdff651ca0336573a09cd37ad160ab627a61f0d5bd21a9aa73896a074af517623ea8854d525cee93651f9b23d64b799192aea2ce40a0cff
+  data.tar.gz: ecf155ca625baca1be22721e7dbf29807c49a3d5d3e8d4eaf26c36466f99bea708fc55ddf17d9e0c26dbb3c4c533f6d18917aab860693f14205f36055344f132

data/lib/eac_git/local/commit.rb

@@ -7,17 +7,23 @@ 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, :id
 
+      def <=>(other)
+        [repo, id] <=> [other.repo, other.id]
+      end
+
       def format(format)
         repo.command('--no-pager', 'log', '-1', "--pretty=format:#{format}", id).execute!.strip
       end
@@ -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

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,17 +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?
@@ -63,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/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.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -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