capistrano-git-copy 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7784ccb4cb4af337de3e9023b46775da88e48e4
-  data.tar.gz: 7f9abc9ceefb06d7247ecdc7c6080bdb2dd6a751
+  metadata.gz: 0c1bd7f1f0427e2237d05ec40bfd2b04c263cc1d
+  data.tar.gz: a04f09b5de4cf6fc31191910d20aa0809e0fe851
 SHA512:
-  metadata.gz: 8dd0c5ad1efaf9c7c8a9da570d2c4bd51c4ecc52f3c85c8d8edffdea818d03489d628e5de526e18f5f8049491ee2cac52735c1a86fb40ed9ac8cc6d51fb89073
-  data.tar.gz: 10200bb1f194a6489a2cfc77a8086d093a6bda24349f1a56c49b585c88cd8d6d5e596972363ed7d54e1a1a7f7dafbbba6ba32b5fe266d9c3f8893d1d9951ec3b
+  metadata.gz: ace9a0e03014d24d19e691725adb5a068701eb1fd074d19d47d08cdf7af1d6d0e195e06c64f813c9d80c640a661046a79e4e7c8042c33714b99393a1c6e6c08a
+  data.tar.gz: fa69a38fec6225118f9cbf35e7b38d5325802ba7506896e3991aadaf9b4abeb94991347eda42947158cf28f10bbe7f12b88fec4fe164ace0447a9f91e2959eea

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 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

data/capistrano-git-copy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '>= 3.1.0', '< 4.0.0'
+  spec.add_dependency 'capistrano', '>= 3.1.0', '< 3.7.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/capistrano/git_copy/utility.rb

@@ -11,6 +11,8 @@ module Capistrano
       def initialize(context)
         @context         = context
         @with_submodules = fetch(:with_submodules, true)
+        @repo_tree = fetch(:repo_tree, false)
+        @with_submodules = @repo_tree? false : @with_submodules # If repo_tree is specified, set with_submodules to false
         @git_excludes    = fetch(:git_excludes, [])
       end
 
@@ -73,32 +75,14 @@ module Capistrano
       #
       # @return void
       def prepare_release
+        target = @repo_tree? "HEAD:#{@repo_tree}" : 'HEAD'
         if with_submodules
           execute(git_archive_all_bin, "--prefix=''", archive_path)
         else
-          git(:archive, '--format=tar', 'HEAD', '|', 'gzip', "> #{archive_path}")
+          git(:archive, '--format=tar', target, '|', 'gzip', "> #{archive_path}")
         end
 
-        if git_excludes.count > 0
-          archive_dir = File.join(tmp_path, 'archive')
-
-          execute :rm, '-rf', archive_dir
-          execute :mkdir, '-p', archive_dir
-          execute :tar, '-xzf', archive_path, '-C', archive_dir
-
-          git_excludes.each do |f|
-            file_path = File.join(archive_dir, f.gsub(/\A\//, ''))
-
-            unless File.exists?(file_path)
-              warn("#{f} does not exists!")
-              next
-            end
-
-            FileUtils.rm_rf(file_path)
-          end
-
-          execute :tar, '-czf', archive_path, '-C', archive_dir, '.'
-        end
+        exclude_files_from_archive if git_excludes.count > 0
       end
 
       # Upload and extract release
@@ -210,5 +194,26 @@ module Capistrano
         end
       end
     end
+
+    def exclude_files_from_archive
+      archive_dir = File.join(tmp_path, 'archive')
+
+      execute :rm, '-rf', archive_dir
+      execute :mkdir, '-p', archive_dir
+      execute :tar, '-xzf', archive_path, '-C', archive_dir
+
+      git_excludes.each do |f|
+        file_path = File.join(archive_dir, f.gsub(/\A\//, ''))
+
+        unless File.exists?(file_path)
+          warn("#{f} does not exists!")
+          next
+        end
+
+        FileUtils.rm_rf(file_path)
+      end
+
+      execute :tar, '-czf', archive_path, '-C', archive_dir, '.'
+    end
   end
 end

data/lib/capistrano/git_copy/version.rb

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

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

@@ -32,6 +32,7 @@ from subprocess import CalledProcessError, Popen, PIPE
 import sys
 import tarfile
 from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
+import re
 
 __version__ = "1.13"
 
@@ -84,7 +85,7 @@ class GitArchiver(object):
             raise ValueError("You MUST pass absolute path to the main git repository.")
 
         try:
-            self.run_shell("[ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1", main_repo_abspath)
+            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))
 
@@ -320,11 +321,16 @@ class GitArchiver(object):
             self.run_shell("git submodule init", repo_abspath)
             self.run_shell("git submodule update", repo_abspath)
 
-        for submodule_path in self.read_shell("git submodule --quiet foreach 'pwd -P'", repo_abspath).splitlines():
-            # Shell command returns absolute paths to submodules.
-            submodule_path = path.relpath(submodule_path, self.main_repo_abspath)
-            for file_path in self.walk_git_files(submodule_path):
-                yield file_path
+        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
 
     @staticmethod
     def get_path_components(repo_abspath, abspath):

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -19,7 +19,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano
 test_files: []
-has_rdoc: