dapp 0.7.31 → 0.7.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b58a8e42818ef2cdcf82709deda4f51b72484577
-  data.tar.gz: c3ec885db3436122767c139c25b660e94050d816
+  metadata.gz: b8e2d54d5e6eb7e5eede29862e0cc68e6c1e7ffa
+  data.tar.gz: 320dea6138d6c2b1efc4b9bae2eded54b471d005
 SHA512:
-  metadata.gz: 38f3ea345dd12f38e514ce933d65a0fafaaaa06cc50f44598fcfc2bbd1e299f3bcf47e0e6c8819107167c80eb5b3eee62ea7b891c994c8281e3248ac51568315
-  data.tar.gz: f9e73babbc79298bdd07cacb1531bda9fc9a7eba79f68f7960d3d45eb520b6f0dfafd530b15f8aa0f5523d69cea6edec20e4a27bff5304746731aece1c5cb00c
+  metadata.gz: 72d073adb207a6c08a81e9f5f09f5ebacdaf3d3289ee5a0578cab6615e135c0691a8de5832a46b60740d51289f5b9603095f847bd3bd44c2fa786de3672cfbe1
+  data.tar.gz: 1be7e0b1f1223a1625a67f32de3cd30f2c92357897b390f8787dfc3989d2981220a9b2d85ca7ef5b365fed1f66411dc4e69ee4a6d1bf57eaa15a06f0a3a3afef

data/lib/dapp/git_repo/base.rb

@@ -11,11 +11,11 @@ module Dapp
       end
 
       def container_path
-        dimg.container_tmp_path "#{name}.git"
+        raise
       end
 
       def path
-        dimg.tmp_path("#{name}.git").to_s
+        raise
       end
 
       def git_bare

data/lib/dapp/git_repo/own.rb

@@ -7,7 +7,7 @@ module Dapp
       end
 
       def container_path
-        dimg.container_dapp_path('own', "#{name}.git")
+        dimg.container_dapp_path('git_repo_own', "#{name}.git")
       end
 
       def path

data/lib/dapp/git_repo/remote.rb

@@ -9,27 +9,46 @@ module Dapp
 
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
           begin
-            Rugged::Repository.clone_at(
-              url, path,
-              bare: true,
-              credentials: proc do |_, username|
-                @_rugged_credentials = Rugged::Credentials::SshKeyFromAgent.new(username: username)
-              end
-            )
+            Rugged::Repository.clone_at(url, path, bare: true, credentials: _rugged_credentials)
           rescue Rugged::NetworkError, Rugged::SslError => e
             raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
           end
         end unless File.directory?(path)
       end
 
+      def _rugged_credentials
+        @_rugged_credentials ||= begin
+          ssh_url = begin
+            URI.parse(@url)
+            false
+          rescue URI::InvalidURIError
+            true
+          end
+
+          if ssh_url
+            host_with_user = @url.split(':', 2).first
+            username = host_with_user.split('@', 2).reverse.last
+            Rugged::Credentials::SshKeyFromAgent.new(username: username)
+          end
+        end
+      end
+
+      def path
+        dimg.build_path('git_repo_remote', name, Digest::MD5.hexdigest(@url)).to_s
+      end
+
+      def container_path
+        dimg.container_tmp_path('git_repo_remote', name, Digest::MD5.hexdigest(@url)).to_s
+      end
+
       def git_bare
-        @git_bare ||= Rugged::Repository.new(path, bare: true, credentials: @_rugged_credentials)
+        @git_bare ||= Rugged::Repository.new(path, bare: true, credentials: _rugged_credentials)
       end
 
       def fetch!(branch = nil)
         branch ||= self.branch
         dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
-          git_bare.fetch('origin', [branch], credentials: @_rugged_credentials)
+          git_bare.fetch('origin', [branch], credentials: _rugged_credentials)
           raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
         end unless dimg.ignore_git_fetch || dimg.project.dry_run?
       end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.31'.freeze
+  VERSION = '0.7.32'.freeze
   BUILD_CACHE_VERSION = '6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.31
+  version: 0.7.32
 platform: ruby
 authors:
 - Dmitry Stolyarov