capistrano-git-copy 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2799635e6ca2f09d4a2bb4f31a244c61119580ef
-  data.tar.gz: c5b7993504bbb916db357343ccdcc118a9b34ac8
+  metadata.gz: ebf8972754ecc7f4d30e9226bc5ce379c0e140b5
+  data.tar.gz: 89e3eb756e62ffe59be1e5376caa79995021e631
 SHA512:
-  metadata.gz: 324a39f389bcb1c475d51074ad381b61c0ea84f76cc40cae70ede7cba800a6c68f58ae955824011c8b65e5102d1cfd78c757646a92480fa399c43bdbcd618519
-  data.tar.gz: b465d73c1b1b81e1581bea0d29587ba3b87980323082d78f7a3d12ed1bcfeeda3b97894a54d769704490682c47a60128d0316a35b2c70c6ffa8bdc68223813d1
+  metadata.gz: c08617c6f6d583355e3371f73efa84c385e924723e77e8b1e50ea5d7913a8b3b7ffdfd0b25ef01aee5380bbffd7456988c9c12e317b04c874e54e10f14797738
+  data.tar.gz: 95adbebfb60bf7e59625406026c01d76146d397d4a27aa9e5a238a0a455a24ad7850d30cf3458261c8f2021a124b0ed933749eb64864002b7b8c441e78bbc118

data/lib/capistrano/git/copy/tasks/deploy.cap

@@ -1,8 +1,8 @@
 namespace :load do
   task :defaults do
     set :git_archive_all_bin, -> {
-      bin = `which git-archive-all`
-      bin.strip.length > 0 ? bin : File.join(Capistrano::Git::Copy.root_path, 'vendor', 'bin', 'git-archive-all')
+      bin = `which git-archive-all`.strip
+      bin.length > 0 ? bin : File.join(Capistrano::Git::Copy.root_path, 'vendor', 'bin', 'git-archive-all')
     }
 
     set :git_copy_tmp_path, -> { File.join(Dir.tmpdir, "#{fetch(:application)}_#{fetch(:stage)}") }
@@ -11,9 +11,7 @@ end
 
 namespace :git_copy do
   task :wrapper do
-    on roles :all do
-      fail "git-archive-all binary not found" if fetch(:git_archive_all_bin).strip.length == 0
-    end
+    fail "git-archive-all binary not found" if fetch(:git_archive_all_bin).strip.length == 0
   end
 
   task :check do; end
@@ -32,10 +30,10 @@ namespace :git_copy do
 
     system("if [ -d #{local_repo_path} ]; then cd #{local_repo_path} && git fetch origin; else git clone #{fetch(:repo_url)} #{local_repo_path}; fi")
 
-    system("cd #{local_repo_path} && git reset --hard origin/#{fetch(:branch)} && git submodule init && git submodule update && git-archive-all __tmp.tar")
+    system("cd #{local_repo_path} && git reset --hard origin/#{fetch(:branch, 'master')} && git submodule init && git submodule update && #{fetch(:git_archive_all_bin)} __tmp.tar")
     system("cd #{local_repo_path} && tar -xf __tmp.tar && cd __tmp && tar -czf #{local_tar_file} .")
 
-    on roles :all do
+    on release_roles :all do
       upload!(local_tar_file, "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz")
     end
 
@@ -44,10 +42,19 @@ namespace :git_copy do
 
   desc 'Extract tar to release path'
   task create_release: :'git_copy:update' do
-    on roles :all do
+    on release_roles :all do
       execute(:mkdir, '-p', release_path)
       execute(:tar, '-f', "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz", '-x -C', release_path)
       execute(:rm, '-f', "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz")
     end
   end
+
+  desc 'Determine the revision that will be deployed'
+  task set_current_revision: :'git_copy:wrapper' do
+    revision = `git rev-parse --short #{fetch(:branch, 'master')} 2>/dev/null`.strip
+
+    on release_roles :all do
+      set :current_revision, revision
+    end
+  end
 end

data/lib/capistrano/git/copy/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Git
     module Copy
       # gem version
-      VERSION = '0.4.1'
+      VERSION = '0.5.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano