eac_git 0.20.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1c794aae2ec2cefc1bcfd8be3f4d6df58ec845764f1bb36f8a8b309627b9af
-  data.tar.gz: 4cd65e068822c2de3bb7e520f5b1aba5785468e4e008659c6ac4edbcc8502caa
+  metadata.gz: bf4272006fb184bc833ba0a393c6f53bd54b9c0b8faf508dfc314aba47255217
+  data.tar.gz: ec4af90358dd5b79502db4054022f55cc38a68cb1e4262e56287351a9dac2ea7
 SHA512:
-  metadata.gz: e20b2c800f816fa587e4563debd2cb89d4639c82ee6b9ddf792a4011b7b0f069fafe61755fd5487b251206f1e2fc87e1f50240ffc7349e390369a4ba2c39de67
-  data.tar.gz: 70a3986881972199f22550a453b271267e23f352b13b3cc09dfe317cfdbee842461e0d7add6c4908488c7975591deab381b3c9e412d447cbd39cf500b0cdf144
+  metadata.gz: c99d1ecba28badb204831466c23cb214adf38537c2373c364a9ed53e2647ded18149dda118e07bcf191f2e0c2ea744f4e629d8c538934af2ea4fa02e3675fe6b
+  data.tar.gz: 26b2e4ee6b2e449cc3ace713685af90b3202bf2031adaf7d00c9fc5060e5a9b52e62b90ae7c82eadb41b8296ba982cb18fc11efbd795077abd313f1c0c821b7e

