capistrano-git-copy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4071457c639166076052d94779f9fb7b78f67df6
-  data.tar.gz: 91fff803b0beaad67d114d7d9d9ba8def134abbd
+  metadata.gz: 94972a5b5759dadb2f2ebf2e41d36803676830f4
+  data.tar.gz: f790c70439a4c18692d666148bf243da068bbe0e
 SHA512:
-  metadata.gz: 715d74acefef227adf864d744af203628337ba5d229d7b93a0c6a2d99cf01f831d740eea0d0bd24d0172c6e5915ea92bb503e4232846c11974e4793e1d4cd892
-  data.tar.gz: bf787dbe3850e122baeda5f0eda224d561a6b2fe25e3ff9e95f4ceff2e97c93c5c4af9f67dfa92d691d084a78de0d8740846ef9f8eba23dc6967f94344dc4788
+  metadata.gz: e2f15230b238f8fce7ed92857ecaecc88df80f00d93a487905942792556c242d8f53cee21c2210c080472c280bd16e4f1524d5540940705683030774ebb5b9b1
+  data.tar.gz: 411ef9a081b6479098a5246a5a433f81b9b1141d3dfce9b547596e21bbf92ddf05aba46e3263d5bed8971b438a294faf121414672ca5704ab3c20d37e8e097dc

data/capistrano-git-copy.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'yard'
 end

data/lib/capistrano/git/copy.rb

@@ -1,6 +1,12 @@
+# Capistrano
 module Capistrano
+  # GIT
   module Git
+    # Copy
     module Copy
+      # Quick-Access to this gems root directory
+      #
+      # @return [String] Root directory of this gem
       def self.root_path
         File.expand_path('../../../..', __FILE__)
       end

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

@@ -1,3 +1,3 @@
 require 'tmpdir'
 
-load File.expand_path("../tasks/deploy.cap", __FILE__)
+load File.expand_path('../tasks/deploy.cap', __FILE__)

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

@@ -10,7 +10,6 @@ namespace :load do
 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
@@ -22,21 +21,23 @@ namespace :git_copy do
 
   desc 'Create tar and upload to server'
   task update: :'git_copy:wrapper' do
-    local_repo_path = File.join(fetch(:git_copy_tmp_path), 'repo')
-    local_tar_file = File.join(fetch(:git_copy_tmp_path), 'archive.tar.gz')
+    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 #{fetch(:git_copy_tmp_path)}")
-    system("mkdir -p #{fetch(:git_copy_tmp_path)}")
+    system("rm -rf #{tmp_path}") unless fetch(:repo_url) == local_repo_url
+    system("mkdir -p #{tmp_path}")
 
-    system("git clone #{fetch(:repo_url)} #{local_repo_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")
 
     on roles :all do
-      system("cd #{local_repo_path} && git checkout #{fetch(:branch)} && git submodule init && git submodule update && git-archive-all __tmp.tar")
+      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} && tar -xf __tmp.tar && cd __tmp && tar -czf #{local_tar_file} .")
 
       upload!(local_tar_file, "#{fetch(:tmp_dir)}/#{fetch(:application)}_#{fetch(:stage)}.tar.gz")
 
-      system("rm -rf #{local_repo_path}")
       system("rm -rf #{local_tar_file}")
     end
   end

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

@@ -1,7 +1,8 @@
 module Capistrano
   module Git
     module Copy
-      VERSION = '0.3.0'
+      # gem version
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-copy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Copy local git repository deploy strategy for capistrano
@@ -59,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,18 +96,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Copy local git repository deploy strategy for capistrano
 test_files: []
+has_rdoc: