capistrano-scm-git_with_submodule_and_resolv_symlinks 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf4463bd116cb47728ae884d95521260d0b2b40
-  data.tar.gz: 9edd09b97cbfca7669c534d0d570c510ed785a7a
+  metadata.gz: f7da55a4861e2193727eee4253092326821620a8
+  data.tar.gz: 685b30a1f1efb8685d35e9d069764ca6a354927c
 SHA512:
-  metadata.gz: 015076cc211ead9655054c2d134065cac4ab46fb93e2fc470dec1b6754d25aacff1564c5e80ca08848d51b5f85edb63836d72047e5f63ff2332c9781a7f940f8
-  data.tar.gz: 9bbffe2c8e55ea41c34ba4c8c7d58dbb5f6497c086ada726ba8f4727d2329d395c18a1001d844cb34dffdf010997215776a1e27d47dd11448b9f5a9ef5fc9808
+  metadata.gz: 0c6fc77bc0e8f3a0478ea083d4e0d29e0fb0d13247833907ab31c16eccaa274405f5a339a419e374031a96b0714b82573542f46c72804333d0e2aa1caf1cb61d
+  data.tar.gz: 815016db88fb94fe72eee9b97948b47f733e50b3d6ac57895e21cf09cd36d0a4de829cffb114a908fbbb912a30e8f42d3afb64b0e329f1e129e5f37abb822d61

data/capistrano-scm-git_with_submodule_and_resolv_symlinks.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano", "~> 3.7.0"
+  spec.add_dependency "capistrano", ">= 3.7.0", "< 3.9.0"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/capistrano/scm/git_with_submodule_and_resolv_symlinks.rb

@@ -1,5 +1,8 @@
 require 'capistrano/scm/plugin'
 require 'capistrano/scm/git_with_submodule_and_resolv_symlinks/version'
+require 'cgi'
+require 'shellwords'
+require 'uri'
 
 module Capistrano
   class SCM
@@ -12,7 +15,7 @@ module Capistrano
         set_if_empty :"#{nsp}_wrapper_path", lambda {
           # Try to avoid permissions issues when multiple users deploy the same app
           # by using different file names in the same dir for each deployer and stage.
-          suffix = [:application, :stage, :local_user].map { |key| fetch(key).to_s }.join("-").gsub(/\s+/, "-")
+          suffix = [:application, :stage, :local_user].map { |key| fetch(key).to_s }.join("-")
           "#{fetch(:tmp_dir)}/git-ssh-#{suffix}.sh"
         }
         set_if_empty :"#{nsp}_environmental_variables", lambda {
@@ -39,15 +42,15 @@ module Capistrano
       end
 
       def check_repo_is_reachable
-        git :'ls-remote', repo_url, "HEAD"
+        git :'ls-remote', git_repo_url, "HEAD"
       end
 
       def clone_repo
-        git :clone, repo_url, repo_path.to_s
+        git :clone, git_repo_url, repo_path.to_s
       end
 
       def update_mirror
-        git :remote, "set-url", "origin", repo_url
+        git :remote, "set-url", "origin", git_repo_url
         git :remote, :update, "--prune"
         git :checkout, "--detach", real_branch
         git :submodule, :update, "--init"
@@ -77,6 +80,21 @@ module Capistrano
         args.unshift :git
         backend.execute(*args)
       end
+
+      def git_repo_url
+        if fetch(:git_http_username) && fetch(:git_http_password)
+          URI.parse(repo_url).tap do |repo_uri|
+            repo_uri.user     = fetch(:git_http_username)
+            repo_uri.password = CGI.escape(fetch(:git_http_password))
+          end.to_s
+        elsif fetch(:git_http_username)
+          URI.parse(repo_url).tap do |repo_uri|
+            repo_uri.user = fetch(:git_http_username)
+          end.to_s
+        else
+          repo_url
+        end
+      end
     end
   end
 end

data/lib/capistrano/scm/git_with_submodule_and_resolv_symlinks/version.rb

@@ -13,7 +13,7 @@ end
 module Capistrano
   class SCM
     class GitWithSubmoduleAndResolvSymlinks < ::Capistrano::SCM::Plugin
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/capistrano/scm/tasks/git_with_submodule_and_resolv_symlinks.rake

@@ -5,9 +5,9 @@ namespace scm.nsp do
   desc "Upload the git wrapper script, this script guarantees that we can script git without getting an interactive prompt"
   task :wrapper do
     on release_roles :all do
-      execute :mkdir, "-p", File.dirname(fetch(:"#{scm.nsp}_wrapper_path"))
+      execute :mkdir, "-p", File.dirname(fetch(:"#{scm.nsp}_wrapper_path")).shellescape
       upload! StringIO.new("#!/bin/sh -e\nexec /usr/bin/ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no \"$@\"\n"), fetch(:"#{scm.nsp}_wrapper_path")
-      execute :chmod, "700", fetch(:"#{scm.nsp}_wrapper_path")
+      execute :chmod, "700", fetch(:"#{scm.nsp}_wrapper_path").shellescape
     end
   end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-scm-git_with_submodule_and_resolv_symlinks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - YAMADA Tsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement