eac_git 0.21.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa960785b3fe7f53bb968ad369475ff1bf385124b7809e5dddcceebc7619e71
-  data.tar.gz: 486ac5819da4c8a41391b7e9808d3ba1d7948f5c1cc41b6434adba85ea243d3e
+  metadata.gz: bf4272006fb184bc833ba0a393c6f53bd54b9c0b8faf508dfc314aba47255217
+  data.tar.gz: ec4af90358dd5b79502db4054022f55cc38a68cb1e4262e56287351a9dac2ea7
 SHA512:
-  metadata.gz: d42b82d4cbf4c0a5bdd4098b94802e544d5f2f41d20afb07aa07bd13be2993828e692ad1e2b6d970283d67175b9f8368f36f8c2796e4cb984ce0ef6eaf398111
-  data.tar.gz: 5795595e09c93e181761bd8d1fbe0c099399278c4fe0d008592d1605463c3a259f0a5b4d964d92b34555204df7e2bd6bb14fd1aa37ee750ec526b6c3b681ff96
+  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
@@ -24,21 +32,19 @@ module EacGit
         config_absolute_path.write(config.to_content)
       end
 
-      private
-
-      def config_uncached
+      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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eac_git
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Put here the authors
@@ -63,6 +63,7 @@ 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