capistrano-git-copy 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5ef7bab4e5be2f012b843ae03aa534f161ab0b
-  data.tar.gz: 06c0fb3e75d82960cfd02edfe8e027bb26ef2d34
+  metadata.gz: bb2d212e098eb884c15a2a7a3f0b9dbc6e5a137e
+  data.tar.gz: 672168b65f58dc804469c16f3cca712d389c0240
 SHA512:
-  metadata.gz: e068fc6c5771ce093cc4757c758b07c692aebf9e92ad643fbfb87733f3167ef4ad91fa23dfc5a9b0d802cd460f33ac1682607d9575481d382482e1ad87fb3407
-  data.tar.gz: c7bb4213bd1fc5945039b9fadffd5db048105643ee31ecf84e891028458e7a41e038cdf5980ab83c92d08800a32596586b34d5afc734798a818253b22464e291
+  metadata.gz: 55587ebd76886541942c3d0336fcfaaf992f34dac15d75073fee6293c90523ab14cd0e0fbd63ccce9f9a66eda9b218acf09c311848259b482c0057339bfab32e
+  data.tar.gz: 3118f37767103641b52ba4ac5991267d78daa591e7ac3ef753a25ecefbb5b3f90f7d124361a1ff83e4aa1ff5395839b541bd73b40a32964d7904080525bc0f6a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.3.2 (2017-04-30)
+### Changes
+  - updated _git-archive-all_ to 1.16.4
+
 ## 1.3.1 (2017-03-18)
 ### Fixed
   - missing require of tmpdir (see #22)

data/lib/capistrano/git_copy/version.rb

@@ -3,6 +3,6 @@ module Capistrano
   # GitCopy
   module GitCopy
     # gem version
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
   end
 end

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

@@ -34,7 +34,7 @@ import tarfile
 from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
 import re
 
-__version__ = "1.15"
+__version__ = "1.16.4"
 
 
 class GitArchiver(object):
@@ -59,10 +59,10 @@ class GitArchiver(object):
               baz
               foo/
                 bar
-        @type prefix: string
+        @type prefix: str
 
         @param exclude: Determines whether archiver should follow rules specified in .gitattributes files.
-        @type exclude:  bool
+        @type exclude: bool
 
         @param force_sub: Determines whether submodules are initialized and updated before archiving.
         @type force_sub: bool
@@ -74,7 +74,7 @@ class GitArchiver(object):
             If given path is path to a subdirectory (but not a submodule directory!) it will be replaced
             with abspath to top-level directory of the repository.
             If None, current cwd is used.
-        @type main_repo_abspath: string
+        @type main_repo_abspath: str
         """
         if extra is None:
             extra = []
@@ -82,17 +82,12 @@ class GitArchiver(object):
         if main_repo_abspath is None:
             main_repo_abspath = path.abspath('')
         elif not path.isabs(main_repo_abspath):
-            raise ValueError("You MUST pass absolute path to the main git repository.")
+            raise ValueError("main_repo_abspath must be an absolute path")
 
         try:
-            path.isdir(".git") or self.run_shell("git rev-parse --git-dir > /dev/null 2>&1", main_repo_abspath)
-        except Exception as e:
-            raise ValueError("{0} not a git repository (or any of the parent directories).".format(main_repo_abspath))
-
-        main_repo_abspath = path.abspath(
-            self.read_git_shell('git rev-parse --show-toplevel', main_repo_abspath)
-            .rstrip()
-        )
+            main_repo_abspath = path.abspath(self.run_git_shell('git rev-parse --show-toplevel', main_repo_abspath).rstrip())
+        except CalledProcessError:
+            raise ValueError("{0} is not part of a git repository".format(main_repo_abspath))
 
         self.prefix = prefix
         self.exclude = exclude
@@ -108,14 +103,14 @@ class GitArchiver(object):
         Supported formats are: gz, zip, bz2, xz, tar, tgz, txz
 
         @param output_path: Output file path.
-        @type output_path: string
+        @type output_path: str
 
         @param dry_run: Determines whether create should do nothing but print what it would archive.
         @type dry_run: bool
 
         @param output_format: Determines format of the output archive. If None, format is determined from extension
             of output_file_path.
-        @type output_format: string
+        @type output_format: str
         """
         if output_format is None:
             file_name, file_ext = path.splitext(output_path)
@@ -149,7 +144,7 @@ class GitArchiver(object):
                 def add_file(file_path, arcname):
                     archive.add(file_path, arcname)
             else:
-                raise RuntimeError("Unknown format: {0}".format(output_format))
+                raise RuntimeError("unknown format: {0}".format(output_format))
 
             def archiver(file_path, arcname):
                 self.LOG.debug("Compressing {0} => {1}...".format(file_path, arcname))
@@ -160,7 +155,7 @@ class GitArchiver(object):
             def archiver(file_path, arcname):
                 self.LOG.info("{0} => {1}".format(file_path, arcname))
 
-        self.archive_all_files(archiver)  # this will take care of submodule init and update
+        self.archive_all_files(archiver)
 
         if archive is not None:
             archive.close()
@@ -170,18 +165,18 @@ class GitArchiver(object):
         Returns exclude patterns for a given repo. It looks for .gitattributes files in repo_file_paths.
 
         Resulting dictionary will contain exclude patterns per path (relative to the repo_abspath).
-        E.g. {('.', 'Catalyst', 'Editions', 'Base'), ['Foo*', '*Bar']}
+        E.g. {('.', 'Catalyst', 'Editions', 'Base'): ['Foo*', '*Bar']}
 
-        @type repo_abspath:     string
-        @param repo_abspath:    Absolute path to the git repository.
+        @param repo_abspath: Absolute path to the git repository.
+        @type repo_abspath: str
 
-        @type repo_file_paths:  list
         @param repo_file_paths: List of paths relative to the repo_abspath that are under git control.
+        @type repo_file_paths:  list
 
-        @rtype:         dict
-        @return:    Dictionary representing exclude patterns.
-                    Keys are tuples of strings. Values are lists of strings.
-                    Returns None if self.exclude is not set.
+        @return: Dictionary representing exclude patterns.
+            Keys are tuples of strings. Values are lists of strings.
+            Returns None if self.exclude is not set.
+        @rtype: dict or None
         """
         if not self.exclude:
             return None
@@ -201,7 +196,7 @@ class GitArchiver(object):
 
         # There may be no gitattributes.
         try:
-            global_attributes_abspath = self.read_shell("git config --get core.attributesfile", repo_abspath).rstrip()
+            global_attributes_abspath = self.run_git_shell("git config --get core.attributesfile", repo_abspath).rstrip()
             exclude_patterns[()] = read_attributes(global_attributes_abspath)
         except:
             # And it's valid to not have them.
@@ -226,17 +221,17 @@ class GitArchiver(object):
         """
         Checks whether file at a given path is excluded.
 
-        @type repo_abspath: string
         @param repo_abspath: Absolute path to the git repository.
+        @type repo_abspath: str
 
-        @type repo_file_path:   string
-        @param repo_file_path:  Path to a file within repo_abspath.
+        @param repo_file_path: Path to a file within repo_abspath.
+        @type repo_file_path: str
 
-        @type exclude_patterns:     dict
-        @param exclude_patterns:    Exclude patterns with format specified for get_exclude_patterns.
+        @param exclude_patterns: Exclude patterns with format specified for get_exclude_patterns.
+        @type exclude_patterns: dict
 
-        @rtype: bool
         @return: True if file should be excluded. Otherwise False.
+        @rtype: bool
         """
         if exclude_patterns is None or not len(exclude_patterns):
             return False
@@ -271,6 +266,7 @@ class GitArchiver(object):
 
         @param archiver: Callable that accepts 2 arguments:
             abspath to file on the system and relative path within archive.
+        @type archiver: Callable
         """
         for file_path in self.extra:
             archiver(path.abspath(file_path), path.join(self.prefix, file_path))
@@ -287,14 +283,14 @@ class GitArchiver(object):
 
         Recurs into submodules as well.
 
-        @type repo_path:    string
-        @param repo_path:   Path to the git submodule repository relative to main_repo_abspath.
+        @param repo_path: Path to the git submodule repository relative to main_repo_abspath.
+        @type repo_path: str
 
-        @rtype:     iterator
-        @return:    Iterator to traverse files under git control relative to main_repo_abspath.
+        @return: Iterator to traverse files under git control relative to main_repo_abspath.
+        @rtype: Iterable
         """
         repo_abspath = path.join(self.main_repo_abspath, repo_path)
-        repo_file_paths = self.read_git_shell(
+        repo_file_paths = self.run_git_shell(
             "git ls-files --cached --full-name --no-empty-directory",
             repo_abspath
         ).splitlines()
@@ -303,11 +299,11 @@ class GitArchiver(object):
         for repo_file_path in repo_file_paths:
             # Git puts path in quotes if file path has unicode characters.
             repo_file_path = repo_file_path.strip('"')  # file path relative to current repo
-            file_name = path.basename(repo_file_path)
+            repo_file_abspath = path.join(repo_abspath, repo_file_path)  # absolute file path
             main_repo_file_path = path.join(repo_path, repo_file_path)  # file path relative to the main repo
 
             # Only list symlinks and files.
-            if not path.islink(main_repo_file_path) and path.isdir(main_repo_file_path):
+            if not path.islink(repo_file_abspath) and path.isdir(repo_file_abspath):
                 continue
 
             if self.is_file_excluded(repo_abspath, repo_file_path, exclude_patterns):
@@ -316,19 +312,26 @@ class GitArchiver(object):
             yield main_repo_file_path
 
         if self.force_sub:
-            self.run_shell("git submodule init", repo_abspath)
-            self.run_shell("git submodule update", repo_abspath)
-
-        gitmodulesfile = path.join(repo_path, ".gitmodules")
-        if path.isfile(gitmodulesfile):
-            with open(gitmodulesfile) as f:
-                for line in f.readlines():
-                    m = re.match("^\s*path\s*=\s*(.*)\s*$", line)
-                    if m:
-                        submodule_path = m.group(1)
-                        submodule_path = path.join(repo_path, submodule_path)
-                        for file_path in self.walk_git_files(submodule_path):
-                            yield file_path
+            self.run_git_shell("git submodule init", repo_abspath)
+            self.run_git_shell("git submodule update", repo_abspath)
+
+        try:
+            repo_gitmodules_abspath = path.join(repo_abspath, ".gitmodules")
+
+            with open(repo_gitmodules_abspath) as f:
+                lines = f.readlines()
+
+            for l in lines:
+                m = re.match("^\s*path\s*=\s*(.*)\s*$", l)
+
+                if m:
+                    submodule_path = m.group(1)
+                    submodule_path = path.join(repo_path, submodule_path)
+
+                    for submodule_file_path in self.walk_git_files(submodule_path):
+                        yield submodule_file_path
+        except IOError:
+            pass
 
     @staticmethod
     def get_path_components(repo_abspath, abspath):
@@ -340,13 +343,13 @@ class GitArchiver(object):
         '/Documents/Hobby/ParaView/Catalyst/Editions/Base/', function will return:
         ['.', 'Catalyst', 'Editions', 'Base']
 
-        First element is always '.' (concrete symbol depends on OS).
+        First element is always os.curdir (concrete symbol depends on OS).
 
         @param repo_abspath: Absolute path to the git repository. Normalized via os.path.normpath.
-        @type repo_abspath: string
+        @type repo_abspath: str
 
         @param abspath: Absolute path to a file within repo_abspath. Normalized via os.path.normpath.
-        @type abspath: string
+        @type abspath: str
 
         @return: List of path components.
         @rtype: list
@@ -378,73 +381,18 @@ class GitArchiver(object):
         return components
 
     @staticmethod
-    def run_shell(cmd, cwd=None):
-        """
-        Runs shell command.
-
-        @type cmd:  string
-        @param cmd: Command to be executed.
-
-        @type cwd:  string
-        @param cwd: Working directory.
-
-        @rtype:     int
-        @return:    Return code of the command.
-
-        @raise CalledProcessError:  Raises exception if return code of the command is non-zero.
-        """
-        p = Popen(cmd, shell=True, cwd=cwd)
-        p.wait()
-
-        if p.returncode:
-            raise CalledProcessError(returncode=p.returncode, cmd=cmd)
-
-        return p.returncode
-
-    @staticmethod
-    def read_shell(cmd, cwd=None, encoding='utf-8'):
-        """
-        Runs shell command and reads output.
-
-        @type cmd:  string
-        @param cmd: Command to be executed.
-
-        @type cwd:  string
-        @param cwd: Working directory.
-
-        @type encoding: string
-        @param encoding: Encoding used to decode bytes returned by Popen into string.
-
-        @rtype:     string
-        @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 = output.decode(encoding)
-
-        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
-
-    @staticmethod
-    def read_git_shell(cmd, cwd=None):
+    def run_git_shell(cmd, cwd=None):
         """
-        Runs git shell command, reads output and decodes it into unicode string
+        Runs git shell command, reads output and decodes it into unicode string.
 
-        @type cmd:  string
         @param cmd: Command to be executed.
+        @type cmd: str
 
-        @type cwd:  string
+        @type cwd: str
         @param cwd: Working directory.
 
-        @rtype:     string
-        @return:    Output of the command.
+        @rtype: str
+        @return: Output of the command.
 
         @raise CalledProcessError:  Raises exception if return code of the command is non-zero.
         """

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano.