eac_git 0.14.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1d971be74edc9e4e7f2a81f58902eaa1ba1088a05bdfac7d93cef450ac8072
-  data.tar.gz: 8c939b1af9cf4c02b06a0a7d052f6cb135f44ac52cdcbdea47b033c977b14ed2
+  metadata.gz: 5801ee9f2b28bd73bd27e83254c1eaff5a473492c3f89dfe05b833f210fa42c3
+  data.tar.gz: '0233988a062e873923b7f7d37a4a866f316d30f7589275a22afdf68c3047b0b7'
 SHA512:
-  metadata.gz: 68cdc9332985c4f6cfe8476a2d9022d148ea0e247199e29e3efd248060fda1b97d24232f3643dae4db53895a6703921ca7519fe4541d826209b9d1dfec364371
-  data.tar.gz: c422235a740b26c1715b11d4de6fc2ec5a79e7c4f218f7b76d2f965cb5b311301d48f8b43a2e2a963dd5e78b7afe0e26ef6465cbe95b8a987b145bcf1f889705
+  metadata.gz: cb54953f41934dca5f5bc3dfc119cf8197bfa04947376ba96cd06a8945fe9f43bf4eeba748dcd01a13c2dc98ccee6952a40e8e49cc688704468498dd93097b12
+  data.tar.gz: 4d6663b3671b046883363d8a1712fc8029636a9a4cbfdbadc9f1de3367125c8949126aea6dab622ab87600f62a58fc7f6ae5aadf91754a90634cfe2f67d5db6c

data/lib/eac_git/local/branch.rb

@@ -10,8 +10,9 @@ module EacGit
       common_constructor :local, :name
 
       # @return [String]
+      # @deprecated Use {#head_commit_id} instead.
       def current_commit_id
-        local.rev_parse(full_ref_name, true)
+        head_commit_id
       end
 
       # @return [Boolean]
@@ -22,6 +23,25 @@ module EacGit
       def full_ref_name
         "#{REFS_PREFIX}#{name}"
       end
+
+      # @return [EacGit::Local::Commit]
+      def head_commit
+        local.commit(head_commit_id, true)
+      end
+
+      # @return [String]
+      def head_commit_id
+        local.rev_parse(full_ref_name, true)
+      end
+
+      # @param remote [EacGit::Local::Remote]
+      # @return [void]
+      def push(remote, options = {})
+        options[:refspec] = name
+        options.inject(remote.push) do |a, e|
+          a.send(*e)
+        end.perform
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ module EacGit
         end
 
         def fields
-          FIELDS.map { |field| [field, send(field)] }.to_h
+          FIELDS.index_with { |field| send(field) }
         end
 
         private

data/lib/eac_git/local/dirty_files.rb

@@ -6,6 +6,7 @@ require 'ostruct'
 module EacGit
   class Local
     module DirtyFiles
+      QUOTED_PATH_PATTERN = /\A"(.+)"\z/.freeze
       STATUS_LINE_PATTERN = /\A(.)(.)\s(.+)\z/.freeze
 
       def dirty?
@@ -26,12 +27,22 @@ module EacGit
 
       private
 
+      # @param line [String]
+      # @return [Struct]
       def parse_status_line(line)
         STATUS_LINE_PATTERN.if_match(line) do |m|
-          ::OpenStruct.new(index: m[1], worktree: m[2], path: m[3].to_pathname,
-                           absolute_path: m[3].to_pathname.expand_path(root_path))
+          path = parse_status_line_path(m[3]).to_pathname
+          { index: m[1], worktree: m[2], path: path, absolute_path: path.expand_path(root_path) }
+            .to_struct
         end
       end
+
+      # @param path [String]
+      # @return [String]
+      def parse_status_line_path(path)
+        m = QUOTED_PATH_PATTERN.match(path)
+        m ? m[1] : path
+      end
     end
   end
 end

