takeltau 0.45.14 → 0.45.16
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/takeltau/ship/info/lib.rb +3 -15
- data/lib/takeltau/ship/project/start.rb +5 -0
- data/lib/takeltau/version +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9e11c018e6993f4bbb2699c699f52f73512d200ac177c2b2ca6b4e56e0108ef5
|
|
4
|
+
data.tar.gz: f32c777e36e4997749d9a2aa10913dd7496b5e5d1b56c5abb2c84898bdb88a0b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5fb8aa14337a2dceffe46b0c77042d5bb55cdaf614cb4b3b84f10a30bfc4a28c2eab0ecc66695221d7688d53f93a10aa843d51c08f875fcc9a5853821b9d6235
|
|
7
|
+
data.tar.gz: b26feddd04a79042f36287cf4f61c434989b0175da221b5ee92e61e32ce7a89b99eb29566c9fae0962e7f6d394a754d1f44116a2d46cd753b78fc67364e39c71
|
|
@@ -7,26 +7,12 @@ module ShipInfoLib
|
|
|
7
7
|
# Gather takelship information
|
|
8
8
|
def _ship_info_lib_get_takelshipinfo
|
|
9
9
|
log.debug 'Gathering takelship info'
|
|
10
|
-
takelshipinfo =
|
|
11
|
-
takelshipinfo = _ship_info_lib_get_info_from_docker if takelshipinfo.empty?
|
|
12
|
-
|
|
10
|
+
takelshipinfo = _ship_info_lib_get_info_from_docker
|
|
13
11
|
return false if takelshipinfo.nil?
|
|
14
12
|
|
|
15
13
|
takelshipinfo
|
|
16
14
|
end
|
|
17
15
|
|
|
18
|
-
# Read takelship info from file
|
|
19
|
-
def _ship_info_lib_get_info_from_file
|
|
20
|
-
log.debug 'Reading takelship info from file'
|
|
21
|
-
ship_data_dir = config.active['ship_data_dir']
|
|
22
|
-
yaml_file = format(
|
|
23
|
-
config.active['ship_takelship_yml'],
|
|
24
|
-
pwd: Dir.getwd,
|
|
25
|
-
ship_data_dir: ship_data_dir
|
|
26
|
-
)
|
|
27
|
-
read_yaml_file(yaml_file) || {}
|
|
28
|
-
end
|
|
29
|
-
|
|
30
16
|
# Read takelship info from docker run
|
|
31
17
|
def _ship_info_lib_get_info_from_docker
|
|
32
18
|
log.debug 'Reading takelship info from takelship container'
|
|
@@ -35,6 +21,8 @@ module ShipInfoLib
|
|
|
35
21
|
end
|
|
36
22
|
|
|
37
23
|
def _ship_info_lib_get_project(project, takelship)
|
|
24
|
+
return '' if takelship.nil?
|
|
25
|
+
|
|
38
26
|
return '' unless takelship.key? 'default_project'
|
|
39
27
|
|
|
40
28
|
project = config.active['ship_default_project'] if project == 'default'
|
|
@@ -7,6 +7,11 @@ module ShipProjectStart
|
|
|
7
7
|
return false unless _ship_project_start_matrjoschka?
|
|
8
8
|
|
|
9
9
|
takelship = _ship_info_lib_get_takelshipinfo
|
|
10
|
+
unless takelship
|
|
11
|
+
log.debug 'Unable to gather takelship info'
|
|
12
|
+
return false
|
|
13
|
+
end
|
|
14
|
+
|
|
10
15
|
project = _ship_info_lib_get_project project, takelship
|
|
11
16
|
return false unless _ship_project_start_valid_project? takelship, project
|
|
12
17
|
|
data/lib/takeltau/version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.45.
|
|
1
|
+
0.45.16
|