data/lib/eac_git/executables/git_command_extensions.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module EacGit
+  module Executables
+    module GitCommandExtensions
+      def command(*args)
+        super.envvar('PATH', path_with_git_subrepo)
+      end
+
+      def gem_root
+        '../..'.to_pathname.expand_path(__dir__)
+      end
+
+      def git_subrepo_root
+        gem_root.join('vendor', 'git-subrepo')
+      end
+
+      def path_with_git_subrepo
+        ([git_subrepo_root.join('lib').to_path] +
+            ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
+          .join(::File::PATH_SEPARATOR)
+      end
+    end
+  end
+end

data/lib/eac_git/executables.rb

@@ -3,43 +3,21 @@
 module EacGit
   module Executables
     class << self
-      include ::EacRubyUtils::SimpleCache
+      enable_memoized
 
       def env
         ::EacRubyUtils::Envs.local
       end
 
-      private
-
-      def git_uncached
+      memoize def git
         r = env.executable('git', '--version')
-        r.extend(GitCommandExtensions)
+        r.extend(::EacGit::Executables::GitCommandExtensions)
         r
       end
 
-      def tar_uncached
+      memoize def tar
         env.executable('tar', '--version')
       end
-
-      module GitCommandExtensions
-        def command(*args)
-          super.envvar('PATH', path_with_git_subrepo)
-        end
-
-        def gem_root
-          '../..'.to_pathname.expand_path(__dir__)
-        end
-
-        def git_subrepo_root
-          gem_root.join('vendor', 'git-subrepo')
-        end
-
-        def path_with_git_subrepo
-          ([git_subrepo_root.join('lib').to_path] +
-              ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
-            .join(::File::PATH_SEPARATOR)
-        end
-      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module EacGit
   class Local
     class Commit
       class ChangedFile
-        enable_simple_cache
+        enable_memoized
 
         attr_reader :commit, :diff_tree
 
@@ -22,11 +22,11 @@ module EacGit
           "#{path}|#{status}"
         end
 
-        def src_size_uncached
+        memoize def src_size
           size(src_sha1)
         end
 
-        def dst_size_uncached
+        memoize def dst_size
           size(dst_sha1)
         end
 

data/lib/eac_git/local/commit.rb

@@ -4,7 +4,7 @@ module EacGit
   class Local
     class Commit
       require_sub __FILE__, include_modules: true
-      enable_simple_cache
+      enable_memoized
       include ::Comparable
 
       FIELDS = {
@@ -31,13 +31,13 @@ module EacGit
         define_method(field) { format(format) }
       end
 
-      def changed_files_uncached
+      memoize def changed_files
         diff_tree_execute.each_line.map do |line|
           ::EacGit::Local::Commit::ChangedFile.new(self, line)
         end
       end
 
-      def changed_files_size_uncached
+      memoize def changed_files_size
         changed_files.inject(0) { |a, e| a + e.dst_size }
       end
 

data/lib/eac_git/local/remote.rb

@@ -5,7 +5,6 @@ module EacGit
     class Remote
       NO_SUCH_REMOTE_CODE = 512
 
-      enable_simple_cache
       include ::EacGit::RemoteLike
 
       common_constructor :local, :name

data/lib/eac_git/local/subrepo.rb

@@ -5,10 +5,18 @@ module EacGit
     # A git-subrepo (https://github.com/ingydotnet/git-subrepo) in a [EacGit::Local].
     class Subrepo
       require_sub __FILE__
-      enable_simple_cache
+      enable_memoized
+
+      class << self
+        # @param subpath [Pathname, String]
+        # @return [String]
+        def sanitize_subpath(subpath)
+          subpath.to_pathname.to_path.gsub(%r{/+$}, '').to_pathname
+        end
+      end
 
       common_constructor :local, :subpath do
-        self.subpath = subpath.to_pathname
+        self.subpath = self.class.sanitize_subpath(subpath)
         local.raise_error "Config file \"#{config_absolute_path}\" not found" unless
           config_absolute_path.file?
       end
@@ -18,27 +26,25 @@ module EacGit
                       *subrepo_subcommand_args)
       end
 
-      delegate(*::EacGit::Local::Subrepo::Config::MAPPING.keys, to: :config)
+      delegate(*::EacGit::Subrepo::Configuration::MAPPING.keys, to: :config)
 
       def write_config
         config_absolute_path.write(config.to_content)
       end
 
-      private
-
-      def config_uncached
-        ::EacGit::Local::Subrepo::Config.from_file(config_absolute_path)
+      memoize def config
+        ::EacGit::Subrepo::Configuration.from_file(config_absolute_path)
       end
 
-      def config_absolute_path_uncached
+      memoize def config_absolute_path
         config_relative_path.expand_path(local.root_path)
       end
 
-      def config_relative_path_uncached
+      memoize def config_relative_path
         subpath.join('.gitrepo')
       end
 
-      def remote_uncached
+      memoize def remote
         ::EacGit::Remote.new(remote_uri)
       end
     end

data/lib/eac_git/subrepo/configuration.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'parseconfig'
+
+module EacGit
+  module Subrepo
+    class Configuration
+      MAPPING = {
+        command_version: :cmdver, commit_id: :commit, join_method: :method,
+        parent_commit_id: :parent, remote_branch: :branch, remote_uri: :remote
+      }.freeze
+
+      class << self
+        def from_file(file_path)
+          new(
+            ::ParseConfig.new(file_path.to_pathname)['subrepo']
+          )
+        end
+      end
+
+      common_constructor :values do
+        self.values = values.with_indifferent_access
+      end
+
+      MAPPING.each_key do |method_name|
+        define_method(method_name) do
+          values[MAPPING.fetch(method_name)]
+        end
+
+        define_method("#{method_name}=") do |value|
+          values[MAPPING.fetch(method_name)] = value
+        end
+      end
+
+      def to_content
+        "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join # rubocop:disable Style/StringConcatenation
+      end
+    end
+  end
+end

data/lib/eac_git/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Put here the authors
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.134'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.134'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -50,22 +49,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-description:
-email:
+        version: '0.15'
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/eac_git.rb
 - lib/eac_git/executables.rb
+- lib/eac_git/executables/git_command_extensions.rb
 - lib/eac_git/local.rb
 - lib/eac_git/local/branch.rb
 - lib/eac_git/local/changed_file.rb
@@ -79,7 +77,6 @@ files:
 - 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
 - lib/eac_git/remote.rb
 - lib/eac_git/remote_like.rb
 - lib/eac_git/remote_like/ls_result.rb
@@ -90,6 +87,7 @@ files:
 - 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/subrepo/configuration.rb
 - lib/eac_git/version.rb
 - vendor/git-subrepo/.fish.rc
 - vendor/git-subrepo/.gitattributes
@@ -302,10 +300,8 @@ files:
 - vendor/git-subrepo/test/status.t
 - vendor/git-subrepo/test/submodule.t
 - vendor/git-subrepo/test/zsh.t
-homepage:
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -320,8 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Put here de description.
 test_files: []

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'parseconfig'
-
-module EacGit
-  class Local
-    class Subrepo
-      class Config
-        MAPPING = {
-          command_version: :cmdver, commit_id: :commit, join_method: :method,
-          parent_commit_id: :parent, remote_branch: :branch, remote_uri: :remote
-        }.freeze
-
-        class << self
-          def from_file(file_path)
-            new(
-              ::ParseConfig.new(file_path.to_pathname)['subrepo']
-            )
-          end
-        end
-
-        common_constructor :values do
-          self.values = values.with_indifferent_access
-        end
-
-        MAPPING.each_key do |method_name|
-          define_method(method_name) do
-            values[MAPPING.fetch(method_name)]
-          end
-
-          define_method("#{method_name}=") do |value|
-            values[MAPPING.fetch(method_name)] = value
-          end
-        end
-
-        def to_content
-          "[subrepo]\n" + MAPPING.map { |k, v| "  #{v} = #{send(k)}\n" }.join # rubocop:disable Style/StringConcatenation
-        end
-      end
-    end
-  end
-end