data/lib/eac_git/local/remote/push.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    class Remote
+      class Push
+        acts_as_immutable
+        immutable_accessor :force, type: :boolean
+        immutable_accessor :refspec, type: :array
+
+        common_constructor :remote
+        delegate :local, to: :remote
+
+        # @return [Array<Object>]
+        def immutable_constructor_args
+          [remote]
+        end
+
+        # @return [void]
+        def perform
+          local.command(*git_command_args).system!
+        end
+
+        # @return [Enumerable<String>]
+        def git_command_args
+          r = ['push', remote.name]
+          r << '--force' if force?
+          r + refspecs
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/local/remote.rb

@@ -22,6 +22,11 @@ module EacGit
         local.command(*args)
       end
 
+      # @return [EacGit::Local::Remote::Push]
+      def push
+        ::EacGit::Local::Remote::Push.new(self)
+      end
+
       # @return [String]
       def remote_reference
         name
@@ -38,6 +43,8 @@ module EacGit
       def url=(new_url)
         local.command('remote', 'set-url', name, new_url).execute!
       end
+
+      require_sub __FILE__
     end
   end
 end

data/lib/eac_git/local/remotes.rb

@@ -11,7 +11,7 @@ module EacGit
       end
 
       def remotes
-        command('remote').execute!.each_line.map(&:strip).reject(&:blank?).map do |name|
+        command('remote').execute!.each_line.map(&:strip).compact_blank.map do |name|
           remote(name)
         end
       end

data/lib/eac_git/local/subrepo/config.rb

@@ -24,7 +24,7 @@ module EacGit
           self.values = values.with_indifferent_access
         end
 
-        MAPPING.each do |method_name, _config_key|
+        MAPPING.each_key do |method_name|
           define_method(method_name) do
             values[MAPPING.fetch(method_name)]
           end
@@ -35,7 +35,7 @@ module EacGit
         end
 
         def to_content
-          "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join
+          "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join # rubocop:disable Style/StringConcatenation
         end
       end
     end

data/lib/eac_git/local.rb

@@ -38,7 +38,7 @@ module EacGit
       ::EacGit::Local::Branch.new(self, name)
     end
 
