dapp 0.7.30 → 0.7.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dapp/git_repo/remote.rb +12 -2
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b58a8e42818ef2cdcf82709deda4f51b72484577
|
4
|
+
data.tar.gz: c3ec885db3436122767c139c25b660e94050d816
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 38f3ea345dd12f38e514ce933d65a0fafaaaa06cc50f44598fcfc2bbd1e299f3bcf47e0e6c8819107167c80eb5b3eee62ea7b891c994c8281e3248ac51568315
|
7
|
+
data.tar.gz: f9e73babbc79298bdd07cacb1531bda9fc9a7eba79f68f7960d3d45eb520b6f0dfafd530b15f8aa0f5523d69cea6edec20e4a27bff5304746731aece1c5cb00c
|
data/lib/dapp/git_repo/remote.rb
CHANGED
@@ -9,17 +9,27 @@ module Dapp
|
|
9
9
|
|
10
10
|
dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
|
11
11
|
begin
|
12
|
-
Rugged::Repository.clone_at(
|
12
|
+
Rugged::Repository.clone_at(
|
13
|
+
url, path,
|
14
|
+
bare: true,
|
15
|
+
credentials: proc do |_, username|
|
16
|
+
@_rugged_credentials = Rugged::Credentials::SshKeyFromAgent.new(username: username)
|
17
|
+
end
|
18
|
+
)
|
13
19
|
rescue Rugged::NetworkError, Rugged::SslError => e
|
14
20
|
raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
|
15
21
|
end
|
16
22
|
end unless File.directory?(path)
|
17
23
|
end
|
18
24
|
|
25
|
+
def git_bare
|
26
|
+
@git_bare ||= Rugged::Repository.new(path, bare: true, credentials: @_rugged_credentials)
|
27
|
+
end
|
28
|
+
|
19
29
|
def fetch!(branch = nil)
|
20
30
|
branch ||= self.branch
|
21
31
|
dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
|
22
|
-
git_bare.fetch('origin', [branch])
|
32
|
+
git_bare.fetch('origin', [branch], credentials: @_rugged_credentials)
|
23
33
|
raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
|
24
34
|
end unless dimg.ignore_git_fetch || dimg.project.dry_run?
|
25
35
|
end
|
data/lib/dapp/version.rb
CHANGED