dapp 0.13.9 → 0.13.10
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/config/en/net_status.yml +1 -1
- data/lib/dapp/dimg/docker_registry.rb +6 -5
- data/lib/dapp/dimg/git_repo/base.rb +1 -4
- data/lib/dapp/helper/yaml.rb +1 -1
- data/lib/dapp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 112878d27783e793fbef826a594b653b887c08d0
|
|
4
|
+
data.tar.gz: 654462c4125c802f88d2b48180e104068d78cab2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6340aa6e33271b2649d90c6fd8676392534513cecc3ede7475e12053cb1de6fe8b3b07f70ea8ae2114fd43a6f9f56497af451ad8c94740e55692a2a1a740fdfd
|
|
7
|
+
data.tar.gz: 10d7e10a9348ffaf7420b5bacfbf266e9b294c6e0f378ab3e7d71a0a29bf793770987fdcb1815d7827e5d107ce8447dd310839917444a98c89247a84ebc58b18
|
data/config/en/net_status.yml
CHANGED
|
@@ -39,7 +39,7 @@ en:
|
|
|
39
39
|
secret_values_file_not_found: "Secret values file `%{path}` not found!"
|
|
40
40
|
user_containers_detected: "User containers have been using images!\n%{ids}"
|
|
41
41
|
incorrect_yaml_structure: "Incorrect YAML structure in `%{path}`!"
|
|
42
|
-
editor_not_found: "Editor
|
|
42
|
+
editor_not_found: "Editor not found!"
|
|
43
43
|
dapp:
|
|
44
44
|
no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
|
|
45
45
|
no_such_app: "No such app: `%{apps_patterns}`!"
|
|
@@ -5,13 +5,14 @@ module Dapp
|
|
|
5
5
|
/^#{repo_name_format}$/ =~ repo
|
|
6
6
|
expected_hostname = Regexp.last_match(:hostname)
|
|
7
7
|
expected_repo_suffix = Regexp.last_match(:repo_suffix)
|
|
8
|
-
expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
|
|
9
8
|
|
|
10
|
-
if
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
9
|
+
if expected_hostname
|
|
10
|
+
%w(https http).each do |protocol|
|
|
11
|
+
expected_hostname_url = [protocol, expected_hostname].join('://')
|
|
12
|
+
return Base.new(repo, expected_hostname_url, expected_repo_suffix) if hostname_exist?(expected_hostname_url)
|
|
13
|
+
end
|
|
14
14
|
end
|
|
15
|
+
Default.new(repo, File.join(*[expected_hostname, expected_repo_suffix].compact))
|
|
15
16
|
end
|
|
16
17
|
|
|
17
18
|
def self.repo_name_format
|
|
@@ -60,10 +60,7 @@ module Dapp
|
|
|
60
60
|
end
|
|
61
61
|
|
|
62
62
|
def find_commit_id_by_message(regex)
|
|
63
|
-
walker.each
|
|
64
|
-
next unless commit.message =~ regex
|
|
65
|
-
return commit.oid
|
|
66
|
-
end
|
|
63
|
+
walker.each { |commit| return commit.oid if commit.message.encode('UTF-8', invalid: :replace) =~ regex }
|
|
67
64
|
end
|
|
68
65
|
|
|
69
66
|
def walker
|
data/lib/dapp/helper/yaml.rb
CHANGED
|
@@ -12,7 +12,7 @@ module Dapp
|
|
|
12
12
|
if hash && !res.is_a?(Hash)
|
|
13
13
|
raise ::Dapp::Error::Dapp,
|
|
14
14
|
code: :yaml_incorrect,
|
|
15
|
-
data: { message: "unexpected
|
|
15
|
+
data: { message: "unexpected yaml data \n>>> START YAML\n#{string.strip}\n>>> END YAML\n" }
|
|
16
16
|
end
|
|
17
17
|
end
|
|
18
18
|
rescue Psych::SyntaxError => e
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dapp
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.13.
|
|
4
|
+
version: 0.13.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitry Stolyarov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-07-
|
|
11
|
+
date: 2017-07-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|