-    def commit(ref, required = false)
+    def commit(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
       rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
     end
 
@@ -71,7 +71,7 @@ module EacGit
     end
 
     # @return [EacGit::Local::Commit
-    def head(required = true)
+    def head(required = true) # rubocop:disable Style/OptionalBooleanParameter
       commit(HEAD_REFERENCE, required)
     end
 
@@ -94,7 +94,7 @@ module EacGit
       raise "#{root_path}: #{message}"
     end
 
-    def rev_parse(ref, required = false)
+    def rev_parse(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
       r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
       r.strip! if r.is_a?(String)
       return r if r.present?

data/lib/eac_git/remote.rb

@@ -12,8 +12,8 @@ module EacGit
     common_constructor :uri
 
     # @return [EacRubyUtils::Envs::Command
-    def git_command(*args, &block)
-      ::EacGit::Executables.git.command(*args, &block)
+    def git_command(...)
+      ::EacGit::Executables.git.command(...)
     end
 
     # @return [String]

data/lib/eac_git/remote_like/ls_result.rb

@@ -8,13 +8,13 @@ module EacGit
       class << self
         def by_ls_remote_command_output(output)
           new(
-            output.each_line.map { |line| line.strip.split(/\s+/) }.map { |x| [x[1], x[0]] }.to_h
+            output.each_line.map { |line| line.strip.split(/\s+/) }.to_h { |x| [x[1], x[0]] } # rubocop:disable Style/MapToHash
           )
         end
       end
 
       common_constructor :hashes
-      delegate :fetch, :'[]', :count, :any?, :empty?, to: :hashes
+      delegate :fetch, :[], :count, :any?, :empty?, to: :hashes
     end
   end
 end

data/lib/eac_git/rspec/stubbed_git_local_repo/directory.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_git/rspec/stubbed_git_local_repo/fs_object'
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Directory < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        # @return [self]
+        def create
+          ::FileUtils.mkdir_p(path)
+          self
+        end
+
+        # @return [self]
+        def delete
+          ::FileUtils.rm_rf(path)
+          self
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          git.directory(*self.subpath, *subpath)
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::File]
+        def file(*subpath)
+          git.file(*self.subpath, *subpath)
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/rspec/stubbed_git_local_repo/file.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_git/rspec/stubbed_git_local_repo/fs_object'
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class File < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        def touch
+          ::FileUtils.touch(path.to_path)
+        end
+
+        def delete
+          path.unlink
+        end
+
+        delegate :write, to: :path
+      end
+    end
+  end
+end

data/lib/eac_git/rspec/stubbed_git_local_repo/fs_object.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class FsObject
+        # @!attribute [r] git
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+
+        # @!attribute [r] subpath
+        #   @param git [Array<String>]
+
+        # @!method initialize(git, subpath)
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+        #   @param subpath [Array<String>
+        common_constructor :git, :subpath
+
+        # @return [Pathname]
+        def path
+          git.root_path.join(*subpath)
+        end
+      end
+    end
+  end
+end

data/lib/eac_git/rspec/stubbed_git_local_repo/repository.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_git/local'
+require 'eac_git/rspec/stubbed_git_local_repo/directory'
+require 'eac_git/rspec/stubbed_git_local_repo/file'
+require 'eac_ruby_utils/core_ext'
+require 'securerandom'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Repository < ::EacGit::Local
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::Directory.new(self, subpath)
+        end
+
+        def file(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::File.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
+    end
+  end
+end

data/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_git/local'
 require 'eac_ruby_utils/envs'
-require 'fileutils'
-require 'securerandom'
 require 'tmpdir'
 
 module EacGit
   module Rspec
     module StubbedGitLocalRepo
-      def stubbed_git_local_repo(bare = false)
+      def stubbed_git_local_repo(bare = false) # rubocop:disable Style/OptionalBooleanParameter
         path = ::Dir.mktmpdir
         ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
-        repo = StubbedGitRepository.new(path)
+        repo = ::EacGit::Rspec::StubbedGitLocalRepo::Repository.new(path)
         repo.command('config', 'user.email', 'theuser@example.net').execute!
         repo.command('config', 'user.name', 'The User').execute!
         repo
@@ -26,46 +23,7 @@ module EacGit
         r + [path]
       end
 
-      class StubbedGitRepository < ::EacGit::Local
-        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
-        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
+      require_sub __FILE__
     end
   end
 end

data/lib/eac_git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2024-02-18 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.112'
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -44,40 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.10'
 description: 
 email: 
 executables: []
@@ -95,6 +75,7 @@ files:
 - lib/eac_git/local/dirty_files.rb
 - lib/eac_git/local/log.rb
 - lib/eac_git/local/remote.rb
+- lib/eac_git/local/remote/push.rb
 - lib/eac_git/local/remotes.rb
 - lib/eac_git/local/subrepo.rb
 - lib/eac_git/local/subrepo/config.rb
@@ -104,6 +85,10 @@ files:
 - lib/eac_git/rspec.rb
 - lib/eac_git/rspec/setup.rb
 - lib/eac_git/rspec/stubbed_git_local_repo.rb
+- lib/eac_git/rspec/stubbed_git_local_repo/directory.rb
+- lib/eac_git/rspec/stubbed_git_local_repo/file.rb
+- lib/eac_git/rspec/stubbed_git_local_repo/fs_object.rb
+- lib/eac_git/rspec/stubbed_git_local_repo/repository.rb
 - lib/eac_git/version.rb
 - vendor/git-subrepo/Changes
 - vendor/git-subrepo/Intro.pod
@@ -301,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="