capistrano-git-copy 0.5.0 → 0.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf8972754ecc7f4d30e9226bc5ce379c0e140b5
-  data.tar.gz: 89e3eb756e62ffe59be1e5376caa79995021e631
+  metadata.gz: f0294d9a08b688020ce1e8d6a2cb9f1a34809ea8
+  data.tar.gz: 5187fe2733f233ccb0fa28d09e20d7c98f3ee261
 SHA512:
-  metadata.gz: c08617c6f6d583355e3371f73efa84c385e924723e77e8b1e50ea5d7913a8b3b7ffdfd0b25ef01aee5380bbffd7456988c9c12e317b04c874e54e10f14797738
-  data.tar.gz: 95adbebfb60bf7e59625406026c01d76146d397d4a27aa9e5a238a0a455a24ad7850d30cf3458261c8f2021a124b0ed933749eb64864002b7b8c441e78bbc118
+  metadata.gz: c72c8755b87d71e150d12b5549f1fa10576446d6cfc9b79821674e1cb3b2c24dd54af724084fdcd043c8c0eaf0fcc279279003d49d14d1afb165f4b00b90e84c
+  data.tar.gz: 97ab0f19de8b67651ebd697f8687cfcf65c41bbe0d22d2ecbd206eaef65544937860c6accbeb7b80005214a72893bdec8fa832d5f2cb3a370c7cf20543dc151c

data/README.md

@@ -1,10 +1,6 @@
 # Capistrano::GIT::Copy
 
-Creates a tar archive from the locale git repository and uploads it to the remote server.
-
-## Requirements
-
-* [git-archive-all](https://github.com/Kentzo/git-archive-all)
+Creates a tar archive locally from the git repository and uploads it to the remote server.
 
 ## Setup
 
@@ -16,7 +12,7 @@ group :development do
 end
 ```
 
-And load it in your `Capfile`:
+And require it in your `Capfile`:
 
 ```ruby
 require 'capistrano/git/copy'
@@ -28,10 +24,20 @@ Now use `git_copy` as your SCM type in your `config/deploy.rb`:
 
 ## Configuration
 
-You can modify any of the following Capistrano variables in your deploy.rb config.
+You can modify any of the following Capistrano variables in your `deploy.rb` config.
+
+- `git_archive_all_bin`     - Set the path for the git-archive-all command. Defaults to git-archive-all found in $PATH or the included version as a fallback.
+- `git_copy_tmp_path`       - Temporary path where the repository is cloned to and the archive is created.
+
+## Notes
+
+* Uses [git-archive-all](https://github.com/Kentzo/git-archive-all) for bundling repositories.
+
+## Code status
 
-- `git_archive_all_bin`     - Set git-archive-all command. Defaults to git-archive-all found in $PATH or to included version.
-- `git_copy_tmp_path`       - Temp path used to clone the repository and create archive.
+* [![Gem Version](https://badge.fury.io/rb/capistrano-git-copy.png)](http://badge.fury.io/rb/capistrano-git-copy)
+* [![Dependencies](https://gemnasium.com/ydkn/capistrano-git-copy.png?travis)](https://gemnasium.com/ydkn/capistrano-git-copy)
+* [![PullReview stats](https://www.pullreview.com/github/ydkn/capistrano-git-copy/badges/master.svg?)](https://www.pullreview.com/github/ydkn/capistrano-git-copy/reviews/master)
 
 ## Contributing
 

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.0.0'
+  spec.add_dependency 'capistrano', '>= 3.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

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

@@ -12,6 +12,8 @@ end
 namespace :git_copy do
   task :wrapper do
     fail "git-archive-all binary not found" if fetch(:git_archive_all_bin).strip.length == 0
+
+    invoke 'git_copy:update_local_working_copy'
   end
 
   task :check do; end
@@ -19,25 +21,19 @@ namespace :git_copy do
 
   desc 'Create tar and upload to server'
   task update: :'git_copy:wrapper' do
-    tmp_path = fetch(:git_copy_tmp_path)
-    local_repo_path = File.join(tmp_path, 'repo')
-    local_tar_file = File.join(tmp_path, 'archive.tar.gz')
-
-    local_repo_url = `cd #{local_repo_path} 2>/dev/null && git config --get remote.origin.url 2>/dev/null`.strip
-
-    system("rm -rf #{tmp_path}") unless fetch(:repo_url) == local_repo_url
-    system("mkdir -p #{tmp_path}")
-
-    system("if [ -d #{local_repo_path} ]; then cd #{local_repo_path} && git fetch origin; else git clone #{fetch(:repo_url)} #{local_repo_path}; fi")
+    # create tar with git-archive-all
+    system("cd #{fetch(:local_repo_path)} && #{fetch(:git_archive_all_bin)} __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} .")
+    # create tar.gz for upload
+    system("cd #{fetch(:local_repo_path)} && tar -xf __tmp.tar && cd __tmp && tar -czf #{fetch(:local_tar_file)} .")
 
+    # upload to all servers
     on release_roles :all do
-      upload!(local_tar_file, "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz")
+      upload!(fetch(:local_tar_file), "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz")
     end
 
-    system("rm -rf #{local_tar_file}")
+    # delete temporary tar.gz archive
+    system("rm -rf #{fetch(:local_tar_file)}")
   end
 
   desc 'Extract tar to release path'
@@ -51,10 +47,54 @@ namespace :git_copy do
 
   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
+    revision = `cd #{fetch(:local_repo_path)} && git rev-parse --short #{fetch(:branch, 'master')} 2>/dev/null`.strip
 
     on release_roles :all do
       set :current_revision, revision
     end
   end
+
+  desc 'Clean up temp dir'
+  task :cleanup do
+    tmp_path = fetch(:git_copy_tmp_path)
+
+    if File.exists?(tmp_path)
+      system("rm -rf #{tmp_path}")
+      print "Removed #{tmp_path}\n"
+    else
+      print "Nothing to cleanup (#{tmp_path} not found on filesystem)\n"
+    end
+  end
+
+  task update_local_working_copy: :'git_copy:wrapper' do
+    tmp_path = fetch(:git_copy_tmp_path)
+
+    set :local_repo_path, File.join(tmp_path, 'repo')
+    set :local_tar_file,  File.join(tmp_path, 'archive.tar.gz')
+
+    # track if the repo url has changed
+    local_repo_url = `cd #{fetch(:local_repo_path)} 2>/dev/null && git config --get remote.origin.url 2>/dev/null`.strip
+    system("rm -rf #{tmp_path}") unless fetch(:repo_url) == local_repo_url
+
+    # prepare temp directory
+    system("mkdir -p #{tmp_path}")
+
+    # clone or update repository
+    if File.exists?(fetch(:local_repo_path))
+      system("cd #{fetch(:local_repo_path)} && git fetch origin")
+    else
+      system("git clone #{fetch(:repo_url)} #{fetch(:local_repo_path)}")
+    end
+
+    # reset repository
+    system("cd #{fetch(:local_repo_path)} && git reset --hard origin/#{fetch(:branch, 'master')} && git submodule init && git submodule update")
+
+    # init and update submodules
+    system("cd #{fetch(:local_repo_path)} && git submodule init && git submodule update")
+    system("cd #{fetch(:local_repo_path)} && git submodule foreach --recursive git submodule update --init")
+
+    # clean up working directory
+    system("cd #{fetch(:local_repo_path)} && git clean -d -f")
+    system("cd #{fetch(:local_repo_path)} && git submodule foreach --recursive git clean -d -f")
+  end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2