eac_git 0.7.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0ec8dfe1a1b3cf7fdad28298c2eec04945cfcf3424bf39b1a3c4c9b5f0a9df
-  data.tar.gz: f1b66e2d4f98f75a8768ae9e9cd773f4630e7d966e2762fbd540a36df28772bc
+  metadata.gz: 5583900c213a539c619f4d6e7fca1ee9ad8d0c2188549097e572e2c69160aa63
+  data.tar.gz: 9de7fa274c112090871bcc160d54bf3cc3b9730f8bc603852044d1d20145c8da
 SHA512:
-  metadata.gz: 501347637df536d4bf23ad9c724a19eb289ff1efb80570226528f7f246844c66dbf124cdd004a7fe35f0c5c089e054a536a2d56a67134bba207d796953402d40
-  data.tar.gz: 59c40599027f0c05d7a24a50e161b31e311cf0bd3383c1fe8dd07f0ec821f3a0176c85e38f25de29bd3de3dfd19e72d108a9b6b4608d3976e3cf78e9adce2cc1
+  metadata.gz: abf9630280dce2fd8252797e7c15620d0d2ae017e0d856ddb21ff96158812a3d95fb20f4a068e6d338690a40510cd3dafd60c207a208f1d1dea1f0bf80812102
+  data.tar.gz: 6839845a4a856bd6d01cc5642bc03bc44afa29a1f7623cb19e226b49ee1c763ddcacce19c2da56c41eb2d096fda61349edcd020e400e7b6255d4623a9dec768b

data/lib/eac_git/local/branch.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Branch
+      REFS_PREFIX = 'refs/heads/'
+
+      common_constructor :local, :name
+
+      # @return [String]
+      def current_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @return [Boolean]
+      def exist?
+        local.command('show-ref', '--quiet', full_ref_name).execute.fetch(:exit_code).zero?
+      end
+
+      def full_ref_name
+        "#{REFS_PREFIX}#{name}"
+      end
+    end
+  end
+end

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/remote.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Remote
+      NO_SUCH_REMOTE_CODE = 128
+
+      enable_simple_cache
+
+      common_constructor :local, :name
+
+      def exist?
+        url
+      end
+
+      # @return [String, nil]
+      def url
+        local.command('remote', 'get-url', name)
+             .execute!(exit_outputs: { NO_SUCH_REMOTE_CODE => nil })
+             .if_present(nil, &:strip)
+      end
+    end
+  end
+end

data/lib/eac_git/local.rb

@@ -7,15 +7,61 @@ 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
+
+    # Retrieves a local branch.
+    #
+    # @param name [String] Ex.: for "refs/heads/master", name should be "master".
+    # @return [EacGit::Local::Branch]
+    def branch(name)
+      ::EacGit::Local::Branch.new(self, name)
+    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
+
+    # Retrieves the current local branch.
+    #
+    # @return [EacGit::Local::Branch, nil]
+    def current_branch
+      command('symbolic-ref', '--quiet', HEAD_REFERENCE)
+        .execute!(exit_outputs: { 256 => '' })
+        .gsub(%r{\Arefs/heads/}, '').strip
+        .if_present { |v| branch(v) }
+    end
+
     def descendant?(descendant, ancestor)
       base = merge_base(descendant, ancestor)
       return false if base.blank?
@@ -24,6 +70,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 +107,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.7.3'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2022-01-17 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.74'
+        version: '0.83'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '0.83'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -93,11 +93,14 @@ files:
 - lib/eac_git.rb
 - lib/eac_git/executables.rb
 - lib/eac_git/local.rb
+- lib/eac_git/local/branch.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/log.rb
+- lib/eac_git/local/remote.rb
 - lib/eac_git/local/subrepo.rb
 - lib/eac_git/local/subrepo/config.rb
 - lib/eac_git/remote.rb