capistrano-git-submodule-strategy 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a22f68ba979ebd34bb210eb2908ca1471717cc8b
-  data.tar.gz: f9321c10874ff77b9369c6c2df7cf0eee996da6c
+  metadata.gz: e8cef1b1692241a363a6a8f7b14ff94f2c5a57f7
+  data.tar.gz: 834525893d26d21ae83760416de4e630ce027d74
 SHA512:
-  metadata.gz: 3bd458b10de7fea86d8fefdfd5e7d73928ee630655a12eb4807dba670cace46fb92af0dcf1a4d57287786b864d840e96c650ee4419b5ddd889b63450a50eb6b3
-  data.tar.gz: 4989e7c3f0550f4503bcd91e080224f60017f082499bacad40d1c83d4094e5299d28824014f6ec867fc47b581eca821050c2b9c627d6359f102343d05a4e9f7e
+  metadata.gz: cd791fd79ddf554bc0217d94ad739feebab503bab60d819fdf268168af6acb2962f03d5909d7d20bd83d6eeb787b12a281396266c76b23edd20c0aed6a6b044b
+  data.tar.gz: 094a1c3d152af474fbddd89819f4eeb38c5f620d64003c619c8cdfcdaeff075de0930ec778257afde6705b2e46fcbb1f31931d00cc1ea08692567e2041491c3b

data/Gemfile

@@ -9,6 +9,7 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
+  gem "mini_portile2", "~> 2.1.0"
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.5)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -14,7 +14,7 @@ GEM
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.9.1)
+    git (1.3.0)
     github_api (0.13.1)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -22,7 +22,7 @@ GEM
       hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
       oauth2
-    hashie (3.4.3)
+    hashie (3.4.4)
     highline (1.7.8)
     i18n (0.7.0)
     jeweler (2.0.1)
@@ -35,22 +35,23 @@ GEM
       rake
       rdoc
     json (1.8.3)
-    jwt (1.5.2)
-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    multi_json (1.11.2)
+    jwt (1.5.1)
+    mini_portile (0.6.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.0.0)
+    nokogiri (1.6.6.4)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+      jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     rack (1.6.4)
-    rake (10.4.2)
+    rake (11.1.2)
     rdoc (3.12.2)
       json (~> 1.4)
     shoulda (3.5.0)
@@ -59,7 +60,7 @@ GEM
     shoulda-context (1.2.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.11.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -74,9 +75,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
+  mini_portile2 (~> 2.1.0)
   rdoc (~> 3.12)
   shoulda
   simplecov
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.22

data/capistrano-git-submodule-strategy.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-git-submodule-strategy 0.1.20 ruby lib
+# stub: capistrano-git-submodule-strategy 0.1.22 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-git-submodule-strategy"
-  s.version = "0.1.20"
+  s.version = "0.1.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Boris Gorbylev"]
-  s.date = "2016-03-22"
+  s.date = "2016-05-30"
   s.description = "Git submodule support for Capistrano 3"
   s.email = "ekho@ekho.name"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ekho/capistrano-git-submodule-strategy"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.5.1"
   s.summary = "Git submodule support for Capistrano 3"
 
   if s.respond_to? :specification_version then
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<mini_portile2>, ["~> 2.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<capistrano>, ["~> 3.1"])
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<capistrano>, ["~> 3.1"])
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<mini_portile2>, ["~> 2.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<capistrano>, ["~> 3.1"])

data/lib/capistrano/git-submodule-strategy.rb

@@ -35,15 +35,26 @@ class Capistrano::Git
     # make sure the submodules are up-to-date
     # and copy everything to the release path
     def release
-      unless context.test(:test, '-e', release_path) && context.test("ls -A #{release_path} | read linevar")
-        git :clone, "--reference #{repo_path}", (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), repo_url, release_path
+      return if context.test(:test, '-e', release_path) && context.test("ls -A #{release_path} | read linevar")
+
+      git_version = context.capture(:git, '--version').strip.match('^git version (\d+(?:\.\d+)+)$')
+
+      if git_version.nil? || git_version[1] < '2.3.0'
+        git :clone, (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), "file://#{repo_path}", release_path
         context.within_only release_path do
-          git :submodule, 'update', '--init', '--recursive'
-        end
-        unless fetch(:git_keep_meta, false)
-          verbose = Rake.application.options.trace ? 'v' : ''
-          context.execute("find #{release_path} -name '.git*' | xargs -I {} rm -rf#{verbose} '{}'")
+          git :remote, 'set-url', 'origin', repo_url
         end
+      else
+        git :clone, "--reference #{repo_path}", '--dissociate', (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), repo_url, release_path
+      end
+
+      context.within_only release_path do
+        git :submodule, 'update', '--init', '--recursive'
+      end
+
+      unless fetch(:git_keep_meta, false)
+        verbose = Rake.application.options.trace ? 'v' : ''
+        context.execute("find #{release_path} -name '.git*' | xargs -I {} rm -rf#{verbose} '{}'")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-git-submodule-strategy
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - Boris Gorbylev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Git submodule support for Capistrano 3