capistrano-git-copy 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438af623f1bfbafaeaef34ebd37e966f87a142ce
-  data.tar.gz: 064091bf7968aea808d4cce27319521e697cecc7
+  metadata.gz: 3a81441e1cd095ef7631d1ceec3445b91f55dd19
+  data.tar.gz: 653d35f2b7a582b098c6095462655e2080e0cd4c
 SHA512:
-  metadata.gz: c8f04011460b4c2b01b0516c5e25c8df0cdc2075bd0702abf37b5115bc1e9db80660e0faa9ecec59cff2249c873cecb5167169c3d2ccce24c7c202df407799dc
-  data.tar.gz: 4e09dc7110042bd4a3d5a86656a17a653e4dae4935446ab48e69a27b2f29fe0e3d99a1cfe6ebee8beb5c80d4de171c33b41c506238f7d957e6f94d82a499d685
+  metadata.gz: da22afa01251756988b217715a3192d401d763d7fd420476ee82ba50158844728c0c68c42b98a22d612d141668240f187590538d8eb5cd7e8df6d05521761100
+  data.tar.gz: 124699224d4743a83c7918bc35354cf4a6a25656f029de6682f65092ce2464b7e3c340261ae96560fae8541525a7616530d6667a039ac938a6625a3fc3c74ffa

data/README.md

@@ -33,12 +33,6 @@ You can modify any of the following Capistrano variables in your `deploy.rb` con
 
 * Uses [git-archive-all](https://github.com/Kentzo/git-archive-all) for bundling repositories.
 
-## Code status
-
-* [![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
 
 1. Fork it
@@ -46,3 +40,10 @@ You can modify any of the following Capistrano variables in your `deploy.rb` con
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+ 
+
+[![Gem Version](https://img.shields.io/gem/v/capistrano-git-copy.svg)](https://rubygems.org/gems/capistrano-git-copy)
+[![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)

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

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

@@ -47,7 +47,7 @@ namespace :git_copy do
 
   desc 'Determine the revision that will be deployed'
   task set_current_revision: :'git_copy:wrapper' do
-    revision = `cd #{fetch(:local_repo_path)} && git rev-parse --short #{fetch(:branch, 'master')} 2>/dev/null`.strip
+    revision = `cd #{fetch(:local_repo_path)} && git rev-parse --short HEAD 2>/dev/null`.strip
 
     on release_roles :all do
       set :current_revision, revision
@@ -62,7 +62,7 @@ namespace :git_copy do
       system("rm -rf #{tmp_path}")
       print "Removed #{tmp_path}\n"
     else
-      print "Nothing to cleanup (#{tmp_path} not found on filesystem)\n"
+      print "Nothing to cleanup (#{tmp_path} not found)\n"
     end
   end
 
@@ -79,15 +79,16 @@ namespace :git_copy do
     # 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
+    # clone repository if necessary
+    unless File.exists?(fetch(:local_repo_path))
       system("git clone #{fetch(:repo_url)} #{fetch(:local_repo_path)}")
     end
 
+    # update repository
+    system("cd #{fetch(:local_repo_path)} && git fetch origin && git fetch origin --tags")
+
     # reset repository
-    system("cd #{fetch(:local_repo_path)} && git reset --hard origin/#{fetch(:branch, 'master')} && git submodule init && git submodule update")
+    system("cd #{fetch(:local_repo_path)} && git reset --hard #{fetch(:branch, 'master')} 2>/dev/null")
 
     # init and update submodules
     system("cd #{fetch(:local_repo_path)} && git submodule init && git submodule update")

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano