capistrano-git-copy 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643a1d09f446a1a37d47896f9868feeaa4030b2a0306ebab77ac24dd8bb6728d
-  data.tar.gz: fa2212878ae3a8435e52d77a369f7b21e43444ce31d120af21037b3be0477c4e
+  metadata.gz: 911c6595d192844b5881b0d8a8cebc22807c1e05cb1f239180f88f75382c23df
+  data.tar.gz: 36ba77b942dbc78b60dc6aa3e21e2366d4ec42ac1c301c363adf5ee99efce925
 SHA512:
-  metadata.gz: 3ac87e1fc29d7adaaedf48d9bbd92d635e0b9bd1e8a3a025c759910695bccb10605d30455d6506be030d3546fbc04bf666dcd73298ebbd78dc81ca2b949a62ee
-  data.tar.gz: 323bd1c4beae97837dbb5a6db3d5e9afcfab223c91fe3fe538dc8fefb7a19abb2ff56d49209f82b074e044cc741dea2e352df74b81116424abca6e5dcda50b5a
+  metadata.gz: 6fdd39263057a50cf376c39dae078baf56314fc37e864d66b093e3ce8fad42974d1422c3697588c77b6c0c02255b9b0a251ee032d6c72e627ca4a1ffcd847c9c
+  data.tar.gz: efacaa507ac8796d60c21c329dde4920f52c9ce456a6031320973db3f5c2d32a4defb32fe489abf64c388c3d1a718f60e8275bd57534d934521eb8f4158748d0

data/.gitlab-ci.yml

@@ -5,9 +5,9 @@ stages:
 
 build:
   stage: build
-  image: ruby:2.5
+  image: ruby:2.6
   script:
-    - gem install bundler --no-ri --no-rdoc
+    - gem install bundler --no-document
     - bundle update
   artifacts:
     paths:
@@ -15,9 +15,9 @@ build:
 
 rubocop:
   stage: codequality
-  image: ruby:2.5
+  image: ruby:2.6
   script:
-    - gem install rubocop --no-ri --no-rdoc
+    - gem install rubocop rubocop-performance --no-document
     - rubocop
 
 dependency_scanning:

data/.rubocop.yml

@@ -1,3 +1,6 @@
+require:
+  - rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.3
 

data/CHANGELOG.md

@@ -1,82 +1,94 @@
-# Change Log
+# Changelog
+All notable changes to this project will be documented in this file.
 
-## 1.5.4 (2018-11-14)
-### Changes
-  - updated _git-archive-all_ to 1.19.2
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.5.3 (2018-11-02)
-### Changes
-  - updated _git-archive-all_ to 1.19.1
+## [Unreleased]
 
-## 1.5.2 (2018-10-07)
-### Changes
-  - updated _git-archive-all_ to 1.18.3
-
-## 1.5.1 (2018-09-24)
-### Changes
-  - updated _git-archive-all_ to 1.18.2
-
-## 1.5.0 (2018-05-24)
-### Feature
-  - add option to switch off running git clean (#25)
-### Changes
-  - updated _git-archive-all_ to 1.17.1
-  - add support for .gitattributes and export-ignore (#23)
-
-## 1.4.0 (2017-05-31)
-### Feature
-  - deploy subdirectory
-
-## 1.3.2 (2017-04-30)
-### Changes
-  - updated _git-archive-all_ to 1.16.4
-
-## 1.3.1 (2017-03-18)
+## [1.5.5] - 2019-06-19
+### Fixed
+- usage with git versions >= 2.22.0
+### Changed
+- updated _git-archive-all_ to 1.19.4
+
+## [1.5.4] - 2018-11-14
+### Changed
+- updated _git-archive-all_ to 1.19.2
+
+## [1.5.3] - 2018-11-02
+### Changed
+- updated _git-archive-all_ to 1.19.1
+
+## [1.5.2] - 2018-10-07
+### Changed
+- updated _git-archive-all_ to 1.18.3
+
+## [1.5.1] - 2018-09-24
+### Changed
+- updated _git-archive-all_ to 1.18.2
+
+## [1.5.0] - 2018-05-24
+### Added
+- add option to switch off running git clean (#25)
+### Changed
+- updated _git-archive-all_ to 1.17.1
+- add support for .gitattributes and export-ignore (#23)
+
+## [1.4.0] - 2017-05-31
+### Added
+- deploy subdirectory
+
+## [1.3.2] - 2017-04-30
+### Changed
+- updated _git-archive-all_ to 1.16.4
+
+## [1.3.1] - 2017-03-18
 ### Fixed
-  - missing require of tmpdir (see #22)
-
-## 1.3.0 (2016-12-11)
-### Changes
-  - capistrano 3.7.x compatibility - see updated README.md
-
-## 1.2.1 (2016-12-11)
-### Changes
-  - updated _git-archive-all_ to HEAD
-  - require _capistrano_ < 3.7.0 due to breaking changes
-
-## 1.2.0 (2016-01-25)
-### Changes
-  - Check if local repository mirror is working and reinitialize if necessary
-  - Added config option `git_excludes` to exclude files and directories
-  - updated _git-archive-all_ to v1.13
-
-## 1.1.0 (2015-08-10)
-### Changes
-  - Deprecated: require 'capistrano/git/copy'
-  - Allow to skip submodules (uses _git archive_ instead of _git-archive-all_)
+- missing require of tmpdir (see #22)
+
+## [1.3.0] - 2016-12-11
+### Changed
+- capistrano 3.7.x compatibility - see updated README.md
+
+## [1.2.1] - 2016-12-11
+### Changed
+- updated _git-archive-all_ to HEAD
+- require _capistrano_ < 3.7.0 due to breaking changes
+
+## [1.2.0] - 2016-01-25
+### Changed
+- Check if local repository mirror is working and reinitialize if necessary
+- Added config option `git_excludes` to exclude files and directories
+- updated _git-archive-all_ to v1.13
+
+## [1.1.0] - 2015-08-10
+### Changed
+- Deprecated: require 'capistrano/git/copy'
+- Allow to skip submodules (uses _git archive_ instead of _git-archive-all_)
 ### Fixed
-  - updated _git-archive-all_ to v1.11
-  - prevent tasks from being executed multiple times
+- updated _git-archive-all_ to v1.11
+- prevent tasks from being executed multiple times
 
-## 1.0.2 (2015-05-26)
+## [1.0.2] - 2015-05-26
 ### Fixed
-  - use commit hash to fetch revision for log
+- use commit hash to fetch revision for log
 
-## 1.0.1 (2015-05-20)
+## [1.0.1] - 2015-05-20
 ### Fixed
-  - fixed usage of frozen string as branch (e.g. if using ENV values)
-  - use working copy of cloned repository to fetch revision
+- fixed usage of frozen string as branch (e.g. if using ENV values)
+- use working copy of cloned repository to fetch revision
 
-## 1.0.0 (2015-04-22)
+## [1.0.0] - 2015-04-22
 ### Fixed
-  - support application names with whitespaces and other non-path-friendly characters
-  - executing deploy/scm task twice
+- support application names with whitespaces and other non-path-friendly characters
+- executing deploy/scm task twice
 
-## 0.8.1 (2015-04-11)
+## [0.8.1] - 2015-04-11
 ### Fixed
-  - strip branch name only if it is a string
+- strip branch name only if it is a string
 
-## 0.8.0 (2015-04-07)
-### Changes
-  - changed namespace from Capistrano::Git::Copy to Capistrano::GitCopy to avoid problems when using it in conjunction with build-in git support from capistrano
-  - strip whitespaces from branch for checking revision
+## [0.8.0] - 2015-04-07
+### Changed
+- changed namespace from Capistrano::Git::Copy to Capistrano::GitCopy to avoid problems when using it in conjunction with build-in git support from capistrano
+- strip whitespaces from branch for checking revision

data/lib/capistrano/git_copy/scm.rb

@@ -69,13 +69,13 @@ module Capistrano
         if fetch(:with_submodules)
           git(:submodule, :init)
           git(:submodule, :update)
-          git(:submodule, :foreach, '--recursive', :git, :submodule, :update, '--init')
+          git(:submodule, :foreach, '--recursive', '"git submodule update --init"')
         end
 
         # cleanup
         git(:clean, '-d', '-f') if fetch(:with_clean)
 
-        git(:submodule, :foreach, '--recursive', :git, :clean, '-d', '-f') if fetch(:with_submodules)
+        git(:submodule, :foreach, '--recursive', '"git clean -d -f"') if fetch(:with_submodules)
       end
 
       # Create tar archive

data/lib/capistrano/git_copy/version.rb

@@ -5,6 +5,6 @@ module Capistrano
   # GitCopy
   module GitCopy
     # gem version
-    VERSION = '1.5.4'
+    VERSION = '1.5.5'
   end
 end

data/vendor/git-archive-all/git_archive_all.py

@@ -32,7 +32,7 @@ from subprocess import CalledProcessError, Popen, PIPE
 import sys
 import re
 
-__version__ = "1.19.2"
+__version__ = "1.19.4"
 
 
 try:
@@ -76,7 +76,7 @@ class GitArchiver(object):
 
     LOG = logging.getLogger('GitArchiver')
 
-    def __init__(self, prefix='', exclude=True, force_sub=False, extra=None, main_repo_abspath=None):
+    def __init__(self, prefix='', exclude=True, force_sub=False, extra=None, main_repo_abspath=None, git_version=None):
         """
         @param prefix: Prefix used to prepend all paths in the resulting archive.
             Extra file paths are only prefixed if they are not relative.
@@ -101,7 +101,17 @@ class GitArchiver(object):
             with abspath to top-level directory of the repository.
             If None, current cwd is used.
         @type main_repo_abspath: str
+
+        @param git_version: Version of Git that determines whether various workarounds are on.
+            If None, tries to resolve via Git's CLI.
+        @type git_version: tuple or None
         """
+        if git_version is None:
+            git_version = self.get_git_version()
+
+        if git_version is not None and git_version < (1, 6, 1):
+            raise ValueError("git of version 1.6.1 and higher is required")
+
         if extra is None:
             extra = []
 
@@ -120,6 +130,7 @@ class GitArchiver(object):
         self.extra = extra
         self.force_sub = force_sub
         self.main_repo_abspath = main_repo_abspath
+        self.git_version = git_version
 
         self._check_attr_gens = {}
 
@@ -298,47 +309,7 @@ class GitArchiver(object):
             self._check_attr_gens[repo_abspath].close()
             del self._check_attr_gens[repo_abspath]
 
-    @classmethod
-    def decode_git_output(cls, output):
-        """
-        Decode Git's binary output handeling the way it escapes unicode characters.
-
-        @type output: bytes
-
-        @rtype: str
-        """
-        return output.decode('unicode_escape').encode('raw_unicode_escape').decode('utf-8')
-
-    @classmethod
-    def run_git_shell(cls, cmd, cwd=None):
-        """
-        Runs git shell command, reads output and decodes it into unicode string.
-
-        @param cmd: Command to be executed.
-        @type cmd: str
-
-        @type cwd: str
-        @param cwd: Working directory.
-
-        @rtype: str
-        @return: Output of the command.
-
-        @raise CalledProcessError:  Raises exception if return code of the command is non-zero.
-        """
-        p = Popen(cmd, shell=True, stdout=PIPE, cwd=cwd)
-        output, _ = p.communicate()
-        output = cls.decode_git_output(output)
-
-        if p.returncode:
-            if sys.version_info > (2, 6):
-                raise CalledProcessError(returncode=p.returncode, cmd=cmd, output=output)
-            else:
-                raise CalledProcessError(returncode=p.returncode, cmd=cmd)
-
-        return output
-
-    @classmethod
-    def check_attr(cls, repo_abspath, attrs):
+    def check_attr(self, repo_abspath, attrs):
         """
         Generator that returns attributes for given paths relative to repo_abspath.
 
@@ -378,7 +349,7 @@ class GitArchiver(object):
                     nuls_count += 1
 
                     if nuls_count % 3 == 0:
-                        yield map(cls.decode_git_output, (path, attr, info))
+                        yield map(self.decode_git_output, (path, attr, info))
                         path, attr, info = b'', b'', b''
                 elif nuls_count % 3 == 0:
                     path += b
@@ -387,6 +358,38 @@ class GitArchiver(object):
                 elif nuls_count % 3 == 2:
                     info += b
 
+        def read_attrs_old(process, repo_file_path):
+            """
+            Compatibility with versions 1.8.5 and below that do not recognize -z for output.
+            """
+            process.stdin.write(repo_file_path.encode('utf-8') + b'\0')
+            process.stdin.flush()
+
+            # For every attribute check-attr will output: <path>: <attribute>: <info>\n
+            # where <path> is c-quoted
+
+            path, attr, info = b'', b'', b''
+            lines_count = 0
+            lines_expected = len(attrs)
+
+            while lines_count != lines_expected:
+                line = process.stdout.readline()
+
+                info_start = line.rfind(b': ')
+                if info_start == -1:
+                    raise RuntimeError("unexpected output of check-attr: {0}".format(line))
+
+                attr_start = line.rfind(b': ', 0, info_start)
+                if attr_start == -1:
+                    raise RuntimeError("unexpected output of check-attr: {0}".format(line))
+
+                info = line[info_start + 2:len(line) - 1]  # trim leading ": " and trailing \n
+                attr = line[attr_start + 2:info_start]  # trim leading ": "
+                path = line[:attr_start]
+
+                yield map(self.decode_git_output, (path, attr, info))
+                lines_count += 1
+
         if not attrs:
             return
 
@@ -397,7 +400,12 @@ class GitArchiver(object):
                 repo_file_path = yield
                 repo_file_attrs = {}
 
-                for path, attr, value in read_attrs(process, repo_file_path):
+                if self.git_version is None or self.git_version > (1, 8, 5):
+                    reader = read_attrs
+                else:
+                    reader = read_attrs_old
+
+                for path, attr, value in reader(process, repo_file_path):
                     repo_file_attrs[attr] = value
 
                 yield repo_file_attrs
@@ -405,6 +413,72 @@ class GitArchiver(object):
             process.stdin.close()
             process.wait()
 
+    @classmethod
+    def decode_git_output(cls, output):
+        """
+        Decode Git's binary output handeling the way it escapes unicode characters.
+
+        @type output: bytes
+
+        @rtype: str
+        """
+        return output.decode('unicode_escape').encode('raw_unicode_escape').decode('utf-8')
+
+    @classmethod
+    def run_git_shell(cls, cmd, cwd=None):
+        """
+        Runs git shell command, reads output and decodes it into unicode string.
+
+        @param cmd: Command to be executed.
+        @type cmd: str
+
+        @type cwd: str
+        @param cwd: Working directory.
+
+        @rtype: str
+        @return: Output of the command.
+
+        @raise CalledProcessError:  Raises exception if return code of the command is non-zero.
+        """
+        p = Popen(cmd, shell=True, stdout=PIPE, cwd=cwd)
+        output, _ = p.communicate()
+        output = cls.decode_git_output(output)
+
+        if p.returncode:
+            if sys.version_info > (2, 6):
+                raise CalledProcessError(returncode=p.returncode, cmd=cmd, output=output)
+            else:
+                raise CalledProcessError(returncode=p.returncode, cmd=cmd)
+
+        return output
+
+    @classmethod
+    def get_git_version(cls):
+        """
+        Return version of git current shell points to.
+
+        If version cannot be parsed None is returned.
+
+        @rtype: tuple or None
+        """
+        try:
+            output = cls.run_git_shell('git version')
+        except CalledProcessError:
+            cls.LOG.warning("Unable to get Git version.")
+            return None
+
+        try:
+            version = output.split()[2]
+        except IndexError:
+            cls.LOG.warning("Unable to parse Git version \"%s\".", output)
+            return None
+
+        try:
+            return tuple(int(v) for v in version.split('.'))
+        except ValueError:
+            cls.LOG.warning("Unable to parse Git version \"%s\".", version)
+            return None
+
 
 def main():
     from optparse import OptionParser, SUPPRESS_HELP

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -114,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano.