capistrano-git-copy 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aec6507f638bcb5e8ddf791bad63dde7e2f93b6
-  data.tar.gz: 1a39e03172e841a9fff5095b90d21441e8bd1b96
+  metadata.gz: d4ae3564eccef2c188c4176c2ad8f2276b1f7c88
+  data.tar.gz: 993bfa2dc61a9c78376b5af0847f7c0fed5c6ae3
 SHA512:
-  metadata.gz: bf4b39c80f04bbf15ffe45d0537c5115067678e96f2492e4f91bd2dd7d9dcef9b59b646e8fbb069971af5dffd7709ef29dd1c6501a0915d4b306b2d5532f1c8d
-  data.tar.gz: b0796ae5712a0531d009a8ac53159d0589adc18355812d7af8d6c282b2065e517a7106d7094f0e5855df2df488f9ccb78992a46a0d8f55fc7240ea2c1a01d5bc
+  metadata.gz: 4833479a333245dda86f3b10fe27b90fd5050be08b9ec10444d751c11745c75d586de4d6e67b5d25ea1d1869b888aeb22aa1e71f219579f268f839a76b98c7b5
+  data.tar.gz: 31bd01e829bd93683883deb00a2ba0f960979d1f5badd3e77b4f7e6d855eb8b0a12b9607e05e98b676d2d87de7a22de1312c8989da00f3455abdee9e442a024e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.1.0 (2015-08-10)
+### Changes
+  - 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
+
 ## 1.0.2 (2015-05-26)
 ### Fixed
   - use commit hash to fetch revision for log

data/README.md

@@ -2,6 +2,9 @@
 [![Dependencies](https://img.shields.io/gemnasium/ydkn/capistrano-git-copy.svg)](https://gemnasium.com/ydkn/capistrano-git-copy)
 [![Code Climate](https://img.shields.io/codeclimate/github/ydkn/capistrano-git-copy.svg)](https://codeclimate.com/github/ydkn/capistrano-git-copy)
 
+[![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ydkn/capistrano-git-copy)
+
+
 # Capistrano::GitCopy
 
 Creates a tar archive locally from the git repository and uploads it to the remote server.
@@ -19,13 +22,19 @@ end
 And require it in your `Capfile`:
 
 ```ruby
-require 'capistrano/git/copy'
+require 'capistrano/git_copy'
 ```
 
 Now use `git_copy` as your SCM type in your `config/deploy.rb`:
 
     set :scm, :git_copy
 
+By default, it includes all submodules into the deployment package. However, 
+if they are not needed in a particular deployment, you can disable them with 
+a configuration option:
+
+    set :with_submodules, false
+
 ## Notes
 
 * Uses [git-archive-all](https://github.com/Kentzo/git-archive-all) for bundling repositories.

data/lib/capistrano/git/copy.rb

@@ -0,0 +1 @@
+STDERR.puts("[DEPRECATION] Please change \"require 'capistrano/git/copy'\" to \"require 'capistrano/git_copy'\" in your Capfile.")

data/lib/capistrano/git_copy.rb

@@ -1,3 +1,2 @@
 require 'capistrano/git_copy/utility'
-
-load File.expand_path('../git_copy/tasks/deploy.cap', __FILE__)
+require 'capistrano/git_copy/task'

data/lib/capistrano/git_copy/task.rb

@@ -0,0 +1 @@
+load File.expand_path('../tasks/deploy.cap', __FILE__)

data/lib/capistrano/git_copy/tasks/deploy.cap

@@ -1,3 +1,9 @@
+namespace :load do
+  task :defaults do
+     set :with_submodules, true
+  end
+end
+
 namespace :git_copy do
   def git_copy_utility
     @git_copy_utility ||= Capistrano::GitCopy::Utility.new(self)

data/lib/capistrano/git_copy/utility.rb

@@ -5,8 +5,11 @@ module Capistrano
   module GitCopy
     # Utility stuff to avoid cluttering of deploy.cap
     class Utility
+      attr_reader :with_submodules
+
       def initialize(context)
         @context = context
+        @with_submodules = fetch(:with_submodules, true)
       end
 
       # Check if repo cache exists
@@ -40,20 +43,28 @@ module Capistrano
         git :reset, '--hard', commit_hash
 
         # submodules
-        git :submodule, :init
-        git :submodule, :update
-        git :submodule, :foreach, '--recursive', :git, :submodule, :update, '--init'
+        if with_submodules
+          git :submodule, :init
+          git :submodule, :update
+          git :submodule, :foreach, '--recursive', :git, :submodule, :update, '--init'
+        end
 
         # cleanup
         git :clean, '-d', '-f'
-        git :submodule, :foreach, '--recursive', :git, :clean, '-d', '-f'
+        if with_submodules
+          git :submodule, :foreach, '--recursive', :git, :clean, '-d', '-f'
+        end
       end
 
       # Create tar archive
       #
       # @return void
       def prepare_release
-        execute git_archive_all_bin, "--prefix=''", archive_path
+        if with_submodules
+          execute git_archive_all_bin, "--prefix=''", archive_path
+        else
+          git "archive --format=tar HEAD | gzip > #{archive_path}"
+        end
       end
 
       # Upload and extract release

data/lib/capistrano/git_copy/version.rb

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

data/vendor/git-archive-all/git-archive-all

@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 __version__ = "1.9"
 
 import logging
-from os import extsep, path, readlink
+from os import extsep, path, readlink, curdir
 from subprocess import CalledProcessError, Popen, PIPE
 import sys
 import tarfile
@@ -64,7 +64,7 @@ class GitArchiver(object):
         try:
             self.run_shell("[ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1", main_repo_abspath)
         except Exception as e:
-            raise ValueError("Not a git repository (or any of the parent directories).".format(path=main_repo_abspath))
+            raise ValueError("Not a git repository (or any of the parent directories).")
 
         main_repo_abspath = path.abspath(self.read_git_shell('git rev-parse --show-toplevel', main_repo_abspath).rstrip())
 
@@ -94,7 +94,7 @@ class GitArchiver(object):
         if output_format is None:
             file_name, file_ext = path.splitext(output_path)
             output_format = file_ext[len(extsep):].lower()
-            self.LOG.debug("Output format is not explicitly set, determined format is {0}.".format(output_format))
+            self.LOG.debug("Output format is not explicitly set, determined format is {}.".format(output_format))
 
         if not dry_run:
             if output_format == 'zip':
@@ -116,19 +116,19 @@ class GitArchiver(object):
                 elif output_format == 'txz':
                     t_mode = 'w:xz'
                 else:
-                    t_mode = 'w:{0}'.format(output_format)
+                    t_mode = 'w:{}'.format(output_format)
 
                 archive = tarfile.open(path.abspath(output_path), t_mode)
                 add_file = lambda file_path, arcname: archive.add(file_path, arcname)
             else:
-                raise RuntimeError("Unknown format: {0}".format(output_format))
+                raise RuntimeError("Unknown format: {}".format(output_format))
 
             def archiver(file_path, arcname):
-                self.LOG.debug("Compressing {0} => {1}...".format(file_path, arcname))
+                self.LOG.debug("Compressing {} => {}...".format(file_path, arcname))
                 add_file(file_path, arcname)
         else:
             archive = None
-            archiver = lambda file_path, arcname: self.LOG.info("{0} => {1}".format(file_path, arcname))
+            archiver = lambda file_path, arcname: self.LOG.info("{} => {}".format(file_path, arcname))
 
         self.archive_all_files(archiver)
 
@@ -225,7 +225,7 @@ class GitArchiver(object):
                 patterns = exclude_patterns[key]
                 for p in patterns:
                     if fnmatch(file_name, p) or fnmatch(repo_file_path, p):
-                        self.LOG.debug("Exclude pattern matched {pattern}: {path}".format(pattern=p, path=repo_file_path))
+                        self.LOG.debug("Exclude pattern matched {}: {}".format(p, repo_file_path))
                         is_excluded = True
 
             if not len(components):
@@ -270,13 +270,12 @@ class GitArchiver(object):
             # 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)
+            main_repo_file_path = path.join(repo_path, repo_file_path)  # file path relative to the main repo
 
             # Only list symlinks and files that don't start with git.
-            if file_name.startswith(".git") or (not path.islink(repo_file_path) and path.isdir(repo_file_path)):
+            if file_name.startswith(".git") or (not path.islink(main_repo_file_path) and path.isdir(main_repo_file_path)):
                 continue
 
-            main_repo_file_path = path.join(repo_path, repo_file_path)  # file path relative to the main repo
-
             if self.is_file_excluded(repo_abspath, repo_file_path, exclude_patterns):
                 continue
 
@@ -286,7 +285,7 @@ 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'", repo_abspath).splitlines():
+        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):
@@ -323,7 +322,7 @@ class GitArchiver(object):
             raise ValueError("abspath MUST be absoulte path.")
 
         if not path.commonprefix([repo_abspath, abspath]):
-            raise ValueError("abspath (\"{0}\") MUST have common prefix with repo_abspath (\"{1}\")".format(abspath, repo_abspath))
+            raise ValueError("abspath (\"{}\") MUST have common prefix with repo_abspath (\"{}\")".format(abspath, repo_abspath))
 
         components = []
 
@@ -333,8 +332,7 @@ class GitArchiver(object):
             if tail:
                 components.insert(0, tail)
 
-        # Get portable version of '.'
-        components.insert(0, path.relpath(repo_abspath, repo_abspath))
+        components.insert(0, curdir)
         return components
 
     @staticmethod
@@ -425,7 +423,7 @@ if __name__ == '__main__':
     from optparse import OptionParser
 
     parser = OptionParser(usage="usage: %prog [-v] [--prefix PREFIX] [--no-exclude] [--force-submodules] [--extra EXTRA1 [EXTRA2]] [--dry-run] OUTPUT_FILE",
-                          version="%prog {version}".format(version=__version__))
+                          version="%prog {}".format(__version__))
 
     parser.add_option('--prefix',
                       type='string',
@@ -491,6 +489,6 @@ if __name__ == '__main__':
                                options.extra)
         archiver.create(output_file_path, options.dry_run)
     except Exception as e:
-        parser.exit(2, "{0}\n".format(e))
+        parser.exit(2, "{}\n".format(e))
 
     sys.exit(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -89,6 +89,7 @@ files:
 - capistrano-git-copy.gemspec
 - lib/capistrano/git/copy.rb
 - lib/capistrano/git_copy.rb
+- lib/capistrano/git_copy/task.rb
 - lib/capistrano/git_copy/tasks/deploy.cap
 - lib/capistrano/git_copy/utility.rb
 - lib/capistrano/git_copy/version.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano